diff options
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e479fc24e1..4a72e3d40e 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -96,7 +96,8 @@ FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" | |||
96 | FILES_util-linux-runuser = "${sbindir}/runuser" | 96 | FILES_util-linux-runuser = "${sbindir}/runuser" |
97 | FILES_util-linux-prlimit = "${bindir}/prlimit" | 97 | FILES_util-linux-prlimit = "${bindir}/prlimit" |
98 | FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" | 98 | FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" |
99 | FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" | 99 | FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" |
100 | FILES_util-linux-su = "${base_bindir}/su.${BPN} ${sysconfdir}/pam.d/su-l" | ||
100 | CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" | 101 | CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" |
101 | 102 | ||
102 | FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ | 103 | FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ |
@@ -122,9 +123,6 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" | |||
122 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" | 123 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" |
123 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" | 124 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" |
124 | 125 | ||
125 | RDEPENDS_util-linux-runuser += "libpam" | ||
126 | RDEPENDS_util-linux-su += "libpam" | ||
127 | |||
128 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin util-linux-lsblk" | 126 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin util-linux-lsblk" |
129 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" | 127 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" |
130 | 128 | ||
@@ -228,6 +226,7 @@ ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" | |||
228 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" | 226 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" |
229 | 227 | ||
230 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" | 228 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" |
229 | ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" | ||
231 | 230 | ||
232 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" | 231 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" |
233 | ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" | 232 | ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" |
@@ -235,6 +234,7 @@ ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" | |||
235 | ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" | 234 | ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" |
236 | ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" | 235 | ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" |
237 | ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" | 236 | ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" |
237 | ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" | ||
238 | ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" | 238 | ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" |
239 | ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" | 239 | ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" |
240 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" | 240 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" |
@@ -263,6 +263,9 @@ ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" | |||
263 | ALTERNATIVE_util-linux-mount = "mount" | 263 | ALTERNATIVE_util-linux-mount = "mount" |
264 | ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" | 264 | ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" |
265 | 265 | ||
266 | ALTERNATIVE_${PN}-su = "su" | ||
267 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" | ||
268 | |||
266 | ALTERNATIVE_util-linux-umount = "umount" | 269 | ALTERNATIVE_util-linux-umount = "umount" |
267 | ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" | 270 | ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" |
268 | 271 | ||
@@ -305,15 +308,6 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" | |||
305 | 308 | ||
306 | BBCLASSEXTEND = "native nativesdk" | 309 | BBCLASSEXTEND = "native nativesdk" |
307 | 310 | ||
308 | python do_package_prepend () { | ||
309 | if '--enable-su' in d.getVar('EXTRA_OECONF').split(): | ||
310 | d.appendVar(d.expand('ALTERNATIVE_${PN}'), ' su') | ||
311 | d.appendVar(d.expand('ALTERNATIVE_${PN}-doc'), ' su.1') | ||
312 | |||
313 | d.setVarFlag('ALTERNATIVE_LINK_NAME', "su", d.expand('${base_bindir}/su')) | ||
314 | d.setVarFlag('ALTERNATIVE_LINK_NAME', "su.1", d.expand('${mandir}/man1/su.1')) | ||
315 | } | ||
316 | |||
317 | python populate_packages_prepend() { | 311 | python populate_packages_prepend() { |
318 | do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', | 312 | do_split_packages(d, '${base_libdir}', r'^lib(.*)\.so\..*$', |
319 | output_pattern='util-linux-lib%s', | 313 | output_pattern='util-linux-lib%s', |