Skip to contentSkip to conversation

busybox: update to 1.19.3

PATCH New Anders Darander 1 participant 2 messages Nov 30, 2011

lore
Share & tools
lore
#0 lore raw

v3 cover busybox: update to 1.19.3

This updates busybox to the latest stable, 1.19.3.

Among other things, there should be rudimentary support in syslogd for systemd, by enabling CONFIG_FEATURE_SYSTEMD.

It has been tested and verified on qemux86 and on our local arm-based system.

However, the patch busybox-udhcpc-no_deconfig.patch has been modified to apply, but hasn't really been tested. As we're currently mostly running static configurations, we've only verified that udhcpc works to the extent that we get the network up and running, not how it behaves during dhcp renewal. Thus I'm starting this as an RFC.

Changes:
v3: * Gone through the defconfig, made changes as discussed with Saul.

v2: * Checked the new defconfig (removed settings implying CFLAGS and
ARCH). The new defconfig should be as close as possible to the old one, with the exception of some new utils/options.
* Added one patch from upstream, to safeguard the use of CBAUD termios_init().
* The other upstream patch from http://busybox.net/downloads/fixes-1.19.3/
do only affect comments, thus I'm not adding it.

The following changes since commit 177df2c51927f44e3536856f4604364b38695bc2:

qt-mobility: Add missing patch (2011-11-29 14:36:09 +0000)

are available in the git repository at:
git://github.com/darander/oe-core busybox-systemd
https://github.com/darander/oe-core/tree/busybox-systemd

