diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-02-05 11:31:09 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-02-05 11:31:09 +0100 |
| commit | 80a6d52cb5ad2b77aebe4f4d59966da31167107d (patch) | |
| tree | 27de27118e361a8e64114aaf7158ed2b411a3096 | |
| parent | 98728789b251cc2df47a6650b65465b3a0ca8a7b (diff) | |
| parent | 6b84df4c0e10136958ee93c0ac9f11e54a1d58d4 (diff) | |
Merge branch 'master' of git://www.openadk.org/git/openadk
33 files changed, 435 insertions, 453 deletions
diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 552618af7..28ced4519 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,6 +1,6 @@ diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Config.src --- busybox-1.20.2.orig//archival/Config.src 2012-06-26 15:35:45.000000000 +0200 -+++ busybox-1.20.2/archival/Config.src 2012-08-28 11:57:00.000000000 +0200 ++++ busybox-1.20.2/archival/Config.src 2013-01-31 16:44:31.000000000 +0100 @@ -214,6 +214,12 @@ are actually slower than gzip at equivalent compression ratios and take up 3.2K of code. @@ -16,7 +16,7 @@ diff -Nur busybox-1.20.2.orig//archival/Config.src busybox-1.20.2/archival/Confi default y diff -Nur busybox-1.20.2.orig//archival/ipkg.c busybox-1.20.2/archival/ipkg.c --- busybox-1.20.2.orig//archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/ipkg.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/ipkg.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,28 @@ +/* ipkg.c - the itsy package management system + @@ -48,7 +48,7 @@ diff -Nur busybox-1.20.2.orig//archival/ipkg.c busybox-1.20.2/archival/ipkg.c +} diff -Nur busybox-1.20.2.orig//archival/Kbuild.src busybox-1.20.2/archival/Kbuild.src --- busybox-1.20.2.orig//archival/Kbuild.src 2012-06-26 15:35:45.000000000 +0200 -+++ busybox-1.20.2/archival/Kbuild.src 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/Kbuild.src 2013-01-31 16:44:31.000000000 +0100 @@ -22,6 +22,7 @@ lib-$(CONFIG_LZOP) += lzop.o bbunzip.o lib-$(CONFIG_GZIP) += gzip.o bbunzip.o @@ -59,26 +59,27 @@ diff -Nur busybox-1.20.2.orig//archival/Kbuild.src busybox-1.20.2/archival/Kbuil lib-$(CONFIG_UNLZMA) += bbunzip.o diff -Nur busybox-1.20.2.orig//archival/libarchive/Kbuild.src busybox-1.20.2/archival/libarchive/Kbuild.src --- busybox-1.20.2.orig//archival/libarchive/Kbuild.src 2012-06-26 15:35:45.000000000 +0200 -+++ busybox-1.20.2/archival/libarchive/Kbuild.src 2012-08-28 15:10:38.000000000 +0200 -@@ -25,6 +25,7 @@ ++++ busybox-1.20.2/archival/libarchive/Kbuild.src 2013-01-31 16:44:50.000000000 +0100 +@@ -25,14 +25,14 @@ \ data_align.o \ find_list_entry.o \ ++ get_header_tar.o \ + get_header_tar_gz.o \ init_handle.o DPKG_FILES:= \ -@@ -32,7 +33,6 @@ + unpack_ar_archive.o \ filter_accept_list_reassign.o \ get_header_ar.o \ - get_header_tar.o \ +- get_header_tar.o \ - get_header_tar_gz.o \ get_header_tar_bz2.o \ get_header_tar_lzma.o \ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.c busybox-1.20.2/archival/libipkg/args.c --- busybox-1.20.2.orig//archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/args.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/args.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -324,7 +325,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.c busybox-1.20.2/archival/l +} diff -Nur busybox-1.20.2.orig//archival/libipkg/args.h busybox-1.20.2/archival/libipkg/args.h --- busybox-1.20.2.orig//archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/args.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/args.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -400,7 +401,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/args.h busybox-1.20.2/archival/l +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.c busybox-1.20.2/archival/libipkg/conffile.c --- busybox-1.20.2.orig//archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/conffile.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/conffile.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -469,7 +470,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.c busybox-1.20.2/archiv +} diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.h busybox-1.20.2/archival/libipkg/conffile.h --- busybox-1.20.2.orig//archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/conffile.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/conffile.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -503,7 +504,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile.h busybox-1.20.2/archiv + diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.c busybox-1.20.2/archival/libipkg/conffile_list.c --- busybox-1.20.2.orig//archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/conffile_list.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/conffile_list.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -554,7 +555,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.c busybox-1.20.2/a + diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.h busybox-1.20.2/archival/libipkg/conffile_list.h --- busybox-1.20.2.orig//archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/conffile_list.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/conffile_list.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -594,7 +595,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/conffile_list.h busybox-1.20.2/a + diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.c busybox-1.20.2/archival/libipkg/file_util.c --- busybox-1.20.2.orig//archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/file_util.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/file_util.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,186 @@ +/* file_util.c - convenience routines for common stat operations + @@ -784,7 +785,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.c busybox-1.20.2/archi + diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.h busybox-1.20.2/archival/libipkg/file_util.h --- busybox-1.20.2.orig//archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/file_util.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/file_util.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -817,7 +818,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/file_util.h busybox-1.20.2/archi +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.c busybox-1.20.2/archival/libipkg/hash_table.c --- busybox-1.20.2.orig//archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/hash_table.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/hash_table.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -976,7 +977,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.c busybox-1.20.2/arch + diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.h busybox-1.20.2/archival/libipkg/hash_table.h --- busybox-1.20.2.orig//archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/hash_table.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/hash_table.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -1024,7 +1025,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/hash_table.h busybox-1.20.2/arch +#endif /* _HASH_TABLE_H_ */ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c busybox-1.20.2/archival/libipkg/ipkg_cmd.c --- busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_cmd.c 2012-08-28 12:15:11.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_cmd.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,1367 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -2393,10 +2394,9 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.c busybox-1.20.2/archiv +} + + -Binary files busybox-1.20.2.orig//archival/libipkg/.ipkg_cmd.c.swp and busybox-1.20.2/archival/libipkg/.ipkg_cmd.c.swp differ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h busybox-1.20.2/archival/libipkg/ipkg_cmd.h --- busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_cmd.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_cmd.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,41 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2441,7 +2441,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_cmd.h busybox-1.20.2/archiv +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c busybox-1.20.2/archival/libipkg/ipkg_conf.c --- busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_conf.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_conf.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,711 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3156,7 +3156,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.c busybox-1.20.2/archi +} diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h busybox-1.20.2/archival/libipkg/ipkg_conf.h --- busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_conf.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_conf.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3267,7 +3267,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_conf.h busybox-1.20.2/archi +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c busybox-1.20.2/archival/libipkg/ipkg_configure.c --- busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_configure.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_configure.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3311,7 +3311,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.c busybox-1.20.2/ + diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h busybox-1.20.2/archival/libipkg/ipkg_configure.h --- busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_configure.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_configure.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3340,7 +3340,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_configure.h busybox-1.20.2/ +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.c busybox-1.20.2/archival/libipkg/ipkg_download.c --- busybox-1.20.2.orig//archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_download.c 2012-08-28 15:00:11.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_download.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3539,7 +3539,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.c busybox-1.20.2/a +} diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.h busybox-1.20.2/archival/libipkg/ipkg_download.h --- busybox-1.20.2.orig//archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_download.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_download.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3573,7 +3573,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_download.h busybox-1.20.2/a +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg.h busybox-1.20.2/archival/libipkg/ipkg.h --- busybox-1.20.2.orig//archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,68 @@ +/* ipkg.h - the itsy package management system + @@ -3645,7 +3645,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg.h busybox-1.20.2/archival/l +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h busybox-1.20.2/archival/libipkg/ipkg_includes.h --- busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_includes.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_includes.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,82 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3731,7 +3731,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_includes.h busybox-1.20.2/a +#endif /* IPKG_INCLUDES_H */ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.c busybox-1.20.2/archival/libipkg/ipkg_install.c --- busybox-1.20.2.orig//archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_install.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_install.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,1982 @@ +/* ipkg_install.c - the itsy package management system + @@ -5717,7 +5717,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.c busybox-1.20.2/ar +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.h busybox-1.20.2/archival/libipkg/ipkg_install.h --- busybox-1.20.2.orig//archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_install.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_install.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5756,7 +5756,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_install.h busybox-1.20.2/ar +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.c busybox-1.20.2/archival/libipkg/ipkg_message.c --- busybox-1.20.2.orig//archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_message.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_message.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,35 @@ +/* ipkg_message.c - the itsy package management system + @@ -5795,7 +5795,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.c busybox-1.20.2/ar +} diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.h busybox-1.20.2/archival/libipkg/ipkg_message.h --- busybox-1.20.2.orig//archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_message.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_message.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5831,7 +5831,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_message.h busybox-1.20.2/ar +#endif /* _IPKG_MESSAGE_H_ */ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c busybox-1.20.2/archival/libipkg/ipkg_remove.c --- busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_remove.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_remove.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,385 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6220,7 +6220,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.c busybox-1.20.2/arc +} diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h busybox-1.20.2/archival/libipkg/ipkg_remove.h --- busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_remove.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_remove.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6257,7 +6257,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_remove.h busybox-1.20.2/arc +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c busybox-1.20.2/archival/libipkg/ipkg_upgrade.c --- busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,79 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6340,7 +6340,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.c busybox-1.20.2/ar +} diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h busybox-1.20.2/archival/libipkg/ipkg_upgrade.h --- busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_upgrade.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6362,7 +6362,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_upgrade.h busybox-1.20.2/ar +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c busybox-1.20.2/archival/libipkg/ipkg_utils.c --- busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_utils.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_utils.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,185 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6551,7 +6551,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.c busybox-1.20.2/arch + diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h busybox-1.20.2/archival/libipkg/ipkg_utils.h --- busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/ipkg_utils.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/ipkg_utils.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6584,7 +6584,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/ipkg_utils.h busybox-1.20.2/arch +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/Kbuild busybox-1.20.2/archival/libipkg/Kbuild --- busybox-1.20.2.orig//archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/Kbuild 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/Kbuild 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -6648,7 +6648,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/Kbuild busybox-1.20.2/archival/l +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.c busybox-1.20.2/archival/libipkg/libipkg.c --- busybox-1.20.2.orig//archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/libipkg.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/libipkg.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,583 @@ +/* ipkglib.c - the itsy package management system + @@ -7235,7 +7235,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.c busybox-1.20.2/archiva +} diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.h busybox-1.20.2/archival/libipkg/libipkg.h --- busybox-1.20.2.orig//archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/libipkg.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/libipkg.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,78 @@ +/* ipkglib.h - the itsy package management system + @@ -7317,7 +7317,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/libipkg.h busybox-1.20.2/archiva +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.c busybox-1.20.2/archival/libipkg/nv_pair.c --- busybox-1.20.2.orig//archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/nv_pair.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/nv_pair.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7361,7 +7361,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.c busybox-1.20.2/archiva + diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.h busybox-1.20.2/archival/libipkg/nv_pair.h --- busybox-1.20.2.orig//archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/nv_pair.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/nv_pair.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7397,7 +7397,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair.h busybox-1.20.2/archiva + diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c busybox-1.20.2/archival/libipkg/nv_pair_list.c --- busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/nv_pair_list.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/nv_pair_list.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7499,7 +7499,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.c busybox-1.20.2/ar +} diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h busybox-1.20.2/archival/libipkg/nv_pair_list.h --- busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/nv_pair_list.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/nv_pair_list.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7563,7 +7563,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/nv_pair_list.h busybox-1.20.2/ar + diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.c busybox-1.20.2/archival/libipkg/pkg.c --- busybox-1.20.2.orig//archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,1757 @@ +/* pkg.c - the itsy package management system + @@ -9324,7 +9324,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.c busybox-1.20.2/archival/li +} diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.c busybox-1.20.2/archival/libipkg/pkg_depends.c --- busybox-1.20.2.orig//archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_depends.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_depends.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,1032 @@ +/* pkg_depends.c - the itsy package management system + @@ -10360,7 +10360,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.c busybox-1.20.2/arc +} diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.h busybox-1.20.2/archival/libipkg/pkg_depends.h --- busybox-1.20.2.orig//archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_depends.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_depends.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10469,7 +10469,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_depends.h busybox-1.20.2/arc +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.c busybox-1.20.2/archival/libipkg/pkg_dest.c --- busybox-1.20.2.orig//archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_dest.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_dest.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10565,7 +10565,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.c busybox-1.20.2/archiv +} diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.h busybox-1.20.2/archival/libipkg/pkg_dest.h --- busybox-1.20.2.orig//archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_dest.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_dest.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10607,7 +10607,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest.h busybox-1.20.2/archiv + diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c busybox-1.20.2/archival/libipkg/pkg_dest_list.c --- busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_dest_list.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_dest_list.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10696,7 +10696,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.c busybox-1.20.2/a +} diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h busybox-1.20.2/archival/libipkg/pkg_dest_list.h --- busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_dest_list.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_dest_list.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10750,7 +10750,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_dest_list.h busybox-1.20.2/a + diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.c busybox-1.20.2/archival/libipkg/pkg_extract.c --- busybox-1.20.2.orig//archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_extract.c 2012-08-28 11:58:04.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_extract.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,255 @@ +/* pkg_extract.c - the itsy package management system + @@ -11009,7 +11009,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.c busybox-1.20.2/arc +} diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.h busybox-1.20.2/archival/libipkg/pkg_extract.h --- busybox-1.20.2.orig//archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_extract.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_extract.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -11045,7 +11045,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_extract.h busybox-1.20.2/arc +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.h busybox-1.20.2/archival/libipkg/pkg.h --- busybox-1.20.2.orig//archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,229 @@ +/* pkg.h - the itsy package management system + @@ -11278,7 +11278,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg.h busybox-1.20.2/archival/li +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.c busybox-1.20.2/archival/libipkg/pkg_hash.c --- busybox-1.20.2.orig//archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_hash.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_hash.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,623 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11905,7 +11905,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.c busybox-1.20.2/archiv + diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.h busybox-1.20.2/archival/libipkg/pkg_hash.h --- busybox-1.20.2.orig//archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_hash.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_hash.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11970,7 +11970,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_hash.h busybox-1.20.2/archiv + diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.c busybox-1.20.2/archival/libipkg/pkg_parse.c --- busybox-1.20.2.orig//archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_parse.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_parse.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,368 @@ +/* pkg_parse.c - the itsy package management system + @@ -12342,7 +12342,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.c busybox-1.20.2/archi +} diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.h busybox-1.20.2/archival/libipkg/pkg_parse.h --- busybox-1.20.2.orig//archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_parse.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_parse.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12377,7 +12377,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_parse.h busybox-1.20.2/archi +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.c busybox-1.20.2/archival/libipkg/pkg_src.c --- busybox-1.20.2.orig//archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_src.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_src.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12424,7 +12424,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.c busybox-1.20.2/archiva + diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.h busybox-1.20.2/archival/libipkg/pkg_src.h --- busybox-1.20.2.orig//archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_src.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_src.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12462,7 +12462,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src.h busybox-1.20.2/archiva +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c busybox-1.20.2/archival/libipkg/pkg_src_list.c --- busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_src_list.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_src_list.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12541,7 +12541,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.c busybox-1.20.2/ar +} diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h busybox-1.20.2/archival/libipkg/pkg_src_list.h --- busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_src_list.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_src_list.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12602,7 +12602,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_src_list.h busybox-1.20.2/ar + diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.c busybox-1.20.2/archival/libipkg/pkg_vec.c --- busybox-1.20.2.orig//archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_vec.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_vec.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,231 @@ +/* pkg_vec.c - the itsy package management system + @@ -12837,7 +12837,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.c busybox-1.20.2/archiva + diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.h busybox-1.20.2/archival/libipkg/pkg_vec.h --- busybox-1.20.2.orig//archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/pkg_vec.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/pkg_vec.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,62 @@ +/* pkg_vec.h - the itsy package management system + @@ -12903,7 +12903,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/pkg_vec.h busybox-1.20.2/archiva + diff -Nur busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h busybox-1.20.2/archival/libipkg/sprintf_alloc.h --- busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/sprintf_alloc.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/sprintf_alloc.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12932,7 +12932,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/sprintf_alloc.h busybox-1.20.2/a +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.c busybox-1.20.2/archival/libipkg/str_list.c --- busybox-1.20.2.orig//archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/str_list.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/str_list.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -13012,7 +13012,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.c busybox-1.20.2/archiv +} diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.h busybox-1.20.2/archival/libipkg/str_list.h --- busybox-1.20.2.orig//archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/str_list.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/str_list.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -13067,7 +13067,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_list.h busybox-1.20.2/archiv +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.c busybox-1.20.2/archival/libipkg/str_util.c --- busybox-1.20.2.orig//archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/str_util.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/str_util.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,69 @@ +/* str_utils.c - the itsy package management system + @@ -13140,7 +13140,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.c busybox-1.20.2/archiv + diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.h busybox-1.20.2/archival/libipkg/str_util.h --- busybox-1.20.2.orig//archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/str_util.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/str_util.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,27 @@ +/* str_utils.h - the itsy package management system + @@ -13171,7 +13171,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/str_util.h busybox-1.20.2/archiv +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/user.c busybox-1.20.2/archival/libipkg/user.c --- busybox-1.20.2.orig//archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/user.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/user.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,49 @@ +/* user.c - the itsy package management system + @@ -13224,7 +13224,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/user.c busybox-1.20.2/archival/l +} diff -Nur busybox-1.20.2.orig//archival/libipkg/user.h busybox-1.20.2/archival/libipkg/user.h --- busybox-1.20.2.orig//archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/user.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/user.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13251,7 +13251,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/user.h busybox-1.20.2/archival/l + diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.c busybox-1.20.2/archival/libipkg/void_list.c --- busybox-1.20.2.orig//archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/void_list.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/void_list.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13449,7 +13449,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.c busybox-1.20.2/archi +} diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.h busybox-1.20.2/archival/libipkg/void_list.h --- busybox-1.20.2.orig//archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/void_list.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/void_list.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13512,7 +13512,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/void_list.h busybox-1.20.2/archi +#endif diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.c busybox-1.20.2/archival/libipkg/xsystem.c --- busybox-1.20.2.orig//archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/xsystem.c 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/xsystem.c 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13580,7 +13580,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.c busybox-1.20.2/archiva + diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.h busybox-1.20.2/archival/libipkg/xsystem.h --- busybox-1.20.2.orig//archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.20.2/archival/libipkg/xsystem.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/archival/libipkg/xsystem.h 2013-01-31 16:44:31.000000000 +0100 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13618,7 +13618,7 @@ diff -Nur busybox-1.20.2.orig//archival/libipkg/xsystem.h busybox-1.20.2/archiva + diff -Nur busybox-1.20.2.orig//include/applets.src.h busybox-1.20.2/include/applets.src.h --- busybox-1.20.2.orig//include/applets.src.h 2012-07-02 16:08:25.000000000 +0200 -+++ busybox-1.20.2/include/applets.src.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/include/applets.src.h 2013-01-31 16:44:31.000000000 +0100 @@ -199,6 +199,7 @@ IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP)) IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP)) @@ -13629,7 +13629,16 @@ diff -Nur busybox-1.20.2.orig//include/applets.src.h busybox-1.20.2/include/appl IF_IPRULE(APPLET(iprule, BB_DIR_BIN, BB_SUID_DROP)) diff -Nur busybox-1.20.2.orig//include/bb_archive.h busybox-1.20.2/include/bb_archive.h --- busybox-1.20.2.orig//include/bb_archive.h 2012-07-02 16:08:25.000000000 +0200 -+++ busybox-1.20.2/include/bb_archive.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/include/bb_archive.h 2013-01-31 16:49:28.000000000 +0100 +@@ -79,7 +79,7 @@ + /* Archiver specific. Can make it a union if it ever gets big */ + #define PAX_NEXT_FILE 0 + #define PAX_GLOBAL 1 +-#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB ++#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB || ENABLE_IPKG + smallint tar__end; + # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS + char* tar__longname; @@ -98,7 +98,7 @@ struct hardlinks_t *cpio__hardlinks_to_create; struct hardlinks_t *cpio__created_hardlinks; @@ -13641,7 +13650,7 @@ diff -Nur busybox-1.20.2.orig//include/bb_archive.h busybox-1.20.2/include/bb_ar /* How to process any sub archive, e.g. get_header_tar_gz */ diff -Nur busybox-1.20.2.orig//include/usage.src.h busybox-1.20.2/include/usage.src.h --- busybox-1.20.2.orig//include/usage.src.h 2012-06-26 15:35:45.000000000 +0200 -+++ busybox-1.20.2/include/usage.src.h 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/include/usage.src.h 2013-01-31 16:44:31.000000000 +0100 @@ -19,4 +19,80 @@ #define busybox_notes_usage \ "Hello world!\n" @@ -13725,7 +13734,7 @@ diff -Nur busybox-1.20.2.orig//include/usage.src.h busybox-1.20.2/include/usage. #endif diff -Nur busybox-1.20.2.orig//Makefile busybox-1.20.2/Makefile --- busybox-1.20.2.orig//Makefile 2012-07-02 16:20:27.000000000 +0200 -+++ busybox-1.20.2/Makefile 2012-08-28 11:57:01.000000000 +0200 ++++ busybox-1.20.2/Makefile 2013-01-31 16:44:31.000000000 +0100 @@ -465,6 +465,7 @@ libs-y := \ archival/ \ diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 0d88b11fc..b33175484 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.42.5 +PKG_VERSION:= 1.42.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= aca828bb4bcca20991a442deb950b670 +PKG_MD5SUM:= a1ec22ef003688dae9f76c74881b22b9 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= fs PKG_DEPENDS:= libcom-err libuuid libblkid libpthread diff --git a/package/e2fsprogs/patches/patch-util_symlinks_c b/package/e2fsprogs/patches/patch-util_symlinks_c deleted file mode 100644 index a8011f907..000000000 --- a/package/e2fsprogs/patches/patch-util_symlinks_c +++ /dev/null @@ -1,10 +0,0 @@ ---- e2fsprogs-1.42.4.orig/util/symlinks.c 2012-05-15 04:04:19.000000000 +0200 -+++ e2fsprogs-1.42.4/util/symlinks.c 2012-07-26 18:50:03.000000000 +0200 -@@ -8,7 +8,6 @@ - #endif - #include <stdio.h> - #include <stdlib.h> --#include <malloc.h> - #include <string.h> - #include <fcntl.h> - #include <sys/param.h> diff --git a/package/firefox/Makefile b/package/firefox/Makefile index aafccfa4a..779e42dcc 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -21,7 +21,7 @@ PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= x86 x86_64 native mips PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin -PKG_SYSTEM_DEPENDS:= ibm-x40 lemote-yeelong qemu-i686 +PKG_SYSTEM_DEPENDS:= tarox-pc ibm-x40 lemote-yeelong qemu-i686 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-release @@ -78,9 +78,11 @@ CONFIGURE_ARGS+= --enable-application=browser \ --disable-mathml \ --disable-jemalloc \ --disable-crashreporter \ + --disable-updater \ --disable-libjpeg-turbo \ --disable-elf-hack +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 XAKE_FLAGS+= OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD) XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3" diff --git a/package/git/Makefile b/package/git/Makefile index 86f70a5ca..19a13b602 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 1.7.11.2 +PKG_VERSION:= 1.8.1.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 91e01a22032f5d0ca2941ae7fd49d587 +PKG_MD5SUM:= 9f912370a1831c851ff8df171e8a7218 PKG_DESCR:= fast version control system PKG_SECTION:= scm PKG_BUILDDEP:= openssl curl expat @@ -18,12 +18,14 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -MAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 NO_INSTALL_HARDLINKS=1 \ +XAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \ + NO_INSTALL_HARDLINKS=1 \ CURLDIR=${STAGING_TARGET_DIR} EXPATDIR=${STAGING_TARGET_DIR} XAKE_FLAGS+= uname_S=Linux uname_O=GNU/Linux CONFIGURE_ENV+= ac_cv_c_c99_format=yes \ ac_cv_fread_reads_directories=no \ ac_cv_snprintf_returns_bogus=no +TARGET_LDFLAGS+= -lintl -liconv post-install: $(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/libexec/git-core diff --git a/package/glib/Makefile b/package/glib/Makefile index 3f1def14f..dded649aa 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -46,6 +46,19 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getgrgid_r=yes +pre-configure: +ifeq ($(OStype),Linux) + (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ + ./configure --prefix=$(STAGING_HOST_DIR) \ + ) + ${MAKE} -C ${WRKBUILD} V=1 + $(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin + $(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin + $(CP) ${WRKBUILD}/gobject/glib-mkenums ${STAGING_HOST_DIR}/bin + ${MAKE} -C ${WRKBUILD} clean +endif + + glib-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib ${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 355595ffa..c6e57b460 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -49,6 +49,7 @@ else $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VER).so $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH); \ done + ${INSTALL_DIR} $(IDIR_GLIBC)/usr/bin $(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_GLIBC)/usr/bin ifeq ($(ADK_LOCALES),y) $(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_GLIBC)/usr/bin diff --git a/package/nspr/Makefile b/package/nspr/Makefile index cefc58aa0..029ce8751 100644 --- a/package/nspr/Makefile +++ b/package/nspr/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= nspr -PKG_VERSION:= 4.9.2 +PKG_VERSION:= 4.9.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1a8cad110e0ae94f538610a00f595b33 +PKG_MD5SUM:= b6ccfa8fcbbeb17ebeb19a3edff612bd PKG_DESCR:= Netscape Portable Runtime library PKG_SECTION:= libs PKG_URL:= http://www.mozilla.org/projects/nspr/ diff --git a/package/nss/Makefile b/package/nss/Makefile index 858eb24cf..d3fd62b08 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= nss -PKG_VERSION:= 3.13.6 -PKG_RELEASE:= 2 +PKG_VERSION:= 3.14.1 +PKG_RELEASE:= 1 PKG_MAJ_VERSION:= 3 -PKG_MIN_VERSION:= 13 -PKG_PATCH_VERSION:= 6 -PKG_MD5SUM:= 15ea0e3b63cd0d18b5b75619afc46c3e +PKG_MIN_VERSION:= 14 +PKG_PATCH_VERSION:= 1 +PKG_MD5SUM:= f6f3a942d1eba3e26aa0382a5b5461d9 PKG_DESCR:= Network Security Services (NSS) library PKG_SECTION:= libs PKG_BUILDDEP:= nspr zlib diff --git a/package/nss/patches/001-lfs-nss-config+nss_pc.patch b/package/nss/patches/001-lfs-nss-config+nss_pc.patch index 9907548cc..25784a052 100644 --- a/package/nss/patches/001-lfs-nss-config+nss_pc.patch +++ b/package/nss/patches/001-lfs-nss-config+nss_pc.patch @@ -1,220 +1,6 @@ -diff -Nur nss-3.13.6.orig/mozilla/security/nss/Makefile nss-3.13.6/mozilla/security/nss/Makefile ---- nss-3.13.6.orig/mozilla/security/nss/Makefile 2011-11-05 23:59:15.000000000 +0100 -+++ nss-3.13.6/mozilla/security/nss/Makefile 2012-10-01 12:37:24.000000000 +0200 -@@ -78,7 +78,7 @@ - # (7) Execute "local" rules. (OPTIONAL). # - ####################################################################### - --nss_build_all: build_coreconf build_nspr build_dbm all -+nss_build_all: build_coreconf build_dbm all - - nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber - -@@ -140,12 +140,6 @@ - --with-dist-prefix='$(NSPR_PREFIX)' \ - --with-dist-includedir='$(NSPR_PREFIX)/include' - --build_nspr: $(NSPR_CONFIG_STATUS) -- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) -- --clobber_nspr: $(NSPR_CONFIG_STATUS) -- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber -- - build_dbm: - ifdef NSS_DISABLE_DBM - @echo "skipping the build of DBM" -diff -Nur nss-3.13.6.orig/mozilla/security/nss/Makefile.orig nss-3.13.6/mozilla/security/nss/Makefile.orig ---- nss-3.13.6.orig/mozilla/security/nss/Makefile.orig 1970-01-01 01:00:00.000000000 +0100 -+++ nss-3.13.6/mozilla/security/nss/Makefile.orig 2011-11-05 23:59:15.000000000 +0100 -@@ -0,0 +1,185 @@ -+#! gmake -+# -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is the Netscape security libraries. -+# -+# The Initial Developer of the Original Code is -+# Netscape Communications Corporation. -+# Portions created by the Initial Developer are Copyright (C) 1994-2000 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** -+ -+####################################################################### -+# (1) Include initial platform-independent assignments (MANDATORY). # -+####################################################################### -+ -+include manifest.mn -+ -+####################################################################### -+# (2) Include "global" configuration information. (OPTIONAL) # -+####################################################################### -+ -+include $(CORE_DEPTH)/coreconf/config.mk -+ -+####################################################################### -+# (3) Include "component" configuration information. (OPTIONAL) # -+####################################################################### -+ -+ -+ -+####################################################################### -+# (4) Include "local" platform-dependent assignments (OPTIONAL). # -+####################################################################### -+ -+ifeq ($(OS_TARGET),WINCE) -+DIRS = lib # omit cmd since wince has no command line shell -+endif -+ -+####################################################################### -+# (5) Execute "global" rules. (OPTIONAL) # -+####################################################################### -+ -+include $(CORE_DEPTH)/coreconf/rules.mk -+ -+####################################################################### -+# (6) Execute "component" rules. (OPTIONAL) # -+####################################################################### -+ -+ -+ -+####################################################################### -+# (7) Execute "local" rules. (OPTIONAL). # -+####################################################################### -+ -+nss_build_all: build_coreconf build_nspr build_dbm all -+ -+nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber -+ -+build_coreconf: -+ cd $(CORE_DEPTH)/coreconf ; $(MAKE) -+ -+clobber_coreconf: -+ cd $(CORE_DEPTH)/coreconf ; $(MAKE) clobber -+ -+NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)/config.status -+NSPR_CONFIGURE = $(CORE_DEPTH)/../nsprpub/configure -+ -+# -+# Translate coreconf build options to NSPR configure options. -+# -+ -+ifdef BUILD_OPT -+NSPR_CONFIGURE_OPTS += --disable-debug --enable-optimize -+endif -+ifdef USE_64 -+NSPR_CONFIGURE_OPTS += --enable-64bit -+endif -+ifeq ($(OS_TARGET),WIN95) -+NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 -+endif -+ifdef USE_DEBUG_RTL -+NSPR_CONFIGURE_OPTS += --enable-debug-rtl -+endif -+ifdef NS_USE_GCC -+NSPR_COMPILERS = CC=gcc CXX=g++ -+endif -+ -+# -+# Some pwd commands on Windows (for example, the pwd -+# command in Cygwin) return a pathname that begins -+# with a (forward) slash. When such a pathname is -+# passed to Windows build tools (for example, cl), it -+# is mistaken as a command-line option. If that is the case, -+# we use a relative pathname as NSPR's prefix on Windows. -+# -+ -+USEABSPATH="YES" -+ifeq (,$(filter-out WIN%,$(OS_TARGET))) -+ifeq (,$(findstring :,$(shell pwd))) -+USEABSPATH="NO" -+endif -+endif -+ifeq ($(USEABSPATH),"YES") -+NSPR_PREFIX = $(shell pwd)/../../dist/$(OBJDIR_NAME) -+else -+NSPR_PREFIX = $$(topsrcdir)/../dist/$(OBJDIR_NAME) -+endif -+ -+$(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE) -+ $(NSINSTALL) -D $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) -+ cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; \ -+ $(NSPR_COMPILERS) sh ../configure \ -+ $(NSPR_CONFIGURE_OPTS) \ -+ --with-dist-prefix='$(NSPR_PREFIX)' \ -+ --with-dist-includedir='$(NSPR_PREFIX)/include' -+ -+build_nspr: $(NSPR_CONFIG_STATUS) -+ cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) -+ -+clobber_nspr: $(NSPR_CONFIG_STATUS) -+ cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber -+ -+build_dbm: -+ifdef NSS_DISABLE_DBM -+ @echo "skipping the build of DBM" -+else -+ cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs -+endif -+ -+clobber_dbm: -+ cd $(CORE_DEPTH)/dbm ; $(MAKE) clobber -+ -+moz_import:: -+ifeq (,$(filter-out WIN%,$(OS_TARGET))) -+ $(NSINSTALL) -D $(DIST)/include/nspr -+ cp $(DIST)/../include/nspr/*.h $(DIST)/include/nspr -+ cp $(DIST)/../include/* $(DIST)/include -+ifdef BUILD_OPT -+ cp $(DIST)/../WIN32_O.OBJ/lib/* $(DIST)/lib -+else -+ cp $(DIST)/../WIN32_D.OBJ/lib/* $(DIST)/lib -+endif -+ mv $(DIST)/lib/dbm32.lib $(DIST)/lib/dbm.lib -+else -+ifeq ($(OS_TARGET),OS2) -+ cp -rf $(DIST)/../include $(DIST) -+ cp -rf $(DIST)/../lib $(DIST) -+ cp -f $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX) -+else -+ $(NSINSTALL) -L ../../dist include $(DIST) -+ $(NSINSTALL) -L ../../dist lib $(DIST) -+ cp $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX) -+endif -+endif -+ -+nss_RelEng_bld: build_coreconf import build_dbm all -+ -+package: -+ $(MAKE) -C pkg publish -diff -Nur nss-3.13.6.orig/mozilla/security/nss/config/Makefile nss-3.13.6/mozilla/security/nss/config/Makefile ---- nss-3.13.6.orig/mozilla/security/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ nss-3.13.6/mozilla/security/nss/config/Makefile 2012-10-01 12:58:43.000000000 +0200 +diff -Nur nss-3.14.1.orig//mozilla/security/nss/config/Makefile nss-3.14.1/mozilla/security/nss/config/Makefile +--- nss-3.14.1.orig//mozilla/security/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ nss-3.14.1/mozilla/security/nss/config/Makefile 2013-02-01 18:15:55.000000000 +0100 @@ -0,0 +1,41 @@ +CORE_DEPTH = ../.. +DEPTH = ../.. @@ -257,9 +43,9 @@ diff -Nur nss-3.13.6.orig/mozilla/security/nss/config/Makefile nss-3.13.6/mozill + +dummy: all export install libs + -diff -Nur nss-3.13.6.orig/mozilla/security/nss/config/nss-config.in nss-3.13.6/mozilla/security/nss/config/nss-config.in ---- nss-3.13.6.orig/mozilla/security/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100 -+++ nss-3.13.6/mozilla/security/nss/config/nss-config.in 2012-10-01 12:37:24.000000000 +0200 +diff -Nur nss-3.14.1.orig//mozilla/security/nss/config/nss-config.in nss-3.14.1/mozilla/security/nss/config/nss-config.in +--- nss-3.14.1.orig//mozilla/security/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100 ++++ nss-3.14.1/mozilla/security/nss/config/nss-config.in 2013-02-01 18:15:55.000000000 +0100 @@ -0,0 +1,153 @@ +#!/bin/sh + @@ -414,9 +200,9 @@ diff -Nur nss-3.13.6.orig/mozilla/security/nss/config/nss-config.in nss-3.13.6/m + echo $libdirs +fi + -diff -Nur nss-3.13.6.orig/mozilla/security/nss/config/nss.pc.in nss-3.13.6/mozilla/security/nss/config/nss.pc.in ---- nss-3.13.6.orig/mozilla/security/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ nss-3.13.6/mozilla/security/nss/config/nss.pc.in 2012-10-01 12:37:24.000000000 +0200 +diff -Nur nss-3.14.1.orig//mozilla/security/nss/config/nss.pc.in nss-3.14.1/mozilla/security/nss/config/nss.pc.in +--- nss-3.14.1.orig//mozilla/security/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ nss-3.14.1/mozilla/security/nss/config/nss.pc.in 2013-02-01 18:15:55.000000000 +0100 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -430,10 +216,22 @@ diff -Nur nss-3.13.6.orig/mozilla/security/nss/config/nss.pc.in nss-3.13.6/mozil +Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ +Cflags: -I${includedir} + -diff -Nur nss-3.13.6.orig/mozilla/security/nss/manifest.mn nss-3.13.6/mozilla/security/nss/manifest.mn ---- nss-3.13.6.orig/mozilla/security/nss/manifest.mn 2010-03-26 23:31:18.000000000 +0100 -+++ nss-3.13.6/mozilla/security/nss/manifest.mn 2012-10-01 12:37:24.000000000 +0200 -@@ -42,6 +42,6 @@ +diff -Nur nss-3.14.1.orig//mozilla/security/nss/Makefile nss-3.14.1/mozilla/security/nss/Makefile +--- nss-3.14.1.orig//mozilla/security/nss/Makefile 2012-11-14 02:14:07.000000000 +0100 ++++ nss-3.14.1/mozilla/security/nss/Makefile 2013-02-01 18:15:52.000000000 +0100 +@@ -44,7 +44,7 @@ + # (7) Execute "local" rules. (OPTIONAL). # + ####################################################################### + +-nss_build_all: build_coreconf build_nspr build_dbm all ++nss_build_all: build_coreconf build_dbm all + + nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber + +diff -Nur nss-3.14.1.orig//mozilla/security/nss/manifest.mn nss-3.14.1/mozilla/security/nss/manifest.mn +--- nss-3.14.1.orig//mozilla/security/nss/manifest.mn 2012-03-20 15:46:49.000000000 +0100 ++++ nss-3.14.1/mozilla/security/nss/manifest.mn 2013-02-01 18:15:55.000000000 +0100 +@@ -10,6 +10,6 @@ RELEASE = nss diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 411a79b15..d6dcd5ce0 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl PKG_VERSION:= 1.0.1c -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= ae412727c8c15b67880aef7bd2999b2e PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries PKG_SECTION:= libs @@ -53,11 +53,17 @@ ifneq ($(ADK_PACKAGE_LIBOPENSSL_WITH_CRYPTODEV),) OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS endif +ifeq ($(ADK_LINUX_X86_64),y) +CONFIG:= linux-embedded-x86_64 +else +CONFIG:= linux-embedded +endif + do-configure: (cd $(WRKBUILD); \ PATH=$(TARGET_PATH) \ OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \ - ./Configure linux-embedded \ + ./Configure $(CONFIG) \ --prefix=/usr \ --openssldir=/etc/ssl \ -I$(STAGING_TARGET_DIR)/usr/include \ @@ -76,7 +82,7 @@ do-build: post-install: ${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib - ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib + ${CP} ${WRKINST}/usr/lib*/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so* openssl-util-install: diff --git a/package/openssl/patches/patch-Configure b/package/openssl/patches/patch-Configure index 9275cd530..d5ec7cc28 100644 --- a/package/openssl/patches/patch-Configure +++ b/package/openssl/patches/patch-Configure @@ -1,10 +1,11 @@ ---- openssl-1.0.0.orig/Configure 2010-01-19 22:40:54.000000000 +0100 -+++ openssl-1.0.0/Configure 2010-05-29 15:58:43.561613735 +0200 -@@ -379,6 +379,7 @@ my %table=( +--- openssl-1.0.1c.orig/Configure 2012-03-14 23:20:40.000000000 +0100 ++++ openssl-1.0.1c/Configure 2013-01-31 14:32:14.000000000 +0100 +@@ -400,6 +400,8 @@ my %table=( "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", +"linux-embedded","gcc:-DTERMIO \$(OPTIMIZATION_FLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-embedded-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", - #### *BSD [do see comment about ${BSDthreads} above!] - "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # Android: linux-* but without -DTERMIO and pointers to headers and libs. + "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/package/openssl/patches/patch-Makefile_org b/package/openssl/patches/patch-Makefile_org index f72030d14..f19124dbe 100644 --- a/package/openssl/patches/patch-Makefile_org +++ b/package/openssl/patches/patch-Makefile_org @@ -1,8 +1,8 @@ ---- openssl-1.0.0d.orig/Makefile.org 2010-01-27 17:06:58.000000000 +0100 -+++ openssl-1.0.0d/Makefile.org 2011-10-12 06:07:40.993200000 +0200 -@@ -109,7 +109,7 @@ LIBKRB5= - ZLIB_INCLUDE= - LIBZLIB= +--- openssl-1.0.1c.orig/Makefile.org 2012-04-22 15:25:19.000000000 +0200 ++++ openssl-1.0.1c/Makefile.org 2013-01-31 14:28:34.000000000 +0100 +@@ -135,7 +135,7 @@ FIPSCANLIB= + + BASEADDR= -DIRS= crypto ssl engines apps test tools +DIRS= crypto ssl engines apps tools diff --git a/package/pango/Makefile b/package/pango/Makefile index 5000a6d65..57f0b28d1 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -30,6 +30,7 @@ $(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,PANGO_DEV,pango-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PANGO_DEV},${PKGSC_PANGO_DEV},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 CONFIGURE_ENV+= ac_cv_path_EGREP="grep -E" pango-install: diff --git a/package/tar/Makefile b/package/tar/Makefile index 8c16627d1..d8b6df756 100644 --- a/package/tar/Makefile +++ b/package/tar/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tar -PKG_VERSION:= 1.25 +PKG_VERSION:= 1.26 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0e48e9e473a72f135d0ebbc8af2762cc +PKG_MD5SUM:= 00d1e769c6af702c542cca54b728920d PKG_DESCR:= GNU archiving application PKG_SECTION:= archive PKG_URL:= http://mirrors.kernel.org/gnu/tar/ diff --git a/package/tar/patches/patch-gnu_stdio_in_h b/package/tar/patches/patch-gnu_stdio_in_h new file mode 100644 index 000000000..413ba928e --- /dev/null +++ b/package/tar/patches/patch-gnu_stdio_in_h @@ -0,0 +1,13 @@ +--- tar-1.26.orig/gnu/stdio.in.h 2011-03-12 10:14:33.000000000 +0100 ++++ tar-1.26/gnu/stdio.in.h 2013-01-31 17:05:49.000000000 +0100 +@@ -163,8 +163,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ ++/* + #undef gets + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++*/ + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index ea2bf1820..cf01143d5 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -4,16 +4,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux -PKG_VERSION:= 2.20.1 +PKG_VERSION:= 2.22.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 079b37517fd4e002a2e6e992e8b4e361 +PKG_MD5SUM:= eeacbfdd2556acd899a2d0ffdb446185 PKG_DESCR:= Linux utilities PKG_SECTION:= fs PKG_BUILDDEP:= ncurses -PKG_SITES:= ftp://ftp.infradead.org/pub/util-linux/v2.20/ +PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.22/ PKG_NOPARALLEL:= 1 -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SUBPKGS:= FDISK SFDISK SWAP_UTILS LOSETUP MOUNT MCOOKIE PKG_SUBPKGS+= LIBUUID LIBBLKID LIBUUID_DEV @@ -50,6 +50,8 @@ CONFIGURE_ENV+= scanf_cv_type_modifier=yes CONFIGURE_ARGS+= --disable-use-tty-group \ --disable-schedutils \ --disable-cramfs \ + --disable-login \ + --disable-su \ --enable-libuuid \ --enable-libblkid \ --enable-libmount \ diff --git a/package/vim/Makefile b/package/vim/Makefile index 206c43dc8..da2cd3d3b 100644 --- a/package/vim/Makefile +++ b/package/vim/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= 5b9510a17074e2b37d8bb38ae09edbf2 PKG_DESCR:= The text editor PKG_SECTION:= editor -PKG_DEPENDS:= libncurses +PKG_DEPENDS:= libncurses libgcc PKG_BUILDDEP:= ncurses PKG_URL:= http://www.vim.org/ PKG_SITES:= ftp://ftp.vim.org/pub/vim/unix/ diff --git a/package/xauth/Makefile b/package/xauth/Makefile index 150f2e813..8d9aab007 100644 --- a/package/xauth/Makefile +++ b/package/xauth/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 2eb3cc3e4421e1b747c4ac16aac20cda PKG_DESCR:= X authority file utility PKG_SECTION:= x11/apps -PKG_DEPENDS:= libx11 libxext libxmu +PKG_DEPENDS:= libx11 libxext libxmu libgcc PKG_BUILDDEP:= libX11 libXext libXmu PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 730d5c093..a4df670d3 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= x11/server PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext -PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb +PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libgcc PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 6cfa0580e..ffd298550 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= zlib -PKG_VERSION:= 1.2.6 +PKG_VERSION:= 1.2.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= dc2cfa0d2313ca77224b4d932b2911e9 +PKG_MD5SUM:= 2ab442d169156f34c379c968f3f482dd PKG_DESCR:= implementation of the deflate compression method PKG_SECTION:= libs PKG_URL:= http://www.zlib.net/ diff --git a/scripts/create.sh b/scripts/create.sh index 59ea2eaa5..e96f4db77 100755 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -37,7 +37,7 @@ esac test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then make package=mksh fetch || exit 1 - df=$(make -s package=mksh show=DISTFILES) + df=mksh-R40f.cpio.gz rm -rf build_mksh mkdir -p build_mksh gzip -dc dl/"$df" | (cd build_mksh; cpio -mid) diff --git a/target/config/Config.in b/target/config/Config.in index 187654019..8b88b0b49 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -121,7 +121,7 @@ config ADK_TARGET_LIBC_PATH menu "Target multilib support" -depends on ADK_TARGET_KERNEL64 && \ +depends on ADK_TARGET_DISABLED && \ ( ADK_LINUX_X86_64 || ADK_LINUX_MIPS ) && \ ( ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC ) diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 17b1453df..e3df1396f 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -128,6 +128,19 @@ config ADK_KERNEL_PATA_SC1200 default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP default n +config ADK_KERNEL_PATA_JMICRON + boolean + select ADK_KERNEL_BLOCK + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_ATA_SFF + select ADK_KERNEL_ATA_BMDMA + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC + default n + config ADK_KERNEL_ATA_PIIX boolean select ADK_KERNEL_BLOCK @@ -149,6 +162,8 @@ config ADK_KERNEL_ATA_PIIX default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC default n config ADK_KERNEL_SATA_AHCI diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 632bcf3e5..4a6cb4dec 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -19,6 +19,7 @@ config ADK_KERNEL_VT_CONSOLE config ADK_KERNEL_VGA_CONSOLE boolean default y if ADK_HARDWARE_VBOX + default y if ADK_TARGET_WITH_VGA default n config ADK_KERNEL_FONTS diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 4f29471da..477cd46e8 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -8,6 +8,8 @@ config ADK_KERNEL_INPUT default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG @@ -47,6 +49,8 @@ config ADK_KERNEL_INPUT_KEYBOARD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG @@ -61,6 +65,8 @@ config ADK_KERNEL_KEYBOARD_ATKBD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG @@ -74,6 +80,8 @@ config ADK_KERNEL_INPUT_MOUSE default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG @@ -88,6 +96,8 @@ config ADK_KERNEL_INPUT_MOUSEDEV default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 9aade47ab..48788ca4f 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -158,6 +158,8 @@ config ADK_KERNEL_E1000 default y if ADK_TARGET_SYSTEM_VBOX_I686 default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC default y if ADK_TARGET_SYSTEM_QEMU_I686 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default n diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 7d7dc1f8f..d93c820cc 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -40,6 +40,8 @@ config ADK_HARDWARE_ACPI default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC default n help Enable ACPI support. diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 057fa1ffc..296986968 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -33,6 +33,8 @@ config ADK_KPACKAGE_KMOD_USB default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_INTEL_ATOM @@ -162,6 +164,8 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_TAROX_PC + default y if ADK_NATIVE_SYSTEM_TAROX_PC default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n help diff --git a/target/packages/pkg-available/desktop b/target/packages/pkg-available/desktop new file mode 100644 index 000000000..de2e85381 --- /dev/null +++ b/target/packages/pkg-available/desktop @@ -0,0 +1,37 @@ +config ADK_PKG_DESKTOP + bool "Choose packages for my desktop system with X" + default n + select ADK_PACKAGE_SCREEN + select ADK_PACKAGE_VIM + select ADK_PACKAGE_SUDO + select ADK_PACKAGE_LYNX + select ADK_PACKAGE_KEYCHAIN + select ADK_PACKAGE_ALSA_UTILS + select ADK_PACKAGE_OPENSSH_CLIENT + select ADK_PACKAGE_OPENSSH_CLIENT_UTILS + select ADK_PACKAGE_OPENSSH_SERVER + select ADK_PACKAGE_MKSH + select ADK_PACKAGE_MKSH_FULL + select ADK_PACKAGE_RXVT_UNICODE + select ADK_PACKAGE_XTERM + select ADK_PACKAGE_XORG_SERVER + select ADK_PACKAGE_XORG_SERVER_WITH_DRI + select ADK_PACKAGE_XF86_INPUT_KEYBOARD + select ADK_PACKAGE_XF86_INPUT_MOUSE + select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_TAROX_PC + select ADK_PACKAGE_FONT_MISC_MISC + select ADK_PACKAGE_SETXKBMAP + select ADK_PACKAGE_XBINDKEYS + select ADK_PACKAGE_DISPLAY + select ADK_PACKAGE_FEH + select ADK_PACKAGE_XINIT + select ADK_PACKAGE_EVILWM + select ADK_PACKAGE_IRSSI + select ADK_PACKAGE_IRSSI_WITH_SSL + select ADK_PACKAGE_IRSSI_WITH_IPV6 + select ADK_PACKAGE_XRDB + select ADK_PACKAGE_FIREFOX + select ADK_PACKAGE_DILLO + select ADK_PACKAGE_MPLAYER + select ADK_KPACKAGE_KMOD_USB_STORAGE + select ADK_KPACKAGE_KMOD_USB_HID diff --git a/target/x86_64/kernel64.config b/target/x86_64/kernel64.config index 2721be709..4e0b38931 100644 --- a/target/x86_64/kernel64.config +++ b/target/x86_64/kernel64.config @@ -1,9 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.5.4 Kernel Configuration +# Linux/x86 3.7.3 Kernel Configuration # CONFIG_64BIT=y -# CONFIG_X86_32 is not set CONFIG_X86_64=y CONFIG_X86=y CONFIG_INSTRUCTION_DECODER=y @@ -20,7 +19,6 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -66,9 +64,7 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y @@ -97,6 +93,14 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y # +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set + +# # RCU Subsystem # CONFIG_TINY_RCU=y @@ -109,6 +113,8 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_CGROUPS is not set # CONFIG_CHECKPOINT_RESTORE is not set # CONFIG_NAMESPACES is not set +CONFIG_UIDGID_CONVERTED=y +# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set @@ -117,8 +123,10 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y CONFIG_EXPERT=y +CONFIG_HAVE_UID16=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y # CONFIG_KALLSYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -167,12 +175,21 @@ CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_GENERIC_KERNEL_THREAD=y +CONFIG_GENERIC_KERNEL_EXECVE=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_RCU_USER_QS=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_RELA=y # # GCOV-based kernel profiling @@ -187,37 +204,13 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set # CONFIG_BLOCK is not set -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set CONFIG_INLINE_READ_UNLOCK=y -# CONFIG_INLINE_READ_UNLOCK_BH is not set CONFIG_INLINE_READ_UNLOCK_IRQ=y -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set CONFIG_INLINE_WRITE_UNLOCK=y -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_FREEZER is not set # @@ -257,7 +250,6 @@ CONFIG_HPET_TIMER=y CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y CONFIG_NR_CPUS=1 -# CONFIG_IRQ_TIME_ACCOUNTING is not set CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -307,6 +299,7 @@ CONFIG_MTRR=y CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y # CONFIG_ARCH_RANDOM is not set +CONFIG_X86_SMAP=y # CONFIG_EFI is not set # CONFIG_SECCOMP is not set # CONFIG_CC_STACKPROTECTOR is not set @@ -354,7 +347,6 @@ CONFIG_X86_PM_TIMER=y # CONFIG_ACPI_CONTAINER is not set # CONFIG_ACPI_SBS is not set # CONFIG_ACPI_HED is not set -# CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_APEI is not set # CONFIG_SFI is not set @@ -365,6 +357,7 @@ CONFIG_X86_PM_TIMER=y CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set # CONFIG_INTEL_IDLE is not set # @@ -406,6 +399,7 @@ CONFIG_COMPAT_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y # CONFIG_HAVE_AOUT is not set # CONFIG_BINFMT_MISC is not set +CONFIG_COREDUMP=y CONFIG_IA32_EMULATION=y # CONFIG_IA32_AOUT is not set CONFIG_X86_X32=y @@ -420,6 +414,7 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y +# CONFIG_PACKET_DIAG is not set CONFIG_UNIX=y # CONFIG_UNIX_DIAG is not set # CONFIG_XFRM_USER is not set @@ -512,6 +507,11 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set # CONFIG_DMA_SHARED_BUFFER is not set + +# +# Bus devices +# +# CONFIG_OMAP_OCP2SCP is not set # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set # CONFIG_PARPORT is not set @@ -569,7 +569,6 @@ CONFIG_SCSI_MOD=y # CONFIG_I2O is not set # CONFIG_MACINTOSH_DRIVERS is not set # CONFIG_NETDEVICES is not set -# CONFIG_ISDN is not set # # Input device support @@ -625,10 +624,10 @@ CONFIG_UNIX98_PTYS=y # Serial drivers # CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y # CONFIG_SERIAL_8250_PCI is not set -CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set @@ -640,6 +639,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set @@ -683,6 +683,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_GPIOLIB is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set +# CONFIG_POWER_AVS is not set # CONFIG_HWMON is not set CONFIG_THERMAL=y # CONFIG_WATCHDOG is not set @@ -744,6 +745,7 @@ CONFIG_DUMMY_CONSOLE=y # CONFIG_HID=y # CONFIG_HIDRAW is not set +# CONFIG_UHID is not set CONFIG_HID_GENERIC=y # @@ -769,7 +771,6 @@ CONFIG_USB_ARCH_HAS_XHCI=y # Virtio drivers # # CONFIG_VIRTIO_PCI is not set -# CONFIG_VIRTIO_BALLOON is not set # CONFIG_VIRTIO_MMIO is not set # @@ -789,6 +790,7 @@ CONFIG_CLKBLD_I8253=y # # Remoteproc drivers (EXPERIMENTAL) # +# CONFIG_STE_MODEM_RPROC is not set # # Rpmsg drivers (EXPERIMENTAL) @@ -799,6 +801,7 @@ CONFIG_CLKBLD_I8253=y # CONFIG_MEMORY is not set # CONFIG_IIO is not set # CONFIG_VME_BUS is not set +# CONFIG_PWM is not set # # Firmware Drivers @@ -918,7 +921,6 @@ CONFIG_FRAME_WARN=1024 CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set # CONFIG_LOCKUP_DETECTOR is not set -# CONFIG_HARDLOCKUP_DETECTOR is not set # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 # CONFIG_DETECT_HUNG_TASK is not set @@ -927,6 +929,7 @@ CONFIG_PANIC_ON_OOPS_VALUE=0 # CONFIG_TIMER_STATS is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set @@ -958,6 +961,7 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y # CONFIG_RCU_TRACE is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set # CONFIG_DEBUG_PAGEALLOC is not set @@ -969,9 +973,12 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set @@ -988,6 +995,7 @@ CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_DEBUG_RODATA is not set # CONFIG_DEBUG_SET_MODULE_RONX is not set # CONFIG_DEBUG_NX_TEST is not set +# CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y CONFIG_IO_DELAY_TYPE_0X80=0 @@ -1013,7 +1021,117 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_SECURITYFS is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_FIPS is not set +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=m +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set +# CONFIG_CRYPTO_USER is not set +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_CRC32C_INTEL is not set +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA1_SSSE3 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_AES_X86_64 is not set +# CONFIG_CRYPTO_AES_NI_INTEL is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_BLOWFISH_X86_64 is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAMELLIA_X86_64 is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_CAST6_AVX_X86_64 is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SALSA20_X86_64 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set +# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_TWOFISH_X86_64 is not set +# CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set +# CONFIG_CRYPTO_TWOFISH_AVX_X86_64 is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +# CONFIG_CRYPTO_USER_API_HASH is not set +# CONFIG_CRYPTO_USER_API_SKCIPHER is not set +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_PADLOCK is not set CONFIG_HAVE_KVM=y # CONFIG_VIRTUALIZATION is not set # CONFIG_BINARY_PRINTF is not set @@ -1048,6 +1166,7 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_DQL=y CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y # CONFIG_AVERAGE is not set # CONFIG_CORDIC is not set # CONFIG_DDR is not set diff --git a/target/x86_64/sys-available/tarox-pc b/target/x86_64/sys-available/tarox-pc new file mode 100644 index 000000000..9c0c13c08 --- /dev/null +++ b/target/x86_64/sys-available/tarox-pc @@ -0,0 +1,14 @@ +config ADK_TARGET_SYSTEM_TAROX_PC + bool "Tarox PC" + select ADK_x86_64 + select ADK_tarox_pc + select ADK_LINUX_64 + select ADK_KERNEL_SMP + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_SATA + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_PCI + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_USB_BOOT + help + Support for Tarox Business PC. diff --git a/toolchain/glibc/patches/timezone.patch b/toolchain/glibc/patches/timezone.patch deleted file mode 100644 index 0855ef578..000000000 --- a/toolchain/glibc/patches/timezone.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- toolchain_build_i686_eglibc/w-eglibc-2.16-1/eglibc-2.16/libc/timezone/Makefile 2012-07-31 08:58:48.000000000 +0200 -+++ toolchain_build_i686_glibc/w-glibc-2.16.0-1/glibc-2.16.0/timezone/Makefile 2012-06-30 21:12:34.000000000 +0200 -@@ -52,16 +52,7 @@ - include ../Rules - - --zic-objs = zic.o ialloc.o scheck.o -- --$(objpfx)zic: $(addprefix $(objpfx), $(zic-objs)) -- --$(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c -- $(BUILD_CC) $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ -- -DCROSS_ZIC $(compile-mkdep-flags) -- --$(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) -- $(BUILD_CC) $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ -+$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o - - tz-cflags = -DTZDIR='"$(zonedir)"' \ - -DTZDEFAULT='"$(localtime-file)"' \ -@@ -78,17 +69,10 @@ - # Don't add leapseconds here since test-tz made checks that work only without - # leapseconds. - testdata = $(objpfx)testdata --ifeq (no,$(cross-compiling)) - define build-testdata - GCONV_PATH=${common-objpfx}iconvdata LANGUAGE=C LC_ALL=C \ - $(built-program-cmd) -d $(testdata) -y ./yearistype $< - endef --else --define build-testdata --LANGUAGE=C LC_ALL=C \ -- $(objpfx)cross-zic -d $(testdata) -y ./yearistype $< --endef --endif - - $(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC) - $(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \ -@@ -101,11 +85,7 @@ - tst-timezone-ENV = TZDIR=$(testdata) - - # Note this must come second in the deps list for $(built-program-cmd) to work. --ifeq (no,$(cross-compiling)) - zic-deps = $(objpfx)zic $(leapseconds) yearistype --else --zic-deps = $(objpfx)cross-zic $(objpfx)zic $(leapseconds) yearistype --endif - - $(testdata)/America/New_York: northamerica $(zic-deps) - $(build-testdata) -@@ -127,8 +107,6 @@ - - $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make - sed -e 's%@KSH@%$(KSH)%g' \ -- -e 's%@TZDIR@%$(zonedir)%g' \ -- -e 's%@PKGVERSION@%$(PKGVERSION)%g' \ -- -e 's%@REPORT_BUGS_TO@%$(REPORT_BUGS_TO)%g' < $< > $@.new -+ -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new - chmod 555 $@.new - mv -f $@.new $@ |