From: Chen Qi Date: Fri, 5 Jul 2013 02:29:29 +0000 (+0800) Subject: busybox: upgrade to stable 1.21.1 X-Git-Tag: rev_ivi_2015_02_04~11883 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b63614eb3d198234a48d1191adb951230a25fc0;p=scm%2Fbb%2Ftizen-distro.git busybox: upgrade to stable 1.21.1 Merged or backported patches are dropped. The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's about the -P option behavior, and it's not accepted, so I dropped this patch too. (From OE-Core rev: a2f31a6a6accb8eee2084cb39edb8e9af4b4189f) Signed-off-by: Chen Qi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch b/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch deleted file mode 100644 index c4d98e3..0000000 --- a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -# copy commit message from OE as the patch comment: -# commit 5b1ed09b1ab1a60a28a76e4658bc9957cd361b5d -# Author: Valentin Longchamp -# Date: Mon Dec 8 14:43:23 2008 +0100 - -# busybox: added support for 921600 speed of serial line -# -# above comment added by Kevin Tian , 2010-07-06 - -diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c ---- busybox-1.7.2/libbb/speed_table.c 2007-09-03 13:48:41.000000000 +0200 -+++ busybox-1.7.2-921600/libbb/speed_table.c 2008-10-09 16:23:26.269592899 +0200 -@@ -52,6 +52,9 @@ static const struct speed_map speeds[] = - #ifdef B460800 - {B460800, 460800/256 + 0x8000U}, - #endif -+#ifdef B921600 -+ {B921600, 921600/256 + 0x8000U}, -+#endif - }; - - enum { NUM_SPEEDS = ARRAY_SIZE(speeds) }; diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch deleted file mode 100644 index 69bbe73..0000000 --- a/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch +++ /dev/null @@ -1,28 +0,0 @@ -Signed-off-by: Radu Moisan -Upstream-Status: Pending - ---- busybox-1.20.2/libbb/kernel_version.c -+++ busybox-1.20.2-kernel_ver/libbb/kernel_version.c -@@ -20,18 +20,15 @@ - int FAST_FUNC get_linux_version_code(void) - { - struct utsname name; -- char *s; -+ char *s, *t; - int i, r; - -- if (uname(&name) == -1) { -- bb_perror_msg("can't get system information"); -- return 0; -- } -- -+ uname(&name); /* never fails */ - s = name.release; - r = 0; - for (i = 0; i < 3; i++) { -- r = r * 256 + atoi(strtok(s, ".")); -+ t = strtok(s, "."); -+ r = r * 256 + (t ? atoi(t) : 0); - s = NULL; - } - return r; diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch deleted file mode 100644 index 089c5e0..0000000 --- a/meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch +++ /dev/null @@ -1,34 +0,0 @@ -patch mkfs.minix.tests to have correct md5sum on big endian platform - -Upstream-Status: Accepted, expected in next release - -Signed-off-by: Yao Zhao - -diff --git a/testsuite/mkfs.minix.tests b/testsuite/mkfs.minix.tests -index 8a33c16..7eecaf2 100755 ---- a/testsuite/mkfs.minix.tests -+++ b/testsuite/mkfs.minix.tests -@@ -8,6 +8,14 @@ - - # testing "test name" "options" "expected result" "file input" "stdin" - -+# '\n' produces 10 on little endian, but not on big endian -+cr=`echo | od -i | sed 's/.* //g;2d'` -+if [ x"$cr" = x"10" ]; then -+ hash=4f35f7afeba07d56055bed1f29ae20b7 -+else -+ hash=5adbc1b3ccd20ca5d0ab5bc1e13ac3fc -+fi -+ - testing "mkfs.minix" \ - "dd if=/dev/zero of=input bs=1k count=1024 2>/dev/null; mkfs.minix input; md5sum -Date: Thu, 10 May 2012 19:26:37 +0200 -Subject: [PATCH] fix for spurious testsuite failure - -Upstream-Status: Backport -Signed-off-by: Denys Vlasenko ---- - testsuite/du/du-k-works | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/testsuite/du/du-k-works b/testsuite/du/du-k-works -index 229a948..36dcaa8 100644 ---- a/testsuite/du/du-k-works -+++ b/testsuite/du/du-k-works -@@ -3,4 +3,5 @@ cd du.testdir - dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null - dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null - test x"`busybox du -k .`" = x"80 ." \ -+ -o x"`busybox du -k .`" = x"84 ." \ - -o x"`busybox du -k .`" = x"88 ." --- -1.7.4.1 - diff --git a/meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch b/meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch deleted file mode 100644 index 8696427..0000000 --- a/meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch +++ /dev/null @@ -1,49 +0,0 @@ -Add support for the "strictatime" mount option. - -Upstream-Status: Backport [9ad8979ff15e1b894ee1f4bb6a2535a1a2c20d65] -Signed-off-by: Ross Burton - -Index: busybox-1.20.2/util-linux/mount.c -=================================================================== ---- busybox-1.20.2.orig/util-linux/mount.c 2012-07-02 15:08:25.000000000 +0100 -+++ busybox-1.20.2/util-linux/mount.c 2013-03-22 15:37:31.340277463 +0000 -@@ -113,6 +113,12 @@ - #ifndef MS_RELATIME - # define MS_RELATIME (1 << 21) - #endif -+#ifndef MS_STRICTATIME -+# define MS_STRICTATIME (1 << 24) -+#endif -+ -+/* Any ~MS_FOO value has this bit set: */ -+#define BB_MS_INVERTED_VALUE (1u << 31) - - #include "libbb.h" - #if ENABLE_FEATURE_MOUNT_LABEL -@@ -239,6 +245,7 @@ - /* "nomand" */ ~MS_MANDLOCK, - /* "relatime" */ MS_RELATIME, - /* "norelatime" */ ~MS_RELATIME, -+ /* "strictatime" */ MS_STRICTATIME, - /* "loud" */ ~MS_SILENT, - /* "rbind" */ MS_BIND|MS_RECURSIVE, - -@@ -295,6 +302,7 @@ - "nomand\0" - "relatime\0" - "norelatime\0" -+ "strictatime\0" - "loud\0" - "rbind\0" - -@@ -466,8 +474,8 @@ - // Find this option in mount_options - for (i = 0; i < ARRAY_SIZE(mount_options); i++) { - if (strcasecmp(option_str, options) == 0) { -- long fl = mount_options[i]; -- if (fl < 0) -+ unsigned long fl = mount_options[i]; -+ if (fl & BB_MS_INVERTED_VALUE) - flags &= fl; - else - flags |= fl; diff --git a/meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch b/meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch deleted file mode 100644 index bd55961..0000000 --- a/meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch +++ /dev/null @@ -1,99 +0,0 @@ -Signed-off-by: Khem Raj - -Upstream-Status: Pending - -From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 06 Jul 2012 03:19:09 +0000 -Subject: include sys/resource.h where needed - -We use functions from sys/resource.h in misc applets, but don't include -the header. This breaks building with newer glibc versions, so add the -include where needed. - -Signed-off-by: Mike Frysinger ---- -Index: busybox-1.19.4/loginutils/passwd.c -=================================================================== ---- busybox-1.19.4.orig/loginutils/passwd.c 2012-02-04 11:34:24.000000000 -0800 -+++ busybox-1.19.4/loginutils/passwd.c 2012-07-06 17:48:27.388096092 -0700 -@@ -15,6 +15,7 @@ - - #include "libbb.h" - #include -+#include /* setrlimit */ - - static void nuke_str(char *str) - { -Index: busybox-1.19.4/miscutils/time.c -=================================================================== ---- busybox-1.19.4.orig/miscutils/time.c 2012-02-04 11:24:55.000000000 -0800 -+++ busybox-1.19.4/miscutils/time.c 2012-07-06 17:48:27.388096092 -0700 -@@ -16,6 +16,7 @@ - //usage: "\n -v Verbose" - - #include "libbb.h" -+#include /* getrusage */ - - /* Information on the resources used by a child process. */ - typedef struct { -Index: busybox-1.19.4/networking/inetd.c -=================================================================== ---- busybox-1.19.4.orig/networking/inetd.c 2012-02-04 11:34:24.000000000 -0800 -+++ busybox-1.19.4/networking/inetd.c 2012-07-06 17:48:54.852097259 -0700 -@@ -165,6 +165,7 @@ - //usage: "\n (default: 0 - disabled)" - - #include -+#include /* setrlimit */ - #include - - #include "libbb.h" -Index: busybox-1.19.4/networking/ntpd.c -=================================================================== ---- busybox-1.19.4.orig/networking/ntpd.c 2012-02-04 11:24:55.000000000 -0800 -+++ busybox-1.19.4/networking/ntpd.c 2012-07-06 17:48:27.392096048 -0700 -@@ -46,6 +46,7 @@ - #include "libbb.h" - #include - #include /* For IPTOS_LOWDELAY definition */ -+#include /* setpriority */ - #include - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 -Index: busybox-1.19.4/networking/ntpd_simple.c -=================================================================== ---- busybox-1.19.4.orig/networking/ntpd_simple.c 2012-02-04 11:24:55.000000000 -0800 -+++ busybox-1.19.4/networking/ntpd_simple.c 2012-07-06 17:48:27.400095949 -0700 -@@ -7,6 +7,7 @@ - */ - #include "libbb.h" - #include /* For IPTOS_LOWDELAY definition */ -+#include /* setpriority */ - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 - #endif -Index: busybox-1.19.4/runit/chpst.c -=================================================================== ---- busybox-1.19.4.orig/runit/chpst.c 2012-02-04 11:34:24.000000000 -0800 -+++ busybox-1.19.4/runit/chpst.c 2012-07-06 17:48:27.400095949 -0700 -@@ -91,6 +91,7 @@ - //usage: "\n a SIGXCPU after N seconds" - - #include "libbb.h" -+#include /* getrlimit */ - - /* - Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit. -Index: busybox-1.19.4/shell/shell_common.c -=================================================================== ---- busybox-1.19.4.orig/shell/shell_common.c 2012-02-04 11:34:24.000000000 -0800 -+++ busybox-1.19.4/shell/shell_common.c 2012-07-06 17:48:27.400095949 -0700 -@@ -18,6 +18,7 @@ - */ - #include "libbb.h" - #include "shell_common.h" -+#include /* getrlimit */ - - const char defifsvar[] ALIGN1 = "IFS= \t\n"; - diff --git a/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch b/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch deleted file mode 100644 index 3003965..0000000 --- a/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -In cases where busybox wget is invoked with -P <...> and the url ends -in "/", the download directory is ignored (ie the file index.html is -implied), this change enables the -P option for those urls. - -Signed-off-by: Amy Fong -Upstream-Status: Submitted ---- - networking/wget.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - ---- a/networking/wget.c -+++ b/networking/wget.c -@@ -589,10 +589,14 @@ - if (!(option_mask32 & WGET_OPT_OUTNAME)) { - G.fname_out = bb_get_last_path_component_nostrip(target.path); - /* handle "wget http://kernel.org//" */ -- if (G.fname_out[0] == '/' || !G.fname_out[0]) -- G.fname_out = (char*)"index.html"; -+ if (G.fname_out[0] == '/' || !G.fname_out[0]) { -+ /* bug: if we provide a default name, we should still look at -P option */ -+ if (G.dir_prefix) -+ G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, "index.html"); -+ else -+ G.fname_out = (char*)"index.html"; - /* -P DIR is considered only if there was no -O FILE */ -- else { -+ } else { - if (G.dir_prefix) - G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out); - else { diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-appletlib-dependency.patch b/meta/recipes-core/busybox/busybox-1.21.1/busybox-appletlib-dependency.patch similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/busybox-appletlib-dependency.patch rename to meta/recipes-core/busybox/busybox-1.21.1/busybox-appletlib-dependency.patch diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-list-suid-and-non-suid-app-configs.patch b/meta/recipes-core/busybox/busybox-1.21.1/busybox-list-suid-and-non-suid-app-configs.patch similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/busybox-list-suid-and-non-suid-app-configs.patch rename to meta/recipes-core/busybox/busybox-1.21.1/busybox-list-suid-and-non-suid-app-configs.patch diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-sulogin-empty-root-password.patch b/meta/recipes-core/busybox/busybox-1.21.1/busybox-sulogin-empty-root-password.patch similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/busybox-sulogin-empty-root-password.patch rename to meta/recipes-core/busybox/busybox-1.21.1/busybox-sulogin-empty-root-password.patch diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox-1.21.1/busybox-udhcpc-no_deconfig.patch similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/busybox-udhcpc-no_deconfig.patch rename to meta/recipes-core/busybox/busybox-1.21.1/busybox-udhcpc-no_deconfig.patch diff --git a/meta/recipes-core/busybox/busybox-1.20.2/defconfig b/meta/recipes-core/busybox/busybox-1.21.1/defconfig similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/defconfig rename to meta/recipes-core/busybox/busybox-1.21.1/defconfig diff --git a/meta/recipes-core/busybox/busybox-1.20.2/fail_on_no_media.patch b/meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/fail_on_no_media.patch rename to meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch diff --git a/meta/recipes-core/busybox/busybox-1.20.2/get_header_tar.patch b/meta/recipes-core/busybox/busybox-1.21.1/get_header_tar.patch similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/get_header_tar.patch rename to meta/recipes-core/busybox/busybox-1.21.1/get_header_tar.patch diff --git a/meta/recipes-core/busybox/busybox-1.20.2/login-utilities.cfg b/meta/recipes-core/busybox/busybox-1.21.1/login-utilities.cfg similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/login-utilities.cfg rename to meta/recipes-core/busybox/busybox-1.21.1/login-utilities.cfg diff --git a/meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch similarity index 94% rename from meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch rename to meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch index 1fe20d4..45f69a9 100644 --- a/meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch +++ b/meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch @@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [configuration] diff -uNr busybox-1.15.3.orig//include/applets.src.h busybox-1.15.3/include/applets.src.h --- busybox-1.15.3.orig//include/applets.src.h 2009-12-12 22:13:28.000000000 +0100 +++ busybox-1.15.3/include/applets.src.h 2010-04-30 15:35:40.000000000 +0200 -@@ -323,7 +323,7 @@ +@@ -304,7 +304,7 @@ IF_RPM(APPLET(rpm, BB_DIR_BIN, BB_SUID_DROP)) IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP)) - IF_RTCWAKE(APPLET(rtcwake, BB_DIR_USR_BIN, BB_SUID_DROP)) + IF_RTCWAKE(APPLET(rtcwake, BB_DIR_USR_SBIN, BB_SUID_DROP)) -IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts)) +IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_USR_BIN, BB_SUID_DROP, run_parts)) IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP)) diff --git a/meta/recipes-core/busybox/busybox-1.20.2/stat-usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/stat-usr-bin.patch rename to meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch diff --git a/meta/recipes-core/busybox/busybox-1.20.2/testsuite-du-du-k-works-fix-false-positive.patch b/meta/recipes-core/busybox/busybox-1.21.1/testsuite-du-du-k-works-fix-false-positive.patch similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/testsuite-du-du-k-works-fix-false-positive.patch rename to meta/recipes-core/busybox/busybox-1.21.1/testsuite-du-du-k-works-fix-false-positive.patch diff --git a/meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch similarity index 100% rename from meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch rename to meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch diff --git a/meta/recipes-core/busybox/busybox_1.20.2.bb b/meta/recipes-core/busybox/busybox_1.21.1.bb similarity index 75% rename from meta/recipes-core/busybox/busybox_1.20.2.bb rename to meta/recipes-core/busybox/busybox_1.21.1.bb index c854f0b..d702f7e 100644 --- a/meta/recipes-core/busybox/busybox_1.20.2.bb +++ b/meta/recipes-core/busybox/busybox_1.21.1.bb @@ -1,15 +1,12 @@ require busybox.inc -PR = "r7" +PR = "r0" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ - file://B921600.patch \ file://get_header_tar.patch \ file://busybox-appletlib-dependency.patch \ file://run-parts.in.usr-bin.patch \ file://watch.in.usr-bin.patch \ file://busybox-udhcpc-no_deconfig.patch \ - file://sys_resource.patch \ - file://wget_dl_dir_fix.patch \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ @@ -24,14 +21,10 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://mdev.conf \ file://umount.busybox \ file://defconfig \ - file://busybox-mkfs-minix-tests_bigendian.patch \ - file://fix-for-spurious-testsuite-failure.patch \ - file://busybox-1.20.2-kernel_ver.patch \ file://stat-usr-bin.patch \ file://busybox-syslog.service.in \ file://busybox-klogd.service.in \ file://testsuite-du-du-k-works-fix-false-positive.patch \ - file://strict-atime.patch \ file://fail_on_no_media.patch \ file://busybox-sulogin-empty-root-password.patch \ file://run-ptest \ @@ -40,8 +33,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://login-utilities.cfg \ file://busybox-list-suid-and-non-suid-app-configs.patch" -SRC_URI[tarball.md5sum] = "e025414bc6cd79579cc7a32a45d3ae1c" -SRC_URI[tarball.sha256sum] = "eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882" +SRC_URI[tarball.md5sum] = "795394f83903b5eec6567d51eebb417e" +SRC_URI[tarball.sha256sum] = "cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"