Upgrade busybox to 1.22.1 stable release

deleted file mode 100644
index e59211b..0000000
@@ -1,23 +0,0 @@
-Derived from:
-http://git.busybox.net/busybox/commit/?id=46031da862a60422f80050a905cea0b67026b021.
-
-In vi mode, the 'p' and 'P' commands caused a segfault when nothing had
-been put in the buffer yet because the delptr was not initialized.
-
-Upstream-Status: Backport
-
-Signed-off-by: Shawn J. Goff <[email protected]>
-Signed-off-by: Denys Vlasenko <[email protected]>
-Signed-off-by: Ming Liu <[email protected]>
-
-diff -urpN a/libbb/lineedit.c b/libbb/lineedit.c
---- a/libbb/lineedit.c
-+++ b/libbb/lineedit.c
-@@ -187,6 +187,7 @@ extern struct lineedit_statics *const li
- 	cmdedit_termw = 80; \
- 	IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \
- 	IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;) \
-+	IF_FEATURE_EDITING_VI(delptr = delbuf;) \
- } while (0)
- 
- static void deinit_S(void)

179 lines not on this page · raw message

262 lines not on this page · raw message

58 lines not on this page · raw message

117 lines not on this page · raw message

deleted file mode 100644
index 45f69a9..0000000
@@ -1,29 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-# copy commit message from OE as the patch comment:
-#    commit f1b326c83be0d95571b991d8d2ee239982380b6b
-#    Author: Martin Jansa <[email protected]>
-#    Date:   Fri Apr 30 15:37:38 2010 +0200
-#
-#    busybox: add patch for installing run-parts to /usr/bin/ instead of /bin
-#    
-#    * otherwise debianutils install will fail with
-#      update-alternatives: Error: cannot register alternative run-parts to /usr/bin/run-parts since it is 
-#    
-#    Signed-off-by: Martin Jansa <[email protected]>
-#
-# Poky doesn't have debianutils, but let's keep it for safety
-# above comment added by Kevin Tian <[email protected]>, 2010-07-06
-
-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
-@@ -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_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))
- IF_RUNLEVEL(APPLET(runlevel, BB_DIR_SBIN, BB_SUID_DROP))
- IF_RUNSV(APPLET(runsv, BB_DIR_USR_BIN, _BB_SUID_DROP))

deleted file mode 100644
index 4049324..0000000
@@ -1,21 +0,0 @@
-busybox: move /bin/stat to /usr/bin/stat to match coreutils
-
-The coreutils stat binary lives in /usr/bin, fix busybox to use the same path so
-they can be properly tracked by alternatives.
-
-Upstream-Status: Inappropriate [embedded]
-Signed-off-by: Andy Ross <[email protected]>
-
-diff --git a/include/applets.src.h b/include/applets.src.h
-index 0d33bfc..30ae3ad 100644
---- a/include/applets.src.h
-+++ b/include/applets.src.h
-@@ -340,7 +340,7 @@ IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, soft
- IF_SORT(APPLET_NOEXEC(sort, sort, BB_DIR_USR_BIN, BB_SUID_DROP, sort))
- IF_SPLIT(APPLET(split, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
--IF_STAT(APPLET(stat, BB_DIR_BIN, BB_SUID_DROP))
-+IF_STAT(APPLET(stat, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_STRINGS(APPLET(strings, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_STTY(APPLET(stty, BB_DIR_BIN, BB_SUID_DROP))
- /* Needs to be run by root or be suid root - needs to change uid and gid: */

deleted file mode 100644
index 070c41b..0000000
@@ -1,35 +0,0 @@
-Upstream-Status: Accepted
-
-[Yocto 2896]
-
-Signed-off-by: Kang Kai <[email protected]>
----
-From 03b614739b923994ff0bef74622973ad18fefebd Mon Sep 17 00:00:00 2001
-From: Kang Kai <[email protected]>
-Date: Mon, 28 Jan 2013 14:02:51 +0100
-Subject: [PATCH] testsuite/du/du-k-works: fix false positive
-
-Signed-off-by: Kang Kai <[email protected]>
-Signed-off-by: Denys Vlasenko <[email protected]>
----
- testsuite/du/du-k-works |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/testsuite/du/du-k-works b/testsuite/du/du-k-works
-index 36dcaa8..417b0da 100644
---- a/testsuite/du/du-k-works
-+++ b/testsuite/du/du-k-works
-@@ -2,6 +2,10 @@ mkdir du.testdir
- 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
-+# ext4 on images <512M gives 81kb
-+# ext3 on images <512M gives 83kb
- test x"`busybox du -k .`" = x"80	." \
-+  -o x"`busybox du -k .`" = x"81	." \
-+  -o x"`busybox du -k .`" = x"83	." \
-   -o x"`busybox du -k .`" = x"84	." \
-   -o x"`busybox du -k .`" = x"88	."
--- 
-1.7.5.4
-

deleted file mode 100644
index e8e1edf..0000000
@@ -1,29 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-From f2372ab626a395d067704f4c318180fb6039de15 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <[email protected]>
-Date: Sat, 24 Mar 2012 17:36:48 +0100
-Subject: [PATCH] watch: move from /bin to /usr/bin for compatibility with
- procps
-
-Signed-off-by: Andreas Oberritter <[email protected]>
----
- include/applets.src.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/applets.src.h b/include/applets.src.h
-index 87d9cbb..c148a8c 100644
---- a/include/applets.src.h
-+++ b/include/applets.src.h
-@@ -404,7 +404,7 @@ IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
- IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP))
- /* Needs to be run by root or be suid root - needs to write to /dev/TTY: */
- IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
--IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP))
-+IF_WATCH(APPLET(watch, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP))
- IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP))
- IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP))
--- 
-1.7.5.4
-

