Fix the problem of implicit bash dependency
PATCH 1/18 linux-firmware: de-bash scripts to remove bash dependency
In reply to [email protected]From: Chen Qi <[email protected]>
De-bash some script in linux-firmware to make it not dependent on bash.
[YOCTO #5555]
--- .../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
meta/recipes-kernel/linux-firmware/files/0001-linux-firmware-de-bash.patch new file +47 -0
@@ -0,0 +1,47 @@ +Upstream-Status: Pending + +Subject: linux-firmware: de-bash + +Signed-off-by: Chen Qi <[email protected]> + +--- + 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 +
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +2 -1
@@ -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"
Signature · 1 line
1.7.9.5
PATCH 2/18 apr: make the dev package rdepend on bash
In reply to [email protected]From: Chen Qi <[email protected]>
Make apr-dev explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/recipes-support/apr/apr_1.4.8.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-support/apr/apr_1.4.8.bb +1 -0
@@ -29,6 +29,7 @@ do_configure_prepend() { ./buildconf } +RDEPENDS_${PN}-dev += "bash" FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" #for some reason, build/libtool.m4 handled by buildconf still be overwritten
Signature · 1 line
1.7.9.5
cover Fix the problem of implicit bash dependency
From: Chen Qi <[email protected]>
If package A has implicit bash dependency but there's no explicit runtime dependency written in its recipe, the rootfs task would fail if A is intalled onto an image which doesn't have installed.
For example, if we add nfs-utils to core-image-minimal via:
IMAGE_INSTALL_append = " nfs-utils"
and then build the image from a clean build (no previously built bash package in the package repo), the build would fail for the reason of lack of bash package.
This patchset is an effort to solve this problem. After this patch, there's no such problem in oe-core. But other layers also needs to be fixed for this problem.
//Chen Qi
P.S.
The bash dependency problem is automatically detected by the following script:
#!/bin/sh
if [ $# -lt 1 ]; then
echo "$0 <rpm repo> [report file]"
exit 1
fi
RPM_REPO="$1"
REPORT_FILE=${2:-bash-deps.report}
echo "Analyzing packages under $RPM_REPO ... "
for pkg in find $RPM_REPO -name "*.rpm"; do
echo $pkg
result="`rpm -qp --requires $pkg 2>/dev/null | grep -w bash | sort -u | sed -e 's/[ ]*$//'`"
if [ "$result" = "/bin/bash" ]; then
echo "MISS: <$pkg>" >> $REPORT_FILE
else
echo "OK: <$pkg>" >> $REPORT_FILE
fidone
echo "Done. Report could be found in $REPORT_FILE"
Please refer to https://bugzilla.yoctoproject.org/show_bug.cgi?id=5555 for more info.
The following changes since commit 7b9f4b2cd0fe6dc9a536a2db98ed93ffa8c05a8f:
base/gcc-common: Ensure umask setting is consistent for shared workdir (2013-11-29 11:24:48 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/bash-deps
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/bash-deps
Chen Qi (18):
linux-firmware: de-bash scripts to remove bash dependency
apr: make the dev package rdepend on bash
libpam: make libpam-xtests rdepend on bash
hdparm: make wiper appear before hdparm in PACKAGES
lsb: de-bash scripts to remove bash dependency
xz: rdepend on bash
dtc: make dtc-misc rdepend on bash
lsbtest: de-bash script to remove bash dependency
libtool: explicitly rdepend on bash
rpm: fix RDEPENDS for rpm-build
nfs-utils: add bash to RDEPENDS
apt: explicitly rdepend on bash
gzip: explicitly rdepend on bash
pm-utils: explicitly rdepend on bash
ltp: explicitly rdepend on bash
kconfig-frontends: explicitly rdepend on bash
pax-utils: add bash runtime dependency kernel.bbclass: make kernel-dev explicitly rdepend on bash
meta/classes/kernel.bbclass | 1 + meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 2 +- .../nfs-utils/nfs-utils_1.2.9.bb | 2 +- meta/recipes-devtools/apt/apt_0.9.9.4.bb | 2 +- .../kconfig-frontends_3.12.0.0.bb | 1 + meta/recipes-devtools/libtool/libtool-2.4.2.inc | 1 + meta/recipes-devtools/pax-utils/pax-utils_0.7.bb | 2 + meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 +- meta/recipes-extended/gzip/gzip.inc | 2 + meta/recipes-extended/hdparm/hdparm_9.43.bb | 2 +- meta/recipes-extended/lsb/lsb/lsb_killproc | 2 +- meta/recipes-extended/lsb/lsb/lsb_log_message | 2 +- meta/recipes-extended/lsb/lsb/lsb_pidofproc | 2 +- meta/recipes-extended/lsb/lsb/lsb_start_daemon | 2 +- meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 4 +- meta/recipes-extended/ltp/ltp_20130904.bb | 2 +- meta/recipes-extended/pam/libpam_1.1.6.bb | 2 +- meta/recipes-extended/xz/xz_5.1.3alpha.bb | 2 + meta/recipes-kernel/dtc/dtc.inc | 1 + .../files/0001-linux-firmware-de-bash.patch | 47 ++++++++++++++++++++ .../linux-firmware/linux-firmware_git.bb | 3 +- meta/recipes-support/apr/apr_1.4.8.bb | 1 + 22 files changed, 73 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-kernel/linux-firmware/files/0001-linux-firmware-de-bash.patch
Signature · 1 line
1.7.9.5
PATCH 3/18 libpam: make libpam-xtests rdepend on bash
From: Chen Qi <[email protected]>
Make libpam-xtests explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/recipes-extended/pam/libpam_1.1.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/pam/libpam_1.1.6.bb +1 -1
@@ -63,7 +63,7 @@ FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" PACKAGES_DYNAMIC += "^pam-plugin-.*" RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix" -RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cracklib pam-plugin-pwhistory pam-plugin-succeed-if pam-plugin-time coreutils" +RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cracklib pam-plugin-pwhistory pam-plugin-succeed-if pam-plugin-time coreutils bash" RRECOMMENDS_${PN} = "libpam-runtime" python populate_packages_prepend () {
Signature · 1 line
1.7.9.5
PATCH 4/18 hdparm: make wiper appear before hdparm in PACKAGES
In reply to [email protected]From: Chen Qi <[email protected]>
Make wiper appear before hdparm in PACKAGES so that wiper is packaged correctly.
[YOCTO #5555]
--- meta/recipes-extended/hdparm/hdparm_9.43.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/hdparm/hdparm_9.43.bb +1 -1
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24 \ file://wiper/wiper.sh;beginline=7;endline=31;md5=b7bc642addc152ea307505bf1a296f09" -PACKAGES += "wiper" +PACKAGES =+ "wiper" FILES_wiper = "${bindir}/wiper.sh"
Signature · 1 line
1.7.9.5
PATCH 5/18 lsb: de-bash scripts to remove bash dependency
In reply to [email protected]From: Chen Qi <[email protected]>
De-bash some script in lsb to make it not dependent on bash.
[YOCTO #5555]
--- meta/recipes-extended/lsb/lsb/lsb_killproc | 2 +- meta/recipes-extended/lsb/lsb/lsb_log_message | 2 +- meta/recipes-extended/lsb/lsb/lsb_pidofproc | 2 +- meta/recipes-extended/lsb/lsb/lsb_start_daemon | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-extended/lsb/lsb/lsb_killproc +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . /etc/init.d/functions
meta/recipes-extended/lsb/lsb/lsb_log_message +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . /etc/init.d/functions
meta/recipes-extended/lsb/lsb/lsb_pidofproc +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . /etc/init.d/functions
meta/recipes-extended/lsb/lsb/lsb_start_daemon +1 -1
@@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . /etc/init.d/functions
Signature · 1 line
1.7.9.5
PATCH 6/18 xz: rdepend on bash
In reply to [email protected]From: Chen Qi <[email protected]>
Make xz explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/recipes-extended/xz/xz_5.1.3alpha.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-extended/xz/xz_5.1.3alpha.bb +2 -0
@@ -13,6 +13,8 @@ SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz" SRC_URI[md5sum] = "bbb2daa876c87fb2cf9fe4590af9694e" SRC_URI[sha256sum] = "9f94506e301d5b6863921bba861a99ba00de384dafb4e5f409679a93e41613d4" +RDEPENDS_${PN}_class-target = "bash" + inherit autotools gettext PACKAGES =+ "liblzma liblzma-dev liblzma-staticdev liblzma-dbg"
Signature · 1 line
1.7.9.5
PATCH 7/18 dtc: make dtc-misc rdepend on bash
In reply to [email protected]From: Chen Qi <[email protected]>
Make dtc-misc explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/recipes-kernel/dtc/dtc.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-kernel/dtc/dtc.inc +1 -0
@@ -15,4 +15,5 @@ EXTRA_OEMAKE='PREFIX="${prefix}" LIBDIR="${libdir}"' S = "${WORKDIR}/git" PACKAGES =+ "${PN}-misc" +RDEPENDS_${PN}-misc = "bash" FILES_${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff"
Signature · 1 line
1.7.9.5
PATCH 8/18 lsbtest: de-bash script to remove bash dependency
In reply to [email protected]From: Chen Qi <[email protected]>
De-bash scripts in lsbtest to make it not dependent on bash.
[YOCTO #5555]
--- meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/lsb/lsbtest/LSB_Test.sh +2 -2
@@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Copyright (C) 2012 Wind River Systems, Inc. #
@@ -272,7 +272,7 @@ then fi if ! `grep -F -q "noarch-suse" ${PLATFORM_FILE}`; then - if [ ${ARCH} == i686 ];then + if [ ${ARCH} = i686 ];then echo "i486-suse" >> ${PLATFORM_FILE} echo "i486-noarch" >> ${PLATFORM_FILE} echo "i486-pc" >> ${PLATFORM_FILE}
Signature · 1 line
1.7.9.5
PATCH 9/18 libtool: explicitly rdepend on bash
In reply to [email protected]From: Chen Qi <[email protected]>
Make libtool explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/recipes-devtools/libtool/libtool-2.4.2.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/libtool/libtool-2.4.2.inc +1 -0
@@ -37,6 +37,7 @@ inherit autotools EXTRA_AUTORECONF = "--exclude=libtoolize" DEPENDS = "libtool-native" +RDEPENDS_${PN} = "bash" PACKAGES =+ "libltdl libltdl-dev libltdl-dbg libltdl-staticdev" FILES_${PN} += "${datadir}/aclocal"
Signature · 1 line
1.7.9.5
PATCH 10/18 rpm: fix RDEPENDS for rpm-build
In reply to [email protected]From: Chen Qi <[email protected]>
Fix RDEPENDS for rpm-build.
[YOCTO #5555]
--- meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-devtools/rpm/rpm_5.4.9.bb +1 -2
@@ -254,7 +254,7 @@ FILES_${PN}-libs = "${libdir}/librpm-*.so \ ${libdir}/librpmbuild-*.so \ " -RDEPENDS_${PN}-build += "bash" +RDEPENDS_${PN}-build += "bash file" FILES_${PN}-build = "${prefix}/src/rpm \ ${bindir}/rpmbuild \
@@ -323,7 +323,6 @@ FILES_${PN}-build = "${prefix}/src/rpm \ RDEPENDS_${PN} = "base-files run-postinsts" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" -RDEPENDS_${PN}-build = "file" RDEPENDS_python-rpm = "${PN}"
Signature · 1 line
1.7.9.5
PATCH 11/18 nfs-utils: add bash to RDEPENDS
In reply to [email protected]From: Chen Qi <[email protected]>
Make nfs-utils explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- .../nfs-utils/nfs-utils_1.2.9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb +1 -1
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" # util-linux for libblkid DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3" -RDEPENDS_${PN} = "rpcbind" +RDEPENDS_${PN} = "rpcbind bash" RRECOMMENDS_${PN} = "kernel-module-nfsd" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
Signature · 1 line
1.7.9.5
PATCH 12/18 apt: explicitly rdepend on bash
In reply to [email protected]From: Chen Qi <[email protected]>
Make apt explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/recipes-devtools/apt/apt_0.9.9.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/apt/apt_0.9.9.4.bb +1 -1
@@ -1,5 +1,5 @@ DEPENDS = "curl db" -RDEPENDS_${PN} = "dpkg" +RDEPENDS_${PN} = "dpkg bash" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" require apt.inc
Signature · 1 line
1.7.9.5
PATCH 13/18 gzip: explicitly rdepend on bash
In reply to [email protected]From: Chen Qi <[email protected]>
Make gzip explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/recipes-extended/gzip/gzip.inc | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-extended/gzip/gzip.inc +2 -0
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" +RDEPENDS_${PN}_class-target = "bash" + inherit autotools do_install_append () {
Signature · 1 line
1.7.9.5
PATCH 14/18 pm-utils: explicitly rdepend on bash
In reply to [email protected]From: Chen Qi <[email protected]>
Make pm-utils explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb +1 -1
@@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "8ed899032866d88b2933a1d34cc75e8ae42dcde20e1cc21836baaae3d4 inherit pkgconfig autotools -RDEPENDS_${PN} = "grep" +RDEPENDS_${PN} = "grep bash" do_configure_prepend () { ( cd ${S}; autoreconf -f -i -s )
Signature · 1 line
1.7.9.5
PATCH 15/18 ltp: explicitly rdepend on bash
In reply to [email protected]From: Chen Qi <[email protected]>
Make ltp explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/recipes-extended/ltp/ltp_20130904.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/ltp/ltp_20130904.bb +1 -1
@@ -31,7 +31,7 @@ export exec_prefix = "/opt/ltp" inherit autotools -RDEPENDS_${PN} = "perl e2fsprogs-mke2fs" +RDEPENDS_${PN} = "bash perl e2fsprogs-mke2fs" FILES_${PN}-dbg += "/opt/ltp/runtest/.debug" FILES_${PN}-dbg += "/opt/ltp/testcases/bin/.debug"
Signature · 1 line
1.7.9.5
PATCH 16/18 kconfig-frontends: explicitly rdepend on bash
In reply to [email protected]From: Chen Qi <[email protected]>
Make kconfig-frontends explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- .../kconfig-frontends_3.12.0.0.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb +1 -0
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408" SECTION = "devel" DEPENDS += "ncurses flex bison gperf pkgconfig-native" RDEPENDS_${PN} += "python" +RDEPENDS_${PN}_class-target = "python bash" SRC_URI = "http://ymorin.is-a-geek.org/download/${BPN}/${BP}.tar.xz" SRC_URI[md5sum] = "b939280dcc83f8feabd87a1d5f9b00c2"
Signature · 1 line
1.7.9.5
PATCH 17/18 pax-utils: add bash runtime dependency
In reply to [email protected]From: Chen Qi <[email protected]>
Make pax-utils explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/recipes-devtools/pax-utils/pax-utils_0.7.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/pax-utils/pax-utils_0.7.bb +2 -0
@@ -7,6 +7,8 @@ HOMEPAGE = "http://www.gentoo.org/proj/en/hardened/pax-utils.xml" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" +RDEPENDS_${PN}_class-target = "bash" + SRC_URI = "http://gentoo.osuosl.org/distfiles/pax-utils-${PV}.tar.xz" SRC_URI[md5sum] = "8ae7743ad11500f7604f2e817221d877"
Signature · 1 line
1.7.9.5
PATCH 18/18 kernel.bbclass: make kernel-dev explicitly rdepend on bash
In reply to [email protected]From: Chen Qi <[email protected]>
Make kernel-dev explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
--- meta/classes/kernel.bbclass | 1 + 1 file changed, 1 insertion(+)
meta/classes/kernel.bbclass +1 -0
@@ -328,6 +328,7 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" FILES_kernel-dev = "/boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH}" FILES_kernel-vmlinux = "/boot/vmlinux*" FILES_kernel-modules = "" +RDEPENDS_kernel-dev = "bash" RDEPENDS_kernel = "kernel-base" # Allow machines to override this dependency if kernel image files are # not wanted in images as standard
Signature · 1 line
1.7.9.5
Re: [PATCH 01/18] linux-firmware: de-bash scripts to remove bash dependency
In reply to [email protected]Quoted 5 lines · On Fri, 2013-11-29 at 20:48 +0800, [email protected] wrote:
From: Chen Qi <[email protected]>
De-bash some script in linux-firmware to make it not dependent on bash.
Quoted 8 lines
[YOCTO #5555]
Signed-off-by Chen Qi <[email protected]>--- .../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
Quoted 67 lines
meta/recipes-kernel/linux-firmware/files/0001-linux-firmware-de-bash.patch new file +47
-0@@ -0,0 +1,47 @@ +Upstream-Status: Pending + +Subject: linux-firmware: de-bash + +Signed-off-by: Chen Qi <[email protected]> + +--- + 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 +meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +2
-1@@ -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"
Re: [PATCH 01/18] linux-firmware: de-bash scripts to remove bash dependency
Quoted 14 lines · Richard Purdie
Quoted 5 lines · On Fri, 2013-11-29 at 20:48 +0800, [email protected] wrote:
From: Chen Qi <[email protected]>
De-bash some script in linux-firmware to make it not dependent on bash.
Quoted 8 lines
[YOCTO #5555]
Signed-off-by Chen Qi <[email protected]>--- .../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
Quoted 7 lines
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
Quoted 70 lines
Quoted 67 lines
meta/recipes-kernel/linux-firmware/files/0001-linux-firmware-de-bash.patch new file +47
-0@@ -0,0 +1,47 @@ +Upstream-Status: Pending + +Subject: linux-firmware: de-bash + +Signed-off-by: Chen Qi <[email protected]> + +--- + 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 +meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +2
-1@@ -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"
Re: [PATCH 06/18] xz: rdepend on bash
In reply to [email protected]Quoted 6 lines · On 13-11-29 07:48 AM, [email protected] wrote:
From: Chen Qi <[email protected]>
Make xz explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
[YOCTO #5555]
Can you explain why bash is needed?
A quick look just turned up:
xz-5.1.2alpha/src/scripts/xzgrep
#!/bin/sh
...
I know you're script looks at the .rpm files but
what puts the bash dependency in the rpm?
../Randy
Quoted 20 lines
Signed-off-by Chen Qi <[email protected]>--- meta/recipes-extended/xz/xz_5.1.3alpha.bb | 2 ++ 1 file changed, 2 insertions(+)meta/recipes-extended/xz/xz_5.1.3alpha.bb +2
-0@@ -13,6 +13,8 @@ SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz" SRC_URI[md5sum] = "bbb2daa876c87fb2cf9fe4590af9694e" SRC_URI[sha256sum] = "9f94506e301d5b6863921bba861a99ba00de384dafb4e5f409679a93e41613d4" +RDEPENDS_${PN}_class-target = "bash" + inherit autotools gettext PACKAGES =+ "liblzma liblzma-dev liblzma-staticdev liblzma-dbg"
Signature · 2 lines
# Randy MacLeod. SMTS, Linux, Wind River Direct: 613.963.1350
Re: [PATCH 13/18] gzip: explicitly rdepend on bash
In reply to [email protected]Quoted 4 lines · On 13-11-29 07:48 AM, [email protected] wrote:
From: Chen Qi <[email protected]>
Make gzip explicitly rdepend on bash so that the rootfs task will not fail for the reason of implicit runtime bash dependency.
Can you explain why bash is needed?
Same question for the other cases where you add bash as an RDEPEND but don't explain why busybox's /bin/sh will not suffice.
../Randy
Quoted 22 lines
[YOCTO #5555]
Signed-off-by Chen Qi <[email protected]>--- meta/recipes-extended/gzip/gzip.inc | 2 ++ 1 file changed, 2 insertions(+)meta/recipes-extended/gzip/gzip.inc +2
-0@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" +RDEPENDS_${PN}_class-target = "bash" + inherit autotools do_install_append () {
Signature · 2 lines
# Randy MacLeod. SMTS, Linux, Wind River Direct: 613.963.1350