[PATCH 00/18] Fix the problem of implicit bash dependency

[PATCH 00/18] Fix the problem of implicit bash dependency

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

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
    fi
done

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

-- 
1.7.9.5

[PATCH 01/18] linux-firmware: de-bash scripts to remove bash dependency

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

De-bash some script in linux-firmware to make it not dependent on
bash.

[YOCTO #5555]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../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

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 <Qi.Chen@windriver.com>
+
+---
+ 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"
 
-- 
1.7.9.5

[PATCH 02/18] apr: make the dev package rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

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]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-support/apr/apr_1.4.8.bb |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-support/apr/apr_1.4.8.bb b/meta/recipes-support/apr/apr_1.4.8.bb
index d834170..0b4c2d9 100644
--- a/meta/recipes-support/apr/apr_1.4.8.bb
+++ b/meta/recipes-support/apr/apr_1.4.8.bb
@@ -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
-- 
1.7.9.5

[PATCH 03/18] libpam: make libpam-xtests rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

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]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/pam/libpam_1.1.6.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index c9bdcb0..0938a38 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -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 () {
-- 
1.7.9.5

[PATCH 04/18] hdparm: make wiper appear before hdparm in PACKAGES

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

Make wiper appear before hdparm in PACKAGES so that wiper is packaged
correctly.

[YOCTO #5555]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/hdparm/hdparm_9.43.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/hdparm/hdparm_9.43.bb b/meta/recipes-extended/hdparm/hdparm_9.43.bb
index 592b8cb..2ba0c42 100644
--- a/meta/recipes-extended/hdparm/hdparm_9.43.bb
+++ b/meta/recipes-extended/hdparm/hdparm_9.43.bb
@@ -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"
 
-- 
1.7.9.5

[PATCH 05/18] lsb: de-bash scripts to remove bash dependency

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

De-bash some script in lsb to make it not dependent on bash.

[YOCTO #5555]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 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(-)

diff --git a/meta/recipes-extended/lsb/lsb/lsb_killproc b/meta/recipes-extended/lsb/lsb/lsb_killproc
index e1121e4..866c1a9 100755
--- a/meta/recipes-extended/lsb/lsb/lsb_killproc
+++ b/meta/recipes-extended/lsb/lsb/lsb_killproc
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 . /etc/init.d/functions
 
diff --git a/meta/recipes-extended/lsb/lsb/lsb_log_message b/meta/recipes-extended/lsb/lsb/lsb_log_message
index 9daa9c8..a716518 100755
--- a/meta/recipes-extended/lsb/lsb/lsb_log_message
+++ b/meta/recipes-extended/lsb/lsb/lsb_log_message
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 . /etc/init.d/functions
 
diff --git a/meta/recipes-extended/lsb/lsb/lsb_pidofproc b/meta/recipes-extended/lsb/lsb/lsb_pidofproc
index ffc17bb..6d1fd0f 100755
--- a/meta/recipes-extended/lsb/lsb/lsb_pidofproc
+++ b/meta/recipes-extended/lsb/lsb/lsb_pidofproc
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 . /etc/init.d/functions
 
diff --git a/meta/recipes-extended/lsb/lsb/lsb_start_daemon b/meta/recipes-extended/lsb/lsb/lsb_start_daemon
index 05b6371..de62c23 100755
--- a/meta/recipes-extended/lsb/lsb/lsb_start_daemon
+++ b/meta/recipes-extended/lsb/lsb/lsb_start_daemon
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 . /etc/init.d/functions
 
-- 
1.7.9.5

[PATCH 06/18] xz: rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

Make xz explicitly rdepend on bash so that the rootfs task will
not fail for the reason of implicit runtime bash dependency.

[YOCTO #5555]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/xz/xz_5.1.3alpha.bb |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-extended/xz/xz_5.1.3alpha.bb b/meta/recipes-extended/xz/xz_5.1.3alpha.bb
index b49fbf7..4e07709 100644
--- a/meta/recipes-extended/xz/xz_5.1.3alpha.bb
+++ b/meta/recipes-extended/xz/xz_5.1.3alpha.bb
@@ -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"
-- 
1.7.9.5

[PATCH 07/18] dtc: make dtc-misc rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

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]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-kernel/dtc/dtc.inc |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index de375d7..a8c24c1 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -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"
-- 
1.7.9.5

[PATCH 08/18] lsbtest: de-bash script to remove bash dependency

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

De-bash scripts in lsbtest to make it not dependent on bash.

[YOCTO #5555]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/lsb/lsbtest/LSB_Test.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
index af1d61c..3901199 100644
--- a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
+++ b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
@@ -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}
-- 
1.7.9.5

[PATCH 09/18] libtool: explicitly rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

Make libtool explicitly rdepend on bash so that the rootfs task will
not fail for the reason of implicit runtime bash dependency.

[YOCTO #5555]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-devtools/libtool/libtool-2.4.2.inc |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index 5a67eeb9..fc1afcd 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -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"
-- 
1.7.9.5

[PATCH 10/18] rpm: fix RDEPENDS for rpm-build

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

Fix RDEPENDS for rpm-build.

[YOCTO #5555]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-devtools/rpm/rpm_5.4.9.bb |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 4b95a90..840a375 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -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}"
 
-- 
1.7.9.5

[PATCH 11/18] nfs-utils: add bash to RDEPENDS

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

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]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../nfs-utils/nfs-utils_1.2.9.bb                   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb
index ea49146..a2e2477 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb
@@ -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 \
-- 
1.7.9.5

[PATCH 12/18] apt: explicitly rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

Make apt explicitly rdepend on bash so that the rootfs task will
not fail for the reason of implicit runtime bash dependency.

[YOCTO #5555]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-devtools/apt/apt_0.9.9.4.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/apt/apt_0.9.9.4.bb b/meta/recipes-devtools/apt/apt_0.9.9.4.bb
index ae9ed6c..86ffe66 100644
--- a/meta/recipes-devtools/apt/apt_0.9.9.4.bb
+++ b/meta/recipes-devtools/apt/apt_0.9.9.4.bb
@@ -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
 
-- 
1.7.9.5

[PATCH 13/18] gzip: explicitly rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

Make gzip explicitly rdepend on bash so that the rootfs task will
not fail for the reason of implicit runtime bash dependency.

[YOCTO #5555]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/gzip/gzip.inc |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index 6ec1dae..a4eddaa 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -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 () {
-- 
1.7.9.5

[PATCH 14/18] pm-utils: explicitly rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

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]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
index c29eb0c..f295cff 100644
--- a/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
+++ b/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
@@ -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 )
-- 
1.7.9.5

[PATCH 15/18] ltp: explicitly rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

Make ltp explicitly rdepend on bash so that the rootfs task will
not fail for the reason of implicit runtime bash dependency.

[YOCTO #5555]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-extended/ltp/ltp_20130904.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/ltp/ltp_20130904.bb b/meta/recipes-extended/ltp/ltp_20130904.bb
index 5e10448..8d865ec 100644
--- a/meta/recipes-extended/ltp/ltp_20130904.bb
+++ b/meta/recipes-extended/ltp/ltp_20130904.bb
@@ -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"
-- 
1.7.9.5

[PATCH 16/18] kconfig-frontends: explicitly rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

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]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../kconfig-frontends_3.12.0.0.bb                  |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
index f225af0..a13ffe0 100644
--- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
+++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb
@@ -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"
-- 
1.7.9.5

[PATCH 17/18] pax-utils: add bash runtime dependency

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

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]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-devtools/pax-utils/pax-utils_0.7.bb |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-devtools/pax-utils/pax-utils_0.7.bb b/meta/recipes-devtools/pax-utils/pax-utils_0.7.bb
index 30fb0e6..f8e567f 100644
--- a/meta/recipes-devtools/pax-utils/pax-utils_0.7.bb
+++ b/meta/recipes-devtools/pax-utils/pax-utils_0.7.bb
@@ -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"
-- 
1.7.9.5

[PATCH 18/18] kernel.bbclass: make kernel-dev explicitly rdepend on bash

[Qi.Chen]

From: Chen Qi <Qi.Chen@windriver.com>

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]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/classes/kernel.bbclass |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 24ac778..d01f132 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -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
-- 
1.7.9.5

Re: [PATCH 01/18] linux-firmware: de-bash scripts to remove bash dependency

[Richard Purdie]

On Fri, 2013-11-29 at 20:48 +0800, Qi.Chen@windriver.com wrote:
> From: Chen Qi <Qi.Chen@windriver.com>
> 
> De-bash some script in linux-firmware to make it not dependent on
> bash.
> 
> [YOCTO #5555]
> 
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  .../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


> 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 <Qi.Chen@windriver.com>
> +
> +---
> + 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"
>  

Re: [PATCH 01/18] linux-firmware: de-bash scripts to remove bash dependency

[ChenQi]

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 <Qi.Chen@windriver.com>
>>
>> De-bash some script in linux-firmware to make it not dependent on
>> bash.
>>
>> [YOCTO #5555]
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>>   .../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 <Qi.Chen@windriver.com>
>> +
>> +---
>> + 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"
>>   
>
>
>

Re: [PATCH 06/18] xz: rdepend on bash

[Randy MacLeod]

On 13-11-29 07:48 AM, Qi.Chen@windriver.com wrote:
> From: Chen Qi <Qi.Chen@windriver.com>
>
> 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

>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>   meta/recipes-extended/xz/xz_5.1.3alpha.bb |    2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/meta/recipes-extended/xz/xz_5.1.3alpha.bb b/meta/recipes-extended/xz/xz_5.1.3alpha.bb
> index b49fbf7..4e07709 100644
> --- a/meta/recipes-extended/xz/xz_5.1.3alpha.bb
> +++ b/meta/recipes-extended/xz/xz_5.1.3alpha.bb
> @@ -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"
>


-- 
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350

Re: [PATCH 13/18] gzip: explicitly rdepend on bash

[Randy MacLeod]

On 13-11-29 07:48 AM, Qi.Chen@windriver.com wrote:
> From: Chen Qi <Qi.Chen@windriver.com>
>
> 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

>
> [YOCTO #5555]
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>   meta/recipes-extended/gzip/gzip.inc |    2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
> index 6ec1dae..a4eddaa 100644
> --- a/meta/recipes-extended/gzip/gzip.inc
> +++ b/meta/recipes-extended/gzip/gzip.inc
> @@ -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 () {
>


-- 
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350