diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2021-04-20 16:22:15 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-23 10:10:43 +0100 |
| commit | f0de19e31122abd225bd75c6202839094194a36d (patch) | |
| tree | db80cb9abfd908be56e0c10c23949fcb9521afc1 | |
| parent | 61b0eba90ba4676967b96b5561f99ee2294352a0 (diff) | |
| download | openembedded-core-contrib-f0de19e31122abd225bd75c6202839094194a36d.tar.gz | |
libpam: make volatile files created successfully
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/pam/libpam/pam-volatiles.conf | 1 | ||||
| -rw-r--r-- | meta/recipes-extended/pam/libpam_1.5.1.bb | 21 |
2 files changed, 20 insertions, 2 deletions
diff --git a/meta/recipes-extended/pam/libpam/pam-volatiles.conf b/meta/recipes-extended/pam/libpam/pam-volatiles.conf new file mode 100644 index 0000000000..d8b8259a93 --- /dev/null +++ b/meta/recipes-extended/pam/libpam/pam-volatiles.conf @@ -0,0 +1 @@ +d /var/run/sepermit 0755 root root - - diff --git a/meta/recipes-extended/pam/libpam_1.5.1.bb b/meta/recipes-extended/pam/libpam_1.5.1.bb index f225487688..4363e16b9b 100644 --- a/meta/recipes-extended/pam/libpam_1.5.1.bb +++ b/meta/recipes-extended/pam/libpam_1.5.1.bb @@ -24,6 +24,7 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ file://0001-Makefile.am-support-usrmage.patch \ file://run-ptest \ + file://pam-volatiles.conf \ " SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc" @@ -125,8 +126,18 @@ do_install() { # don't install /var/run when populating rootfs. Do it through volatile rm -rf ${D}${localstatedir} - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/99_pam ${D}${sysconfdir}/default/volatiles + + if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)}; then + rm -rf ${D}${sysconfdir}/init.d/ + rm -rf ${D}${sysconfdir}/rc* + install -d ${D}${sysconfdir}/tmpfiles.d + install -m 0644 ${WORKDIR}/pam-volatiles.conf \ + ${D}${sysconfdir}/tmpfiles.d/pam.conf + else + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/99_pam \ + ${D}${sysconfdir}/default/volatiles/ + fi install -d ${D}${sysconfdir}/pam.d/ install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ @@ -146,6 +157,12 @@ do_install_ptest() { fi } +pkg_postinst_${PN}() { + if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then + /etc/init.d/populate-volatile.sh update + fi +} + inherit features_check REQUIRED_DISTRO_FEATURES = "pam" |