diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 1656e92a87..47c2839970 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -35,7 +35,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
35 | util-linux-partx util-linux-hwclock util-linux-mountpoint \ | 35 | util-linux-partx util-linux-hwclock util-linux-mountpoint \ |
36 | util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit" | 36 | util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit" |
37 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" | 37 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" |
38 | PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" | 38 | PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" |
39 | 39 | ||
40 | PACKAGES_DYNAMIC = "^util-linux-lib.*" | 40 | PACKAGES_DYNAMIC = "^util-linux-lib.*" |
41 | 41 | ||
@@ -91,6 +91,8 @@ FILES_util-linux-findfs = "${sbindir}/findfs" | |||
91 | FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" | 91 | FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" |
92 | FILES_util-linux-runuser = "${sbindir}/runuser" | 92 | FILES_util-linux-runuser = "${sbindir}/runuser" |
93 | FILES_util-linux-prlimit = "${bindir}/prlimit" | 93 | FILES_util-linux-prlimit = "${bindir}/prlimit" |
94 | FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" | ||
95 | CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" | ||
94 | 96 | ||
95 | FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ | 97 | FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ |
96 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ | 98 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ |
@@ -116,9 +118,10 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid" | |||
116 | RDEPENDS_util-linux-reset += "ncurses" | 118 | RDEPENDS_util-linux-reset += "ncurses" |
117 | 119 | ||
118 | RDEPENDS_util-linux-runuser += "libpam" | 120 | RDEPENDS_util-linux-runuser += "libpam" |
121 | RDEPENDS_util-linux-su += "libpam" | ||
119 | 122 | ||
120 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin util-linux-lsblk" | 123 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin util-linux-lsblk" |
121 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" | 124 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" |
122 | 125 | ||
123 | RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit" | 126 | RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint util-linux-prlimit" |
124 | 127 | ||
@@ -182,6 +185,12 @@ do_install () { | |||
182 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser | 185 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser |
183 | install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l | 186 | install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l |
184 | fi | 187 | fi |
188 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then | ||
189 | # Required for "su -" aka "su --login" because | ||
190 | # otherwise it uses "other", which has "auth pam_deny.so" | ||
191 | # and thus prevents the operation. | ||
192 | ln -s su ${D}${sysconfdir}/pam.d/su-l | ||
193 | fi | ||
185 | } | 194 | } |
186 | 195 | ||
187 | # reset and nologin causes a conflict with ncurses-native and shadow-native | 196 | # reset and nologin causes a conflict with ncurses-native and shadow-native |