summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc15
1 files changed, 10 insertions, 5 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index dd607ef03e..4cca897b60 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -27,8 +27,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
27 27
28PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ 28PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
29 util-linux-swaponoff util-linux-losetup util-linux-umount \ 29 util-linux-swaponoff util-linux-losetup util-linux-umount \
30 util-linux-mount util-linux-readprofile util-linux-libblkid \ 30 util-linux-mount util-linux-readprofile util-linux-uuidd \
31 util-linux-libmount util-linux-libuuid util-linux-uuidd \
32 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ 31 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
33 util-linux-mkfs util-linux-mcookie util-linux-reset \ 32 util-linux-mkfs util-linux-mcookie util-linux-reset \
34 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ 33 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
@@ -36,6 +35,8 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
36 util-linux-findfs util-linux-getopt" 35 util-linux-findfs util-linux-getopt"
37PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" 36PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"
38 37
38PACKAGES_DYNAMIC = "^util-linux-lib.*"
39
39SHARED_EXTRA_OECONF = "--disable-use-tty-group \ 40SHARED_EXTRA_OECONF = "--disable-use-tty-group \
40 --disable-makeinstall-chown \ 41 --disable-makeinstall-chown \
41 --enable-kill --enable-last --enable-mesg --enable-partx \ 42 --enable-kill --enable-last --enable-mesg --enable-partx \
@@ -85,11 +86,8 @@ FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
85FILES_util-linux-findfs = "${sbindir}/findfs" 86FILES_util-linux-findfs = "${sbindir}/findfs"
86FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" 87FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}"
87 88
88FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
89FILES_util-linux-libmount = "${base_libdir}/libmount.so.*"
90FILES_util-linux-pylibmount = "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \ 89FILES_util-linux-pylibmount = "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \
91 ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.*" 90 ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.*"
92FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*"
93FILES_util-linux-lscpu = "${bindir}/lscpu" 91FILES_util-linux-lscpu = "${bindir}/lscpu"
94 92
95FILES_util-linux-fsck = "${base_sbindir}/fsck*" 93FILES_util-linux-fsck = "${base_sbindir}/fsck*"
@@ -243,3 +241,10 @@ python do_package_prepend () {
243 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, '%s/%s' % (d.getVar('base_bindir', True), alt_name)) 241 d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, '%s/%s' % (d.getVar('base_bindir', True), alt_name))
244 d.appendVar('ALTERNATIVE_%s' % (d.getVar('PN', True)), ' ' + alt_name) 242 d.appendVar('ALTERNATIVE_%s' % (d.getVar('PN', True)), ' ' + alt_name)
245} 243}
244
245python populate_packages_prepend() {
246 do_split_packages(d, '${base_libdir}', '^lib(.*)\.so\..*$',
247 output_pattern='util-linux-lib%s',
248 description='util-linux lib%s',
249 extra_depends='', prepend=True, allow_links=True)
250}