summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux/util-linux.inc
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-05-18 12:34:40 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 14:14:38 +0100
commitbd85102951517e1dd30e214c7d04516c04609932 (patch)
tree0b815893321aa4967065787a4c51e3c84841f048 /meta/recipes-core/util-linux/util-linux.inc
parentfe715c4d1b376b08dda36ac017c3f392fcc55870 (diff)
downloadpoky-bd85102951517e1dd30e214c7d04516c04609932.tar.gz
util-linux: Update to 2.23
Remove license patch as it is integrated upstream. Add backports of upstream loopdev regression fixes. Updated uclibc-__progname-conflict.patch because it didn't apply. Added bash-completion and partx sub-packages. (From OE-Core rev: 54629315502247c5751c351b5792838f86dd1ea8) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux.inc')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index c783385816..b4e64b5aaf 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -34,7 +34,8 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
34 util-linux-libmount util-linux-libmount-dev \ 34 util-linux-libmount util-linux-libmount-dev \
35 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ 35 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
36 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ 36 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
37 util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd" 37 util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd \
38 util-linux-partx ${PN}-bash-completion"
38 39
39EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ 40EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
40 --disable-makeinstall-chown --enable-elvtune --enable-init \ 41 --disable-makeinstall-chown --enable-elvtune --enable-init \
@@ -52,6 +53,7 @@ EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemds
52 53
53EXTRA_OECONF_append_class-native = " --disable-login --disable-su" 54EXTRA_OECONF_append_class-native = " --disable-login --disable-su"
54 55
56FILES_${PN}-bash-completion += "${datadir}/bash-completion"
55FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" 57FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
56 58
57FILES_util-linux-agetty = "${base_sbindir}/agetty" 59FILES_util-linux-agetty = "${base_sbindir}/agetty"
@@ -67,6 +69,7 @@ FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}"
67FILES_util-linux-uuidgen = "${bindir}/uuidgen" 69FILES_util-linux-uuidgen = "${bindir}/uuidgen"
68FILES_util-linux-uuidd = "${sbindir}/uuidd" 70FILES_util-linux-uuidd = "${sbindir}/uuidd"
69FILES_util-linux-reset = "${base_bindir}/reset" 71FILES_util-linux-reset = "${base_bindir}/reset"
72FILES_util-linux-partx = "${sbindir}/partx"
70 73
71FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" 74FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
72FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" 75FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc"