diff options
Diffstat (limited to 'poky/meta/recipes-extended/pam')
-rw-r--r-- | poky/meta/recipes-extended/pam/libpam/pam-volatiles.conf | 1 | ||||
-rw-r--r-- | poky/meta/recipes-extended/pam/libpam/run-ptest | 5 | ||||
-rw-r--r-- | poky/meta/recipes-extended/pam/libpam_1.3.1.bb | 22 |
3 files changed, 24 insertions, 4 deletions
diff --git a/poky/meta/recipes-extended/pam/libpam/pam-volatiles.conf b/poky/meta/recipes-extended/pam/libpam/pam-volatiles.conf new file mode 100644 index 000000000..d8b8259a9 --- /dev/null +++ b/poky/meta/recipes-extended/pam/libpam/pam-volatiles.conf @@ -0,0 +1 @@ +d /var/run/sepermit 0755 root root - - diff --git a/poky/meta/recipes-extended/pam/libpam/run-ptest b/poky/meta/recipes-extended/pam/libpam/run-ptest index 69e729ce2..9c304aee4 100644 --- a/poky/meta/recipes-extended/pam/libpam/run-ptest +++ b/poky/meta/recipes-extended/pam/libpam/run-ptest @@ -2,9 +2,10 @@ cd tests +export srcdir=. + failed=0 all=0 - for f in tst-*; do "./$f" > /dev/null 2>&1 case "$?" in @@ -28,4 +29,4 @@ if [ "$failed" -eq 0 ] ; then else echo "$failed of $all tests failed" fi - +unset srcdir diff --git a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb b/poky/meta/recipes-extended/pam/libpam_1.3.1.bb index adc641505..674193483 100644 --- a/poky/meta/recipes-extended/pam/libpam_1.3.1.bb +++ b/poky/meta/recipes-extended/pam/libpam_1.3.1.bb @@ -24,6 +24,7 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://pam-security-abstract-securetty-handling.patch \ file://pam-unix-nullok-secure.patch \ file://crypt_configure.patch \ + file://pam-volatiles.conf \ " SRC_URI[md5sum] = "558ff53b0fc0563ca97f79e911822165" @@ -140,8 +141,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/ @@ -158,9 +169,16 @@ do_install_ptest() { if [ ${PTEST_ENABLED} = "1" ]; then mkdir -p ${D}${PTEST_PATH}/tests install -m 0755 ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests + install -m 0644 ${S}/tests/confdir ${D}${PTEST_PATH}/tests 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" |