summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2015-08-06 14:35:53 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-10 12:40:24 -0700
commit38d52556903546d6ccaa36082b38c6e2fc606cc5 (patch)
tree9e10d11a4f8c2f16ebe98644e8166ea998e7179e
parent8b8380833fe6b1d573af3b6acbaa4c2efac701a3 (diff)
downloadpoky-38d52556903546d6ccaa36082b38c6e2fc606cc5.tar.gz
initscripts: Fix regression for requiring /bin/bash
It is not possible to create a rootfs with only busybox + initscipts. This is a result of a regression from commit a4b53872a8a9a2743299acbff015f7f2750a69d6 (initscripts: add /sbin/sushell for systemd service debug-shell). The /sbin/sushell should just use /bin/sh else you end up with a problem when creating the end image with a failed smart transaction shown below: ERROR: Unable to install packages. Command '/proj/bitbake_build/tmp/sysroots/x86_64-linux/usr/bin/smart --quiet --data-dir=/proj/bitbake_build/tmp/work/qemuarma9-wrs-linux-gnueabi/wrlinux-image-glibc-small/1.0-r1/rootfs/var/lib/smart install -y dropbear@armv7at2_vfp hac@armv7at2_vfp run-postinsts@all kernel-modules@qemuarma9 packagegroup-core-boot@qemuarma9' returned 1: error: Can't install initscripts-1.0-r155.0@armv7at2_vfp: no package provides /bin/bash (From OE-Core rev: 4917e36a77bd6821b45db52caa43939d344d92f6) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initscripts/initscripts-1.0/sushell4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sushell b/meta/recipes-core/initscripts/initscripts-1.0/sushell
index 7d96941687..c319d95bf7 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/sushell
+++ b/meta/recipes-core/initscripts/initscripts-1.0/sushell
@@ -1,5 +1,5 @@
1#!/bin/bash 1#!/bin/sh
2 2
3[ -z "$SUSHELL" ] && SUSHELL=/bin/bash 3[ -z "$SUSHELL" ] && SUSHELL=/bin/sh
4 4
5exec $SUSHELL 5exec $SUSHELL