mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 03:32:12 +02:00
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) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
c419e8a435
commit
3590061599
@@ -29,7 +29,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
|
||||
util-linux-swaponoff util-linux-losetup util-linux-umount \
|
||||
util-linux-mount util-linux-readprofile util-linux-libblkid \
|
||||
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
|
||||
util-linux-uuidgen util-linux-lscpu util-linux-fsck"
|
||||
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid"
|
||||
|
||||
EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
|
||||
--enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
|
||||
@@ -56,6 +56,11 @@ FILES_util-linux-lscpu = "${bindir}/lscpu"
|
||||
|
||||
FILES_util-linux-fsck = "${base_sbindir}/fsck*"
|
||||
|
||||
# Util-linux' blkid replaces the e2fsprogs one
|
||||
FILES_util-linux-blkid = "${base_sbindir}/blkid*"
|
||||
RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
|
||||
RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
|
||||
|
||||
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
|
||||
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup perl"
|
||||
|
||||
@@ -262,4 +267,12 @@ pkg_prerm_util-linux-fsck () {
|
||||
update-alternatives --remove fsck fsck.${PN}
|
||||
}
|
||||
|
||||
pkg_postinst_util-linux-blkid () {
|
||||
update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100
|
||||
}
|
||||
|
||||
pkg_prerm_util-linux-blkid () {
|
||||
update-alternatives --remove blkid blkid.${PN}
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
MAJOR_VERSION = "2.19"
|
||||
PR = "r7"
|
||||
PR = "r8"
|
||||
require util-linux.inc
|
||||
|
||||
# note that `lscpu' is under GPLv3+
|
||||
|
||||
Reference in New Issue
Block a user