From 2c59692c4fa4a0a21dee23b8affc3c8e58ff7a11 Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Wed, 18 Feb 2015 14:44:45 +0800 Subject: busybox: update to 1.23.1 release * Bump SRCREV/PV * Drop PR * Update SRC_URI md5sum/sha256sum * Drop 0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch - applied upstream and available in 1.23.1 release Signed-off-by: Fathi Boudra Signed-off-by: Richard Purdie --- ...m-Specify-nostldlib-when-linking-to-.o-fi.patch | 40 ------------------ meta/recipes-core/busybox/busybox_1.22.1.bb | 48 ---------------------- meta/recipes-core/busybox/busybox_1.23.1.bb | 45 ++++++++++++++++++++ meta/recipes-core/busybox/busybox_git.bb | 4 +- 4 files changed, 47 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch delete mode 100644 meta/recipes-core/busybox/busybox_1.22.1.bb create mode 100644 meta/recipes-core/busybox/busybox_1.23.1.bb diff --git a/meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch b/meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch deleted file mode 100644 index 3da38bb4ca..0000000000 --- a/meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 28389e59701c2408e87e886c358f8e1766c677f7 Mon Sep 17 00:00:00 2001 -From: Drew Moseley -Date: Sat, 29 Mar 2014 11:13:16 -0400 -Subject: [PATCH] build system: Specify '-nostldlib' when linking to .o files. - -For certain cross build scenarios the LD variable is overridden -to use the gcc executive to ensure all the target tuning parameters -are used. In these cases, the executive errors out as shown below -but since this step is only linking to a .o file the standard libs -are not needed. - - $ make LD=gcc applets/built-in.o - LD applets/built-in.o - /usr/bin/ld: cannot find -lgcc_s - /usr/bin/ld: cannot find -lgcc_s - collect2: ld returned 1 exit status - make[1]: *** [applets/built-in.o] Error 1 - make: *** [applets_dir] Error 2 - -Signed-off-by: Drew Moseley ---- - scripts/Makefile.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/Makefile.build b/scripts/Makefile.build -index 5685b5b..eba69f6 100644 ---- a/scripts/Makefile.build -+++ b/scripts/Makefile.build -@@ -256,7 +256,7 @@ ifdef builtin-target - quiet_cmd_link_o_target = LD $@ - # If the list of objects to link is empty, just create an empty built-in.o - cmd_link_o_target = $(if $(strip $(obj-y)),\ -- $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\ -+ $(LD) -nostdlib $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\ - rm -f $@; $(AR) rcs $@) - - $(builtin-target): $(obj-y) FORCE --- -1.7.9.5 - diff --git a/meta/recipes-core/busybox/busybox_1.22.1.bb b/meta/recipes-core/busybox/busybox_1.22.1.bb deleted file mode 100644 index a41879c23f..0000000000 --- a/meta/recipes-core/busybox/busybox_1.22.1.bb +++ /dev/null @@ -1,48 +0,0 @@ -require busybox.inc - -PR = "r32" - -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ - file://get_header_tar.patch \ - file://busybox-appletlib-dependency.patch \ - file://busybox-udhcpc-no_deconfig.patch \ - file://find-touchscreen.sh \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script \ - file://simple.script \ - file://hwclock.sh \ - file://mount.busybox \ - file://syslog \ - file://syslog-startup.conf \ - file://syslog.conf \ - file://busybox-syslog.default \ - file://mdev \ - file://mdev.conf \ - file://mdev-mount.sh \ - file://umount.busybox \ - file://defconfig \ - file://busybox-syslog.service.in \ - file://busybox-klogd.service.in \ - file://fail_on_no_media.patch \ - file://run-ptest \ - file://inetd.conf \ - file://inetd \ - file://login-utilities.cfg \ - file://0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch \ - file://recognize_connmand.patch \ - file://busybox-cross-menuconfig.patch \ - file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \ -" - -SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e" -SRC_URI[tarball.sha256sum] = "ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b" - -EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" - -do_install_ptest () { - cp -r ${B}/testsuite ${D}${PTEST_PATH}/ - cp ${B}/.config ${D}${PTEST_PATH}/ - ln -s /bin/busybox ${D}${PTEST_PATH}/busybox -} diff --git a/meta/recipes-core/busybox/busybox_1.23.1.bb b/meta/recipes-core/busybox/busybox_1.23.1.bb new file mode 100644 index 0000000000..1742390ed9 --- /dev/null +++ b/meta/recipes-core/busybox/busybox_1.23.1.bb @@ -0,0 +1,45 @@ +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://busybox-udhcpc-no_deconfig.patch \ + file://find-touchscreen.sh \ + file://busybox-cron \ + file://busybox-httpd \ + file://busybox-udhcpd \ + file://default.script \ + file://simple.script \ + file://hwclock.sh \ + file://mount.busybox \ + file://syslog \ + file://syslog-startup.conf \ + file://syslog.conf \ + file://busybox-syslog.default \ + file://mdev \ + file://mdev.conf \ + file://mdev-mount.sh \ + file://umount.busybox \ + file://defconfig \ + file://busybox-syslog.service.in \ + file://busybox-klogd.service.in \ + file://fail_on_no_media.patch \ + file://run-ptest \ + file://inetd.conf \ + file://inetd \ + file://login-utilities.cfg \ + file://recognize_connmand.patch \ + file://busybox-cross-menuconfig.patch \ + file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \ +" + +SRC_URI[tarball.md5sum] = "5c94d6301a964cd91619bd4d74605245" +SRC_URI[tarball.sha256sum] = "300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf" + +EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" + +do_install_ptest () { + cp -r ${B}/testsuite ${D}${PTEST_PATH}/ + cp ${B}/.config ${D}${PTEST_PATH}/ + ln -s /bin/busybox ${D}${PTEST_PATH}/busybox +} diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index f91b552f78..529ed5b318 100644 --- a/meta/recipes-core/busybox/busybox_git.bb +++ b/meta/recipes-core/busybox/busybox_git.bb @@ -1,8 +1,8 @@ require busybox.inc -SRCREV = "d9e0c438e10e2155513e5d26498af472c5137d65" +SRCREV = "1ecfe811fe2f70380170ef7d820e8150054e88ca" # Lookout for PV bump too when SRCREV is changed -PV = "1.22.1+git${SRCPV}" +PV = "1.23.1+git${SRCPV}" S = "${WORKDIR}/git" -- cgit v1.2.3