summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-06-24 18:19:07 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-22 22:19:43 (GMT)
commit4709168063a8d3536fdba5f52614a6813a77c130 (patch)
treeb1000c7a60911808ff84ab34e7e94989c0756897
parent51cf0d5a5def5416e64bf5fd44d2189c14df0766 (diff)
downloadpoky-4709168063a8d3536fdba5f52614a6813a77c130.tar.gz
classes/package_rpm: avoid bash being pulled in unnecessarily
The initial installation step for base-passwd, base-files and shadow will pull in bash if any of these packages depend on /bin/sh and a bash package has been built, which is undesirable if you are using busybox; so force the early installation of one or the other depending on which is going to be installed in the second step. Note: this fix is not needed for 1.4 (dylan) and newer, since there we use smart to construct the root filesystem without this initial step. (From OE-Core rev: 71387ee5a126e3df5771da88eb6febc400f249c8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_rpm.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 1ff92ce..e6f5912 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -543,6 +543,9 @@ EOF
543 grep /base-passwd-[0-9] ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/initial_install.manifest || true 543 grep /base-passwd-[0-9] ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/initial_install.manifest || true
544 grep /base-files-[0-9] ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/initial_install.manifest || true 544 grep /base-files-[0-9] ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/initial_install.manifest || true
545 grep /shadow-[0-9] ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/initial_install.manifest || true 545 grep /shadow-[0-9] ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/initial_install.manifest || true
546 # Ensure we get the right shell
547 grep /bash-[0-9] ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/initial_install.manifest || true
548 grep /busybox-[0-9] ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/initial_install.manifest || true
546 549
547 if [ -s ${target_rootfs}/install/initial_install.manifest ]; then 550 if [ -s ${target_rootfs}/install/initial_install.manifest ]; then
548 echo "# Initial Install manifest padding..." >> ${target_rootfs}/install/initial_install.manifest 551 echo "# Initial Install manifest padding..." >> ${target_rootfs}/install/initial_install.manifest