diff options
| -rw-r--r-- | meta/recipes-core/initscripts/initscripts-1.0/sushell | 5 | ||||
| -rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sushell b/meta/recipes-core/initscripts/initscripts-1.0/sushell new file mode 100644 index 0000000000..7d96941687 --- /dev/null +++ b/meta/recipes-core/initscripts/initscripts-1.0/sushell | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | #!/bin/bash | ||
| 2 | |||
| 3 | [ -z "$SUSHELL" ] && SUSHELL=/bin/bash | ||
| 4 | |||
| 5 | exec $SUSHELL | ||
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index a086591b80..b1d917da6a 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb | |||
| @@ -33,6 +33,7 @@ SRC_URI = "file://functions \ | |||
| 33 | file://GPLv2.patch \ | 33 | file://GPLv2.patch \ |
| 34 | file://dmesg.sh \ | 34 | file://dmesg.sh \ |
| 35 | file://logrotate-dmesg.conf \ | 35 | file://logrotate-dmesg.conf \ |
| 36 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','file://sushell','',d)} \ | ||
| 36 | " | 37 | " |
| 37 | 38 | ||
| 38 | S = "${WORKDIR}" | 39 | S = "${WORKDIR}" |
| @@ -46,7 +47,9 @@ DEPENDS_append = " update-rc.d-native" | |||
| 46 | DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | 47 | DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" |
| 47 | 48 | ||
| 48 | PACKAGES =+ "${PN}-functions" | 49 | PACKAGES =+ "${PN}-functions" |
| 49 | RDEPENDS_${PN} = "${PN}-functions" | 50 | RDEPENDS_${PN} = "${PN}-functions \ |
| 51 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','bash','',d)} \ | ||
| 52 | " | ||
| 50 | FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" | 53 | FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" |
| 51 | 54 | ||
| 52 | ALTERNATIVE_PRIORITY_${PN}-functions = "90" | 55 | ALTERNATIVE_PRIORITY_${PN}-functions = "90" |
| @@ -104,6 +107,11 @@ do_install () { | |||
| 104 | if [ "${TARGET_ARCH}" = "arm" ]; then | 107 | if [ "${TARGET_ARCH}" = "arm" ]; then |
| 105 | install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d | 108 | install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d |
| 106 | fi | 109 | fi |
| 110 | |||
| 111 | if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then | ||
| 112 | install -d ${D}/${base_sbindir} | ||
| 113 | install -m 0755 ${WORKDIR}/sushell ${D}/${base_sbindir} | ||
| 114 | fi | ||
| 107 | # | 115 | # |
| 108 | # Install device dependent scripts | 116 | # Install device dependent scripts |
| 109 | # | 117 | # |
