busybox: Upgrade to upstream 1.20.2
PATCH v2 1/1 busybox: Upgrade to upstream 1.20.2
Removed CONFIG_LSOF for backwards compatibility.
---
.../B921600.patch | 0
.../busybox-appletlib-dependency.patch | 0
.../busybox-mkfs-minix-tests_bigendian.patch | 0
.../busybox-udhcpc-no_deconfig.patch | 37 +++++++++-----------
.../{busybox-1.19.4 => busybox-1.20.2}/defconfig | 0
.../fix-for-spurious-testsuite-failure.patch | 0
.../get_header_tar.patch | 0
.../run-parts.in.usr-bin.patch | 0
.../sys_resource.patch | 0
.../watch.in.usr-bin.patch | 0
.../wget_dl_dir_fix.patch | 0
meta/recipes-core/busybox/busybox.inc | 2 ++
.../{busybox_1.19.4.bb => busybox_1.20.2.bb} | 6 ++--
13 files changed, 22 insertions(+), 23 deletions(-)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/B921600.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/busybox-appletlib-dependency.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/busybox-mkfs-minix-tests_bigendian.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/busybox-udhcpc-no_deconfig.patch (78%)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/defconfig (100%)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/fix-for-spurious-testsuite-failure.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/get_header_tar.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/run-parts.in.usr-bin.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/sys_resource.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/watch.in.usr-bin.patch (100%)
rename meta/recipes-core/busybox/{busybox-1.19.4 => busybox-1.20.2}/wget_dl_dir_fix.patch (100%)
rename meta/recipes-core/busybox/{busybox_1.19.4.bb => busybox_1.20.2.bb} (87%)meta/recipes-core/busybox/busybox-1.20.2/B921600.patch renamed from meta/recipes-core/busybox/busybox-1.19.4/B921600.patch +0 -0
meta/recipes-core/busybox/busybox-1.20.2/busybox-appletlib-dependency.patch renamed from meta/recipes-core/busybox/busybox-1.19.4/busybox-appletlib-dependency.patch +0 -0
meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch renamed from meta/recipes-core/busybox/busybox-1.19.4/busybox-mkfs-minix-tests_bigendian.patch +0 -0
meta/recipes-core/busybox/busybox-1.20.2/busybox-udhcpc-no_deconfig.patch renamed from meta/recipes-core/busybox/busybox-1.19.4/busybox-udhcpc-no_deconfig.patch +17 -20
@@ -31,10 +31,10 @@ Signed-off-by: Andreas Oberritter <[email protected]> networking/udhcp/dhcpc.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) -diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c -index 4d755e6..a21e2c6 100644 ---- a/networking/udhcp/dhcpc.c -+++ b/networking/udhcp/dhcpc.c +Index: busybox-1.20.2/networking/udhcp/dhcpc.c +=================================================================== +--- busybox-1.20.2.orig/networking/udhcp/dhcpc.c ++++ busybox-1.20.2/networking/udhcp/dhcpc.c @@ -29,6 +29,9 @@ #include <netpacket/packet.h> #include <linux/filter.h>
@@ -42,10 +42,10 @@ index 4d755e6..a21e2c6 100644 +/* option whether to down the interface when reconfiguring */ +static int allow_deconfig = 1; + - /* struct client_config_t client_config is in bb_common_bufsiz1 */ + /* "struct client_config_t client_config" is in bb_common_bufsiz1 */ -@@ -82,8 +85,9 @@ enum { +@@ -81,8 +84,9 @@ enum { OPT_x = 1 << 18, OPT_f = 1 << 19, OPT_B = 1 << 20,
@@ -56,7 +56,7 @@ index 4d755e6..a21e2c6 100644 USE_FOR_MMU( OPTBIT_b,) IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,) IF_FEATURE_UDHCP_PORT( OPTBIT_P,) -@@ -899,7 +903,8 @@ static void perform_renew(void) +@@ -1040,7 +1044,8 @@ static void perform_renew(void) state = RENEW_REQUESTED; break; case RENEW_REQUESTED: /* impatient are we? fine, square 1 */
@@ -66,7 +66,7 @@ index 4d755e6..a21e2c6 100644 case REQUESTING: case RELEASED: change_listen_mode(LISTEN_RAW); -@@ -923,7 +928,8 @@ static void perform_release(uint32_t requested_ip, uint32_t server_addr) +@@ -1064,7 +1069,8 @@ static void perform_release(uint32_t ser bb_info_msg("Unicasting a release of %s to %s", inet_ntoa(temp_addr), buffer); send_release(server_addr, requested_ip); /* unicast */
@@ -76,16 +76,16 @@ index 4d755e6..a21e2c6 100644 } bb_info_msg("Entering released state"); -@@ -1083,7 +1089,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - #endif - ; +@@ -1215,7 +1221,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c + /* O,x: list; -T,-t,-A take numeric param */ + opt_complementary = "O::x::T+:t+:A+" IF_UDHCP_VERBOSE(":vv") ; IF_LONG_OPTS(applet_long_options = udhcpc_longopts;) - opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fB" + opt = getopt32(argv, "CV:H:h:F:i:np:qRr:s:T:t:SA:O:ox:fBD" USE_FOR_MMU("b") IF_FEATURE_UDHCPC_ARPING("a") IF_FEATURE_UDHCP_PORT("P:") -@@ -1175,6 +1181,9 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) +@@ -1316,6 +1322,9 @@ int udhcpc_main(int argc UNUSED_PARAM, c logmode |= LOGMODE_SYSLOG; }
@@ -95,7 +95,7 @@ index 4d755e6..a21e2c6 100644 /* Make sure fd 0,1,2 are open */ bb_sanitize_stdio(); /* Equivalent of doing a fflush after every \n */ -@@ -1189,7 +1198,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) +@@ -1330,7 +1339,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c srand(monotonic_us()); state = INIT_SELECTING;
@@ -105,7 +105,7 @@ index 4d755e6..a21e2c6 100644 change_listen_mode(LISTEN_RAW); packet_num = 0; timeout = 0; -@@ -1341,7 +1351,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) +@@ -1484,7 +1494,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c } /* Timed out, enter init state */ bb_info_msg("Lease lost, entering init state");
@@ -115,8 +115,8 @@ index 4d755e6..a21e2c6 100644 state = INIT_SELECTING; client_config.first_secs = 0; /* make secs field count from 0 */ /*timeout = 0; - already is */ -@@ -1489,7 +1500,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) - send_decline(xid, server_addr, packet.yiaddr); +@@ -1667,7 +1678,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c + send_decline(/*xid,*/ server_addr, packet.yiaddr); if (state != REQUESTING) - udhcp_run_script(NULL, "deconfig");
@@ -125,7 +125,7 @@ index 4d755e6..a21e2c6 100644 change_listen_mode(LISTEN_RAW); state = INIT_SELECTING; client_config.first_secs = 0; /* make secs field count from 0 */ -@@ -1536,7 +1548,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) +@@ -1711,7 +1723,8 @@ int udhcpc_main(int argc UNUSED_PARAM, c bb_info_msg("Received DHCP NAK"); udhcp_run_script(&packet, "nak"); if (state != REQUESTING)
@@ -135,6 +135,3 @@ index 4d755e6..a21e2c6 100644 change_listen_mode(LISTEN_RAW); sleep(3); /* avoid excessive network traffic */ state = INIT_SELECTING; --- -1.7.7.1 -
meta/recipes-core/busybox/busybox-1.20.2/defconfig renamed from meta/recipes-core/busybox/busybox-1.19.4/defconfig +0 -0
meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch renamed from meta/recipes-core/busybox/busybox-1.19.4/fix-for-spurious-testsuite-failure.patch +0 -0
meta/recipes-core/busybox/busybox-1.20.2/get_header_tar.patch renamed from meta/recipes-core/busybox/busybox-1.19.4/get_header_tar.patch +0 -0
meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch renamed from meta/recipes-core/busybox/busybox-1.19.4/run-parts.in.usr-bin.patch +0 -0
meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch renamed from meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch +0 -0
meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch renamed from meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch +0 -0
meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch renamed from meta/recipes-core/busybox/busybox-1.19.4/wget_dl_dir_fix.patch +0 -0
meta/recipes-core/busybox/busybox.inc +2 -0
@@ -97,6 +97,8 @@ do_prepare_config () { < ${WORKDIR}/defconfig > ${S}/.config sed -i -e '/CONFIG_STATIC/d' .config echo "# CONFIG_STATIC is not set" >> .config + sed -i -e '/CONFIG_LSOF/d' .config + echo "# CONFIG_LSOF is not set" >> .config for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ ${S}/.config sed -i -e '${configmangle}' ${S}/.config
meta/recipes-core/busybox/busybox_1.20.2.bb renamed from meta/recipes-core/busybox/busybox_1.19.4.bb +3 -3
@@ -1,5 +1,5 @@ require busybox.inc -PR = "r13" +PR = "r0" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://B921600.patch \
@@ -27,7 +27,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-mkfs-minix-tests_bigendian.patch \ file://fix-for-spurious-testsuite-failure.patch" -SRC_URI[tarball.md5sum] = "9c0cae5a0379228e7b55e5b29528df8e" -SRC_URI[tarball.sha256sum] = "9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee" +SRC_URI[tarball.md5sum] = "e025414bc6cd79579cc7a32a45d3ae1c" +SRC_URI[tarball.sha256sum] = "eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
Signature · 1 line
1.7.9.5
meta/recipes-core/busybox/busybox.inc do_prepare_config () { · line 104
Quoted 9 lines · Radu Moisan
meta/recipes-core/busybox/busybox.inc +2
-0@@ -97,6 +97,8 @@ do_prepare_config () { < ${WORKDIR}/defconfig > ${S}/.config sed -i -e '/CONFIG_STATIC/d' .config echo "# CONFIG_STATIC is not set" >> .config + sed -i -e '/CONFIG_LSOF/d' .config + echo "# CONFIG_LSOF is not set" >> .config for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ ${S}/.config sed -i -e '${configmangle}' ${S}/.config
Why is this desirable?
p.
Quoted 11 lines · On Monday 20 August 2012 09:18:17 Phil Blundell wrote:
Quoted 10 lines · Radu Moisan
meta/recipes-core/busybox/busybox.inc +2
-0@@ -97,6 +97,8 @@ do_prepare_config () { < ${WORKDIR}/defconfig > ${S}/.config sed -i -e '/CONFIG_STATIC/d' .config echo "# CONFIG_STATIC is not set" >> .config + sed -i -e '/CONFIG_LSOF/d' .config + echo "# CONFIG_LSOF is not set" >> .config
Quoted 7 lines
meta/recipes-core/busybox/busybox.inc do_prepare_config () { · line 104
Quoted 5 lines
meta/recipes-core/busybox/busybox.inc +0
-0for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ ${S}/.config sed -i -e '${configmangle}' ${S}/.configWhy is this desirable?
Well, the more appropriate question would be: could we not just update the defconfig and then make that change to it directly?
(In case it isn't clear - lsof is being disabled because it was not enabled in the previous 1.19.4 version.)
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 20 lines · Paul Eggleton
Quoted 11 lines · On Monday 20 August 2012 09:18:17 Phil Blundell wrote:
Quoted 10 lines · Radu Moisan
meta/recipes-core/busybox/busybox.inc +2
-0@@ -97,6 +97,8 @@ do_prepare_config () { < ${WORKDIR}/defconfig > ${S}/.config sed -i -e '/CONFIG_STATIC/d' .config echo "# CONFIG_STATIC is not set" >> .config + sed -i -e '/CONFIG_LSOF/d' .config + echo "# CONFIG_LSOF is not set" >> .configQuoted 7 lines
meta/recipes-core/busybox/busybox.inc do_prepare_config () { · line 104
Quoted 5 lines
meta/recipes-core/busybox/busybox.inc +0
-0for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ ${S}/.config sed -i -e '${configmangle}' ${S}/.configWhy is this desirable?
Quoted 5 lines
Well, the more appropriate question would be: could we not just update the defconfig and then make that change to it directly?
(In case it isn't clear - lsof is being disabled because it was not enabled in the previous 1.19.4 version.)
Ah, I see. In that case, yes, just updating the defconfig is the right thing to do. The patch above will, if I am understanding it correctly, make it impossible (or at least quite hard) for any other layer to turn CONFIG_LSOF back on.
p.
Quoted 24 lines · On Monday 20 August 2012 09:28:41 Phil Blundell wrote:
Quoted 23 lines · Paul Eggleton
Quoted 11 lines · On Monday 20 August 2012 09:18:17 Phil Blundell wrote:
Quoted 10 lines · Radu Moisan
meta/recipes-core/busybox/busybox.inc +2
-0@@ -97,6 +97,8 @@ do_prepare_config () { < ${WORKDIR}/defconfig > ${S}/.config sed -i -e '/CONFIG_STATIC/d' .config echo "# CONFIG_STATIC is not set" >> .config + sed -i -e '/CONFIG_LSOF/d' .config + echo "# CONFIG_LSOF is not set" >> .configQuoted 7 lines
meta/recipes-core/busybox/busybox.inc do_prepare_config () { · line 104
Quoted 5 lines
meta/recipes-core/busybox/busybox.inc +0
-0for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ ${S}/.config sed -i -e '${configmangle}' ${S}/.configWhy is this desirable?
Well, the more appropriate question would be: could we not just update the defconfig and then make that change to it directly?
Quoted 7 lines
Quoted 2 lines
(In case it isn't clear - lsof is being disabled because it was not enabled in the previous 1.19.4 version.)
Ah, I see. In that case, yes, just updating the defconfig is the right thing to do. The patch above will, if I am understanding it correctly, make it impossible (or at least quite hard) for any other layer to turn
CONFIG_LSOFback on.
Good point, that would be undesirable.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 23 lines · Paul Eggleton
Quoted 22 lines · On Monday 20 August 2012 09:28:41 Phil Blundell wrote:
Quoted 21 lines · Paul Eggleton
Quoted 11 lines · On Monday 20 August 2012 09:18:17 Phil Blundell wrote:
Quoted 10 lines · Radu Moisan
meta/recipes-core/busybox/busybox.inc +2
-0@@ -97,6 +97,8 @@ do_prepare_config () { < ${WORKDIR}/defconfig > ${S}/.config sed -i -e '/CONFIG_STATIC/d' .config echo "# CONFIG_STATIC is not set" >> .config + sed -i -e '/CONFIG_LSOF/d' .config + echo "# CONFIG_LSOF is not set" >> .configQuoted 6 lines
Quoted 5 lines
for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ ${S}/.config sed -i -e '${configmangle}' ${S}/.configWhy is this desirable?
Well, the more appropriate question would be: could we not just update the defconfig and then make that change to it directly?
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
(In case it isn't clear - lsof is being disabled because it was not enabled in the previous 1.19.4 version.)
Ah, I see. In that case, yes, just updating the defconfig is the right thing to do. The patch above will, if I am understanding it correctly, make it impossible (or at least quite hard) for any other layer to turn
CONFIG_LSOFback on.Good point, that would be undesirable.
Any suggestions on how to do that?
thanks,
radu
Quoted 30 lines · On Monday 20 August 2012 12:28:24 Radu Moisan wrote:
Quoted 29 lines · Paul Eggleton
Quoted 28 lines · On Monday 20 August 2012 09:28:41 Phil Blundell wrote:
Quoted 26 lines · Paul Eggleton
Quoted 11 lines · On Monday 20 August 2012 09:18:17 Phil Blundell wrote:
Quoted 10 lines · Radu Moisan
meta/recipes-core/busybox/busybox.inc +2
-0@@ -97,6 +97,8 @@ do_prepare_config () { < ${WORKDIR}/defconfig > ${S}/.config sed -i -e '/CONFIG_STATIC/d' .config echo "# CONFIG_STATIC is not set" >> .config + sed -i -e '/CONFIG_LSOF/d' .config + echo "# CONFIG_LSOF is not set" >> .configQuoted 7 lines
Quoted 5 lines
for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ ${S}/.config sed -i -e '${configmangle}' ${S}/.configWhy is this desirable?
Well, the more appropriate question would be: could we not just update the
defconfig and then make that change to it directly?(In case it isn't clear - lsof is being disabled because it was not enabled in the previous 1.19.4 version.)
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Ah, I see. In that case, yes, just updating the defconfig is the right thing to do. The patch above will, if I am understanding it correctly, make it impossible (or at least quite hard) for any other layer to turn
CONFIG_LSOFback on.Good point, that would be undesirable.
Any suggestions on how to do that?
Build the new version of busybox once (actually, just running -c configure ought to be enough), copy the generated .config over the top of defconfig in the metadata, then edit it as desired.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 1 line · Radu Moisan
Any suggestions on how to do that?
"vi defconfig", then add
# CONFIG_LSOF is not set
at some appropriate place.
Alternatively, bitbake -c menuconfig busybox, make sure lsof is disabled, then copy the resulting .config file back into defconfig.
p.
Quoted 11 lines · Phil Blundell
Quoted 1 line · Radu Moisan
Any suggestions on how to do that?
"vi defconfig", then add
#
CONFIG_LSOFis not setat some appropriate place.
Alternatively, bitbake -c menuconfig busybox, make sure lsof is disabled, then copy the resulting .config file back into defconfig.
And as a last step (regardless of which way you're modifying the defconfig) use git diff to check that you're changing things correclty, i.e. not enabling more functionality than before (unless there's a good reason for this).
Apart from that, I prefer that we copy the defconfig from a build, as busybox sometimes likes to re-order the configuration options between releases. I just happen to prefer to easily be able to compare my built config with the supplied defconfig, with the minimum of changes.
Cheers,
Anders
Signature · 2 lines
Anders Darander ChargeStorm AB / eStorm AB