Patchwork e2fsprogs: Fully remove/disable blkid

login
register
mail settings
Submitter Richard Purdie
Date Aug. 25, 2012, 3:45 p.m.
Message ID <1345909533.14369.109.camel@ted>
Download mbox | patch
Permalink /patch/35341/
State Accepted
Commit fb8e776ea91c39d586b46400ad30aeea8dead1c4
Headers show

Comments

Richard Purdie - Aug. 25, 2012, 3:45 p.m.
We've removed libblkid from e2fsprogs as it was being provided by util-linux. The blkid
binary is also provided there and providing it within e2fsprogs too, linked against
a different and potentially incompatible library we're likely asking for trouble.

It also leads to inconsistencies in the native sysroot since we don't consistently
get one given provider of blkid (but always the liblibid from util-linux).

To clean this up, fully remove/disable the blkid binary and package.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 527e701..aea74f7 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -4,7 +4,6 @@  fixing, configuring , and debugging ext2 filesystems."
 HOMEPAGE = "http://e2fsprogs.sourceforge.net/"
 
 LICENSE = "GPLv2 & LGPLv2 & BSD & MIT"
-LICENSE_e2fsprogs-blkid = "LGPLv2"
 LICENSE_e2fsprogs-e2fsck = "GPLv2"
 LICENSE_e2fsprogs-mke2fs = "GPLv2"
 LICENSE_e2fsprogs-fsck = "GPLv2"
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
index 8d4443b..5e07d6e 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
@@ -1,6 +1,6 @@ 
 require e2fsprogs.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://fallocate.patch \
             file://acinclude.m4 \
@@ -30,6 +30,7 @@  do_install () {
 	rm -f ${D}${base_libdir}/libblkid*
 	rm -rf ${D}${includedir}/blkid
 	rm -f ${D}${base_libdir}/pkgconfig/blkid.pc
+	rm -f ${D}${base_sbindir}/blkid
 }
 
 do_install_append () {
@@ -41,15 +42,11 @@  do_install_append () {
 	fi
 }
 
-# blkid used to be part of e2fsprogs but is useful outside, add it
-# as an RDEPENDS_${PN} so that anything relying on it being in e2fsprogs
-# still works
-RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks"
+RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"
 
-PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
+PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
 PACKAGES =+ "libcomerr libss libe2p libext2fs"
 
-FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
 FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
 FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
 FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"