Anders Darander (1):
busybox: update to 1.19.3

 .../B921600.patch                                  |    0
 .../busybox-1.19.3/busybox-1.19.3-getty.patch      |   17 ++
 .../busybox-appletlib-dependency.patch             |    0
 .../busybox-udhcpc-no_deconfig.patch               |   66 +++--
 .../{busybox-1.18.5 => busybox-1.19.3}/defconfig   |  265 +++++++++++++-------
 .../get_header_tar.patch                           |    0
 .../run-parts.in.usr-bin.patch                     |   16 +-
 .../udhcpc-fix-nfsroot.patch                       |    0
 .../udhcpscript.patch                              |    0
 .../{busybox_1.18.5.bb => busybox_1.19.3.bb}       |    7 +-
 10 files changed, 245 insertions(+), 126 deletions(-)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/B921600.patch (100%)
 create mode 100644 meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/busybox-appletlib-dependency.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/busybox-udhcpc-no_deconfig.patch (62%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/defconfig (89%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/get_header_tar.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/run-parts.in.usr-bin.patch (64%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/udhcpc-fix-nfsroot.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/udhcpscript.patch (100%)
 rename meta/recipes-core/busybox/{busybox_1.18.5.bb => busybox_1.19.3.bb} (82%)
Signature · 1 line
1.7.7.3
#1 lore raw

PATCH v3 1/1 busybox: update to 1.19.3

The updates to patch busybox-udhcpc-no_deconfig.patch is not fully verified.

Adds one upstream patch to 1.19.3.

---
 .../B921600.patch                                  |    0
 .../busybox-1.19.3/busybox-1.19.3-getty.patch      |   17 ++
 .../busybox-appletlib-dependency.patch             |    0
 .../busybox-udhcpc-no_deconfig.patch               |   66 +++--
 .../{busybox-1.18.5 => busybox-1.19.3}/defconfig   |  265 +++++++++++++-------
 .../get_header_tar.patch                           |    0
 .../run-parts.in.usr-bin.patch                     |   16 +-
 .../udhcpc-fix-nfsroot.patch                       |    0
 .../udhcpscript.patch                              |    0
 .../{busybox_1.18.5.bb => busybox_1.19.3.bb}       |    7 +-
 10 files changed, 245 insertions(+), 126 deletions(-)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/B921600.patch (100%)
 create mode 100644 meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/busybox-appletlib-dependency.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/busybox-udhcpc-no_deconfig.patch (62%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/defconfig (89%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/get_header_tar.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/run-parts.in.usr-bin.patch (64%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/udhcpc-fix-nfsroot.patch (100%)
 rename meta/recipes-core/busybox/{busybox-1.18.5 => busybox-1.19.3}/udhcpscript.patch (100%)
 rename meta/recipes-core/busybox/{busybox_1.18.5.bb => busybox_1.19.3.bb} (82%)
meta/recipes-core/busybox/busybox-1.19.3/B921600.patch renamed from meta/recipes-core/busybox/busybox-1.18.5/B921600.patch +0 -0
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.18.5/B921600.patch
rename to meta/recipes-core/busybox/busybox-1.19.3/B921600.patch
meta/recipes-core/busybox/busybox-1.19.3/busybox-1.19.3-getty.patch new file +17 -0
new file mode 100644
index 0000000..137d095
@@ -0,0 +1,17 @@
+Upstream-status: Backport
+
+Patch is taken from upstream 
+http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-getty.patch
+
+--- busybox-1.19.3/loginutils/getty.c
++++ busybox-1.19.3-getty/loginutils/getty.c
+@@ -271,7 +271,9 @@ static void termios_init(int speed)
+ #ifdef CMSPAR
+ 		| CMSPAR  /* mark or space parity */
+ #endif
++#ifdef CBAUD
+ 		| CBAUD   /* (output) baud rate */
++#endif
+ #ifdef CBAUDEX
+ 		| CBAUDEX /* (output) baud rate */
+ #endif
meta/recipes-core/busybox/busybox-1.19.3/busybox-appletlib-dependency.patch renamed from meta/recipes-core/busybox/busybox-1.18.5/busybox-appletlib-dependency.patch +0 -0
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.18.5/busybox-appletlib-dependency.patch
rename to meta/recipes-core/busybox/busybox-1.19.3/busybox-appletlib-dependency.patch
meta/recipes-core/busybox/busybox-1.19.3/busybox-udhcpc-no_deconfig.patch renamed from meta/recipes-core/busybox/busybox-1.18.5/busybox-udhcpc-no_deconfig.patch +41 -25

127 lines not on this page · raw message

meta/recipes-core/busybox/busybox-1.19.3/defconfig renamed from meta/recipes-core/busybox/busybox-1.18.5/defconfig +175 -90

613 lines not on this page · raw message

meta/recipes-core/busybox/busybox-1.19.3/get_header_tar.patch renamed from meta/recipes-core/busybox/busybox-1.18.5/get_header_tar.patch +0 -0
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.18.5/get_header_tar.patch
rename to meta/recipes-core/busybox/busybox-1.19.3/get_header_tar.patch
meta/recipes-core/busybox/busybox-1.19.3/run-parts.in.usr-bin.patch renamed from meta/recipes-core/busybox/busybox-1.18.5/run-parts.in.usr-bin.patch +8 -8
similarity index 64%
rename from meta/recipes-core/busybox/busybox-1.18.5/run-parts.in.usr-bin.patch
rename to meta/recipes-core/busybox/busybox-1.19.3/run-parts.in.usr-bin.patch
index 7d532e6..1fe20d4 100644
@@ -19,11 +19,11 @@ diff -uNr busybox-1.15.3.orig//include/applets.src.h busybox-1.15.3/include/appl
 --- 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 @@
- 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_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))
+ 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_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))
meta/recipes-core/busybox/busybox-1.19.3/udhcpc-fix-nfsroot.patch renamed from meta/recipes-core/busybox/busybox-1.18.5/udhcpc-fix-nfsroot.patch +0 -0
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.18.5/udhcpc-fix-nfsroot.patch
rename to meta/recipes-core/busybox/busybox-1.19.3/udhcpc-fix-nfsroot.patch
meta/recipes-core/busybox/busybox-1.19.3/udhcpscript.patch renamed from meta/recipes-core/busybox/busybox-1.18.5/udhcpscript.patch +0 -0
similarity index 100%
rename from meta/recipes-core/busybox/busybox-1.18.5/udhcpscript.patch
rename to meta/recipes-core/busybox/busybox-1.19.3/udhcpscript.patch
meta/recipes-core/busybox/busybox_1.19.3.bb renamed from meta/recipes-core/busybox/busybox_1.18.5.bb +4 -3
similarity index 82%
rename from meta/recipes-core/busybox/busybox_1.18.5.bb
rename to meta/recipes-core/busybox/busybox_1.19.3.bb
index 17d583e..7a54789 100644
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r2"
+PR = "r0"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
@@ -7,6 +7,7 @@ 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://busybox-1.19.3-getty.patch \
            file://run-parts.in.usr-bin.patch \
            file://busybox-udhcpc-no_deconfig.patch \
            file://find-touchscreen.sh \
@@ -25,7 +26,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://umount.busybox \
            file://defconfig"
 
-SRC_URI[tarball.md5sum] = "96dd43cc7cee4017a6bf31b7da82a1f5"
-SRC_URI[tarball.sha256sum] = "10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0"
+SRC_URI[tarball.md5sum] = "c3938e1ac59602387009bbf1dd1af7f6"
+SRC_URI[tarball.sha256sum] = "a1a9a35732c719ef384f02b6e357c324d8be25bc154af91a48c4264b1e6038f0"
 
 EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
Signature · 1 line
1.7.7.3