summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorJeff Dike <jdike@linux.intel.com>2010-06-03 15:27:30 -0400
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-07 16:04:00 +0100
commit807e983632088ee8cb8eb51b432aef3cab7dbbd7 (patch)
tree2584de398954888d58d4b28b4a987cff602e91b2 /meta/packages
parent42e7e4f3e2e2f2783d4960a352e93f67e8ef4e9f (diff)
downloadpoky-807e983632088ee8cb8eb51b432aef3cab7dbbd7.tar.gz
e2fsprogs: Remove all mention of anything associated with uuids
--disable-libuuid is added to the configure command line. This has the effect of disabling the compilation of uuidgen and libuuid.so. These two are specified as making up their own packages, which turn out to be empty, and thus aren't created in the first place. The error which manifests itself is at the final creation of the rootfs when the global package depends on the e2fsprogs-uuidgen and libuuid, which turn out not to exist, because they weren't created. Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
index 5360243f16..15c80478f5 100644
--- a/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -1,6 +1,6 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r18" 3PR = "r19"
4 4
5SRC_URI += "file://quotefix.patch;patch=1 \ 5SRC_URI += "file://quotefix.patch;patch=1 \
6 file://acinclude.m4" 6 file://acinclude.m4"
@@ -33,16 +33,14 @@ do_install () {
33# blkid used to be part of e2fsprogs but is useful outside, add it 33# blkid used to be part of e2fsprogs but is useful outside, add it
34# as an RDEPENDS so that anything relying on it being in e2fsprogs 34# as an RDEPENDS so that anything relying on it being in e2fsprogs
35# still works 35# still works
36RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks" 36RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks"
37 37
38PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks libuuid" 38PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
39FILES_e2fsprogs-blkid = "${base_sbindir}/blkid" 39FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
40FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
41FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" 40FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
42FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" 41FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
43FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*" 42FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
44FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" 43FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
45FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" 44FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
46FILES_libuuid = "${libdir}/libuuid.so.*"
47 45
48BBCLASSEXTEND = "native" 46BBCLASSEXTEND = "native"