From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 80FB16B891 for ; Mon, 2 Dec 2013 01:54:54 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.5/8.14.5) with ESMTP id rB21srw3025171 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Sun, 1 Dec 2013 17:54:53 -0800 (PST) Received: from [128.224.162.213] (128.224.162.213) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.2.347.0; Sun, 1 Dec 2013 17:54:52 -0800 Message-ID: <529BE890.4080508@windriver.com> Date: Mon, 2 Dec 2013 09:55:28 +0800 From: ChenQi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 MIME-Version: 1.0 To: Richard Purdie References: <1385731405.11222.58.camel@ted> In-Reply-To: <1385731405.11222.58.camel@ted> X-Originating-IP: [128.224.162.213] Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 01/18] linux-firmware: de-bash scripts to remove bash dependency X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Dec 2013 01:54:54 -0000 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit On 11/29/2013 09:23 PM, Richard Purdie wrote: > On Fri, 2013-11-29 at 20:48 +0800, Qi.Chen@windriver.com wrote: >> From: Chen Qi >> >> De-bash some script in linux-firmware to make it not dependent on >> bash. >> >> [YOCTO #5555] >> >> Signed-off-by: Chen Qi >> --- >> .../files/0001-linux-firmware-de-bash.patch | 47 ++++++++++++++++++++ >> .../linux-firmware/linux-firmware_git.bb | 3 +- >> 2 files changed, 49 insertions(+), 1 deletion(-) >> create mode 100644 meta/recipes-kernel/linux-firmware/files/0001-linux-firmware-de-bash.patch > We shouldn't even ship these files, its pointless. I have an alternative > patch to propose. > > Cheers, > > Richard > I've removed this patch from the patchset. Remote tree has been updated. http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ChenQi/bash-deps Best Regards, Chen Qi >> diff --git a/meta/recipes-kernel/linux-firmware/files/0001-linux-firmware-de-bash.patch b/meta/recipes-kernel/linux-firmware/files/0001-linux-firmware-de-bash.patch >> new file mode 100644 >> index 0000000..223a45f >> --- /dev/null >> +++ b/meta/recipes-kernel/linux-firmware/files/0001-linux-firmware-de-bash.patch >> @@ -0,0 +1,47 @@ >> +Upstream-Status: Pending >> + >> +Subject: linux-firmware: de-bash >> + >> +Signed-off-by: Chen Qi >> + >> +--- >> + carl9170fw/autogen.sh | 7 ++++--- >> + configure | 2 +- >> + 2 files changed, 5 insertions(+), 4 deletions(-) >> + >> +diff --git a/carl9170fw/autogen.sh b/carl9170fw/autogen.sh >> +index 6843f19..a340427 100755 >> +--- a/carl9170fw/autogen.sh >> ++++ b/carl9170fw/autogen.sh >> +@@ -1,14 +1,15 @@ >> +-#!/bin/bash >> ++#!/bin/sh >> + >> + set -e >> + >> + case "$1" in >> + config) >> + echo "Configuring..." >> +- pushd config >> ++ cwd=`pwd` >> ++ cd config >> + cmake . >> + make >> +- popd >> ++ cd $cwd >> + config/conf Kconfig >> + cmake . >> + ;; >> +diff --git a/configure b/configure >> +index 3260f9a..5e930f1 100644 >> +--- a/configure >> ++++ b/configure >> +@@ -1,4 +1,4 @@ >> +-#!/bin/bash >> ++#!/bin/sh >> + # -*- mode: sh -*- >> + # Our Makefile doesn't do srcdir != builddir >> + #buildapi-variable-no-builddir >> +-- >> +1.7.9.5 >> + >> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> index fe6730a..ec463bf 100644 >> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb >> @@ -28,7 +28,8 @@ SRCREV = "600caefd83a406540b2a789be6415e44c9b87add" >> PE = "1" >> PV = "0.0+git${SRCPV}" >> >> -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" >> +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git \ >> + file://0001-linux-firmware-de-bash.patch" >> >> S = "${WORKDIR}/git" >> > > >