From c3f93357e2d3ece910ff0e2d18eba3fb94fb5c3c Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Tue, 22 Oct 2013 11:12:00 +0800 Subject: bash: dynamically add or remove a entry to/from /etc/shells 1 Add base-files to RDEPENDS. 2 Use ${base_bindir} in regex to match bash path. 3 Add pkg_postrm to remove the entry from /etc/shells that added by pkg_postinst. Signed-off-by: Ming Liu Signed-off-by: Saul Wold --- meta/recipes-extended/bash/bash.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index 64b476f4fb..99875bfc75 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -17,6 +17,8 @@ ALTERNATIVE_PRIORITY = "100" export AUTOHEADER = "true" +RDEPENDS_${PN} += "base-files" +RDEPENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}-ptest += "make" do_configure_prepend () { @@ -44,7 +46,9 @@ do_install_ptest () { } pkg_postinst_${PN} () { - touch $D${sysconfdir}/shells - grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells - grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells + grep -q "^${base_bindir}/bash$" $D${sysconfdir}/shells || echo ${base_bindir}/bash >> $D${sysconfdir}/shells +} + +pkg_postrm_${PN} () { + printf "$(grep -v "^${base_bindir}/bash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells } -- cgit v1.2.3