summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-25 16:45:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-29 16:01:40 -0700
commit45a6988021bf862273d4928e9c0fd4972393c8ca (patch)
treedab3a414fbefc397641c5c8c97ff9cf559aec0f6 /meta
parentb74d54b67ad27e8a071b56afc09f369642106f47 (diff)
downloadpoky-45a6988021bf862273d4928e9c0fd4972393c8ca.tar.gz
e2fsprogs: Fully remove/disable blkid
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. (From OE-Core rev: fb8e776ea91c39d586b46400ad30aeea8dead1c4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs.inc1
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb11
2 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 527e701d18..aea74f78e0 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."
4HOMEPAGE = "http://e2fsprogs.sourceforge.net/" 4HOMEPAGE = "http://e2fsprogs.sourceforge.net/"
5 5
6LICENSE = "GPLv2 & LGPLv2 & BSD & MIT" 6LICENSE = "GPLv2 & LGPLv2 & BSD & MIT"
7LICENSE_e2fsprogs-blkid = "LGPLv2"
8LICENSE_e2fsprogs-e2fsck = "GPLv2" 7LICENSE_e2fsprogs-e2fsck = "GPLv2"
9LICENSE_e2fsprogs-mke2fs = "GPLv2" 8LICENSE_e2fsprogs-mke2fs = "GPLv2"
10LICENSE_e2fsprogs-fsck = "GPLv2" 9LICENSE_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 8d4443b542..5e07d6e9a0 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 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI += "file://fallocate.patch \ 5SRC_URI += "file://fallocate.patch \
6 file://acinclude.m4 \ 6 file://acinclude.m4 \
@@ -30,6 +30,7 @@ do_install () {
30 rm -f ${D}${base_libdir}/libblkid* 30 rm -f ${D}${base_libdir}/libblkid*
31 rm -rf ${D}${includedir}/blkid 31 rm -rf ${D}${includedir}/blkid
32 rm -f ${D}${base_libdir}/pkgconfig/blkid.pc 32 rm -f ${D}${base_libdir}/pkgconfig/blkid.pc
33 rm -f ${D}${base_sbindir}/blkid
33} 34}
34 35
35do_install_append () { 36do_install_append () {
@@ -41,15 +42,11 @@ do_install_append () {
41 fi 42 fi
42} 43}
43 44
44# blkid used to be part of e2fsprogs but is useful outside, add it 45RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"
45# as an RDEPENDS_${PN} so that anything relying on it being in e2fsprogs
46# still works
47RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks"
48 46
49PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks" 47PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
50PACKAGES =+ "libcomerr libss libe2p libext2fs" 48PACKAGES =+ "libcomerr libss libe2p libext2fs"
51 49
52FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
53FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" 50FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
54FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" 51FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
55FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" 52FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"