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

(From OE-Core rev: 2c59692c4fa4a0a21dee23b8affc3c8e58ff7a11)

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Fathi Boudra
2015-02-18 14:44:45 +08:00
committed by Richard Purdie
parent 0a5395738b
commit da1259e0e6
3 changed files with 4 additions and 47 deletions

View File

@@ -1,40 +0,0 @@
From 28389e59701c2408e87e886c358f8e1766c677f7 Mon Sep 17 00:00:00 2001
From: Drew Moseley <drew_moseley@mentor.com>
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 <drew_moseley@mentor.com>
---
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

View File

@@ -1,7 +1,5 @@
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 \
@@ -30,14 +28,13 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
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"
SRC_URI[tarball.md5sum] = "5c94d6301a964cd91619bd4d74605245"
SRC_URI[tarball.sha256sum] = "300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf"
EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"

View File

@@ -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"