From patchwork Wed Feb 18 06:44:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 44757 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 836BB21554 for ; Wed, 18 Feb 2015 06:45:28 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id l15sf22427808wiw.0 for ; Tue, 17 Feb 2015 22:45:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=1SENpx7peqSX+4isgcLvR+87FRmmZocqY+6lY7XkTvw=; b=YroXVskY4qKu30KmNbTfrh1QTag/eAXUVlncxjr2YDFd2tizfRRrOmFhK/HXfxoCeI IULL7BJj18exQLoL9NMvMafILBH3Yb0Ek/baKhMXTsKeVVQhDOyAJicoMwdBLTlmTKoJ 73xXggxtboK+IS4xZ8Q9PWUSqPR1lGwINnbz9FP1EKcV+WsDHHvjGLLjAajL7AjFZQ/9 5f/zcCis/QoyLfm6i3efblTyDHDwz27ZKm5SwyOlRGg9ttNQwpdFSyEeDqkyhSsWOQX/ GMjSoq42pNDoDnAZbqaGxTASyIvvFY+ig41hNgZc5kqhMdxfjsRVbmFv9gHgSelGjplF 8uAg== X-Gm-Message-State: ALoCoQl80snZdp9FEmIm+Vs5JPZTSF/MXimXTWIS3SHzB9vqpBHdRTNwmQYxIp9ZNtaO37OzWyfa X-Received: by 10.112.171.37 with SMTP id ar5mr4080286lbc.16.1424241927661; Tue, 17 Feb 2015 22:45:27 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.25.134 with SMTP id c6ls701970lag.103.gmail; Tue, 17 Feb 2015 22:45:27 -0800 (PST) X-Received: by 10.152.234.43 with SMTP id ub11mr22100696lac.42.1424241927436; Tue, 17 Feb 2015 22:45:27 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id b8si12442929lak.36.2015.02.17.22.45.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Feb 2015 22:45:27 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbvn10 with SMTP id n10so8945259lbv.6 for ; Tue, 17 Feb 2015 22:45:27 -0800 (PST) X-Received: by 10.152.8.33 with SMTP id o1mr32911985laa.56.1424241927111; Tue, 17 Feb 2015 22:45:27 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp2665586lbj; Tue, 17 Feb 2015 22:45:26 -0800 (PST) X-Received: by 10.70.130.69 with SMTP id oc5mr56797363pdb.160.1424241925238; Tue, 17 Feb 2015 22:45:25 -0800 (PST) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w6si5145594pdp.224.2015.02.17.22.45.24; Tue, 17 Feb 2015 22:45:25 -0800 (PST) Received-SPF: none (google.com: openembedded-core-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2062F73546; Wed, 18 Feb 2015 06:45:13 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by mail.openembedded.org (Postfix) with ESMTP id C86B36E614 for ; Wed, 18 Feb 2015 06:45:06 +0000 (UTC) Received: by lbjb6 with SMTP id b6so8878160lbj.2 for ; Tue, 17 Feb 2015 22:45:06 -0800 (PST) X-Received: by 10.152.28.73 with SMTP id z9mr19024829lag.28.1424241906454; Tue, 17 Feb 2015 22:45:06 -0800 (PST) Received: from localhost.localdomain (a91-152-81-141.elisa-laajakaista.fi. [91.152.81.141]) by mx.google.com with ESMTPSA id lf3sm4019974lbc.2.2015.02.17.22.45.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Feb 2015 22:45:05 -0800 (PST) From: Fathi Boudra To: openembedded-core@lists.openembedded.org Date: Wed, 18 Feb 2015 14:44:45 +0800 Message-Id: <1424241885-9344-1-git-send-email-fathi.boudra@linaro.org> X-Mailer: git-send-email 2.1.4 Subject: [OE-core] [PATCH] busybox: update to 1.23.1 release X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: fathi.boudra@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 * 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 --- ...m-Specify-nostldlib-when-linking-to-.o-fi.patch | 40 ---------------------- .../{busybox_1.22.1.bb => busybox_1.23.1.bb} | 7 ++-- meta/recipes-core/busybox/busybox_git.bb | 4 +-- 3 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch rename meta/recipes-core/busybox/{busybox_1.22.1.bb => busybox_1.23.1.bb} (85%) 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 3da38bb..0000000 --- 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.23.1.bb similarity index 85% rename from meta/recipes-core/busybox/busybox_1.22.1.bb rename to meta/recipes-core/busybox/busybox_1.23.1.bb index a41879c..1742390 100644 --- a/meta/recipes-core/busybox/busybox_1.22.1.bb +++ b/meta/recipes-core/busybox/busybox_1.23.1.bb @@ -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" diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index f91b552..529ed5b 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"