similarity index 66%
rename from meta/recipes-core/busybox/busybox_1.21.1.bb
rename to meta/recipes-core/busybox/busybox_1.22.1.bb
index cf59f58..ffc9435 100644
@@ -3,8 +3,6 @@ require busybox.inc
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            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://find-touchscreen.sh \
            file://busybox-cron \

@@ -22,24 +20,17 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://mdev.conf \
            file://umount.busybox \
            file://defconfig \
-           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://fail_on_no_media.patch \
-           file://busybox-sulogin-empty-root-password.patch \
            file://run-ptest \
            file://inetd.conf \
            file://inetd \
            file://login-utilities.cfg \
-           file://busybox-list-suid-and-non-suid-app-configs.patch \
-           file://busybox-sed-fix-sed-clusternewline-testcase.patch \
-           file://find-get-rid-of-nested-functions.patch \
-           file://busybox-lineedit-initialize-delptr.patch \
 "
 
-SRC_URI[tarball.md5sum] = "795394f83903b5eec6567d51eebb417e"
-SRC_URI[tarball.sha256sum] = "cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303"
+SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e"
+SRC_URI[tarball.sha256sum] = "ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b"
 
 EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
 

index 91ecff8..f2cc119 100644
@@ -1,16 +1,14 @@
 require busybox.inc
 
-SRCREV = "e73f3c1d3d83699b723251f7e6a981021ce75475"
+SRCREV = "d9e0c438e10e2155513e5d26498af472c5137d65"
 # Lookout for PV bump too when SRCREV is changed
-PV = "1.21.1+git${SRCPV}"
+PV = "1.22.1+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://busybox.net/busybox.git \
            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://find-touchscreen.sh \
            file://busybox-cron \

@@ -28,18 +26,13 @@ SRC_URI = "git://busybox.net/busybox.git \
            file://mdev.conf \
            file://umount.busybox \
            file://defconfig \
-           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://fail_on_no_media.patch \
-           file://busybox-sulogin-empty-root-password.patch \
            file://run-ptest \
            file://inetd.conf \
            file://inetd \
            file://login-utilities.cfg \
-           file://busybox-list-suid-and-non-suid-app-configs.patch \
-           file://busybox-sed-fix-sed-clusternewline-testcase.patch \
 "
 
 EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"

similarity index 100%
rename from meta-skeleton/recipes-core/busybox/busybox_1.21.1.bbappend
rename to meta-skeleton/recipes-core/busybox/busybox_%.bbappend

index 6375041..5a16872 100644
@@ -49,12 +49,12 @@ bindir_progs = "base64 basename cksum comm csplit cut dir dircolors dirname du \
                 env expand expr factor fmt fold groups head hostid id install \
                 join link logname md5sum mkfifo nice nl nohup od paste pathchk \
                 pinky pr printenv printf ptx readlink seq sha1sum sha224sum sha256sum \
-                sha384sum sha512sum shred shuf sort split stat sum tac tail tee test \
+                sha384sum sha512sum shred shuf sort split sum tac tail tee test \
                 tr tsort tty unexpand uniq unlink users vdir wc who whoami yes uptime"
 
 # hostname gets a special treatment and is not included in this
 base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
-                     mknod mv pwd rm rmdir sleep stty sync touch true uname hostname"
+                     mknod mv pwd rm rmdir sleep stty sync touch true uname hostname stat"
 
 sbindir_progs= "chroot"
 

index 6b222b5..f88373f 100644
@@ -38,12 +38,12 @@ bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors dirname
                 env expand expr factor fmt fold groups head hostid id install \
                 join link logname md5sum mkfifo nice nl nohup nproc od paste pathchk \
                 pinky pr printenv printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \
-                sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\
+                sha384sum sha512sum shred shuf sort split stdbuf sum tac tail tee test timeout\
                 tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes"
 
 # hostname gets a special treatment and is not included in this
 base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
-                     mknod mv pwd rm rmdir sleep stty sync touch true uname"
+                     mknod mv pwd rm rmdir sleep stty sync touch true uname stat"
 
 sbindir_progs= "chroot"
 

index 6ee4a04..20d5fc2 100644
@@ -15,6 +15,10 @@ SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
 
 inherit autotools update-alternatives
 
+do_install_append() {
+	mv ${D}${bindir}/watch ${D}${bindir}/watch.${BPN}
+}
+
 FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so"
 FILES_SOLIBSDEV = ""
 

@@ -22,4 +26,6 @@ ALTERNATIVE_${PN} = "top uptime free pkill pmap kill sysctl ps pgrep pwdx watch"
 ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
 ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl"
 ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps"
+ALTERNATIVE_LINK_NAME[watch] = "${base_bindir}/watch"
+ALTERNATIVE_TARGET[watch] = "${bindir}/watch.${BPN}"
 ALTERNATIVE_PRIORITY = "110"