Patchwork util-linux 2.19.1: split blkid out into its own subpackage

login
register
mail settings
Submitter Koen Kooi
Date Oct. 10, 2011, 10:10 a.m.
Message ID <1318241454-10545-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/12969/
State New, archived
Headers show

Comments

Koen Kooi - Oct. 10, 2011, 10:10 a.m.
Recent udev versions require blkid from u-l, not from e2fsprogs. In general all the non fsck related binaries from e2fsprogs are deprecated.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-core/util-linux/util-linux.inc       |   15 ++++++++++++++-
 meta/recipes-core/util-linux/util-linux_2.19.1.bb |    2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)
Philip Balister - Oct. 10, 2011, 9:01 p.m.
On 10/10/2011 06:10 AM, Koen Kooi wrote:
> Recent udev versions require blkid from u-l, not from e2fsprogs. In general all the non fsck related binaries from e2fsprogs are deprecated.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

Acked-by: Philip Balister < philip@balister.org>

> ---
>  meta/recipes-core/util-linux/util-linux.inc       |   15 ++++++++++++++-
>  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 8762ac6..67d81b9 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
>               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"
> 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 39ff68c..04f4457 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 @@
>  MAJOR_VERSION = "2.19"
> -PR = "r7"
> +PR = "r8"
>  require util-linux.inc
>  
>  # note that `lscpu' is under GPLv3+

Patch

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 8762ac6..67d81b9 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
              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"
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 39ff68c..04f4457 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 @@ 
 MAJOR_VERSION = "2.19"
-PR = "r7"
+PR = "r8"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+