base-files: move shells generating process to pkg_postinst
PATCH 1/2 base-files: move shells generating process to pkg_postinst
The "shells" file lists several valid login shells, of which some might be not present in a particular rootfs, this is unreasonable.
Fix it by moving "shells" file generating process to pkg_postinst, for other shells must do the same thing to register themselves to this file.
--- meta/recipes-core/base-files/base-files/shells | 8 -------- meta/recipes-core/base-files/base-files_3.0.14.bb | 8 ++++++-- 2 files changed, 6 insertions(+), 10 deletions(-) delete mode 100644 meta/recipes-core/base-files/base-files/shells
meta/recipes-core/base-files/base-files/shells deleted +0 -8
@@ -1,8 +0,0 @@ -# /etc/shells: valid login shells -/bin/sh -/bin/ash -/bin/bash -/bin/dash -/bin/ksh -/usr/bin/ksh -/usr/bin/screen
meta/recipes-core/base-files/base-files_3.0.14.bb +6 -2
@@ -16,7 +16,6 @@ SRC_URI = "file://rotation \ file://inputrc \ file://host.conf \ file://profile \ - file://shells \ file://fstab \ file://filesystems \ file://issue.net \
@@ -92,7 +91,6 @@ do_install () { install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile - install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc install -m 0644 ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc
@@ -137,6 +135,12 @@ do_install_append_linuxstdbase() { done } +pkg_postinst_${PN} () { + touch $D${sysconfdir}/shells + grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells +} + + PACKAGES = "${PN}-doc ${PN} ${PN}-dev ${PN}-dbg" FILES_${PN} = "/" FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
Signature · 1 line
1.8.3.3
PATCH 2/2 screen: add pkg_postinst to register entry to /etc/shells
--- meta/recipes-extended/screen/screen_4.0.3.bb | 5 +++++ 1 file changed, 5 insertions(+)
meta/recipes-extended/screen/screen_4.0.3.bb +5 -0
@@ -41,3 +41,8 @@ do_install_append () { fi done } + +pkg_postinst_${PN} () { + touch $D${sysconfdir}/shells + grep -q "usr/bin/screen" $D${sysconfdir}/shells || echo /usr/bin/screen >> $D${sysconfdir}/shells +}
Signature · 1 line
1.8.3.3
Re: [PATCH 2/2] screen: add pkg_postinst to register entry to /etc/shells
Quoted 11 lines · Ming Liu
Signed-off-by Ming Liu <[email protected]>--- meta/recipes-extended/screen/screen_4.0.3.bb | 5 +++++ 1 file changed, 5 insertions(+)meta/recipes-extended/screen/screen_4.0.3.bb +0
-0
meta/recipes-extended/screen/screen_4.0.3.bb do_install_append () { · line 48
Quoted 8 lines
meta/recipes-extended/screen/screen_4.0.3.bb +5
-0@@ -41,3 +41,8 @@ do_install_append () { fi done } + +pkg_postinst_${PN} () { + touch $D${sysconfdir}/shells + grep -q "usr/bin/screen" $D${sysconfdir}/shells || echo /usr/bin/screen >> $D${sysconfdir}/shells +}
should you be using ${bindir} here instead of usr/bin? since it's possible to have different ${prefix}.
Sau!
Re: [PATCH 2/2] screen: add pkg_postinst to register entry to /etc/shells
Quoted 6 lines · Saul Wold
Quoted 5 lines · Ming Liu
Signed-off-by Ming Liu <[email protected]>--- meta/recipes-extended/screen/screen_4.0.3.bb | 5 +++++ 1 file changed, 5 insertions(+)
Quoted 16 lines
Quoted 12 lines
meta/recipes-extended/screen/screen_4.0.3.bb +4
-0@@ -41,3 +41,8 @@ do_install_append () { fi done } + +pkg_postinst_${PN} () { + touch $D${sysconfdir}/shells + grep -q "usr/bin/screen" $D${sysconfdir}/shells || echoQuoted 3 lines
/usr/bin/screen>> $D${sysconfdir}/shells
+}should you be using ${bindir} here instead of usr/bin? since it's possible to have different ${prefix}.
Yes, you are correct, I will send the V1.
//Ming
Quoted 5 lines
Sau!