diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-10-10 12:10:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:43:38 +0000 |
commit | 1d9ec42166002a369492b61b34d046cbba9fa0ba (patch) | |
tree | 72573d1f119319c44a75f5929f077d5c296d9d7b | |
parent | 57481984c9b5eb2dd0b53621d58ff7cfea6cf17b (diff) | |
download | poky-1d9ec42166002a369492b61b34d046cbba9fa0ba.tar.gz |
util-linux 2.19.1: split blkid out into its own subpackage
Recent udev versions require blkid from u-l, not from e2fsprogs. In general all the non fsck related binaries from e2fsprogs are deprecated.
(From OE-Core rev: eb048308ae80d779e904951b032dba5b780898e5)
(From OE-Core rev: d9afc91bd5bce889dfbcba13b6b59ea07f288cc7)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 15 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 8762ac628e..67d81b9df7 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -29,7 +29,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
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-libblkid \ |
31 | util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ | 31 | util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ |
32 | util-linux-uuidgen util-linux-lscpu util-linux-fsck" | 32 | util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid" |
33 | 33 | ||
34 | EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \ | 34 | EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \ |
35 | --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \ | 35 | --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \ |
@@ -56,6 +56,11 @@ FILES_util-linux-lscpu = "${bindir}/lscpu" | |||
56 | 56 | ||
57 | FILES_util-linux-fsck = "${base_sbindir}/fsck*" | 57 | FILES_util-linux-fsck = "${base_sbindir}/fsck*" |
58 | 58 | ||
59 | # Util-linux' blkid replaces the e2fsprogs one | ||
60 | FILES_util-linux-blkid = "${base_sbindir}/blkid*" | ||
61 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" | ||
62 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" | ||
63 | |||
59 | RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " | 64 | RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " |
60 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup perl" | 65 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup perl" |
61 | 66 | ||
@@ -262,4 +267,12 @@ pkg_prerm_util-linux-fsck () { | |||
262 | update-alternatives --remove fsck fsck.${PN} | 267 | update-alternatives --remove fsck fsck.${PN} |
263 | } | 268 | } |
264 | 269 | ||
270 | pkg_postinst_util-linux-blkid () { | ||
271 | update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100 | ||
272 | } | ||
273 | |||
274 | pkg_prerm_util-linux-blkid () { | ||
275 | update-alternatives --remove blkid blkid.${PN} | ||
276 | } | ||
277 | |||
265 | BBCLASSEXTEND = "native" | 278 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb index 39ff68c8d2..04f4457c5a 100644 --- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | MAJOR_VERSION = "2.19" | 1 | MAJOR_VERSION = "2.19" |
2 | PR = "r7" | 2 | PR = "r8" |
3 | require util-linux.inc | 3 | require util-linux.inc |
4 | 4 | ||
5 | # note that `lscpu' is under GPLv3+ | 5 | # note that `lscpu' is under GPLv3+ |