summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-01-25 22:58:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-26 18:05:40 +0000
commit1c4a8cc87f0eb67170d0131da9249e293c3c1d4f (patch)
treef562a66760d9ef8db0be1ec23af8aef7e30dcdeb /meta
parent0de87662c1654220cf2e29ff1c092d9cc21bc9d7 (diff)
downloadpoky-1c4a8cc87f0eb67170d0131da9249e293c3c1d4f.tar.gz
e2fsprogs: disable blkid
Both e2fsprogs and util-linux can build blkid, but we want to always use util-linux's for consistency. (blkid was enabled again in a1f235) (From OE-Core rev: eaff837048bc4fba0ed64fd612634682fe254d7f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
index 912bbf7fc8..48af43b117 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb
@@ -14,7 +14,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
14 14
15EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ 15EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
16 --enable-elf-shlibs --disable-libuuid --disable-uuidd \ 16 --enable-elf-shlibs --disable-libuuid --disable-uuidd \
17 --enable-libblkid --enable-verbose-makecmds" 17 --disable-libblkid --enable-verbose-makecmds"
18 18
19EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" 19EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
20 20
@@ -78,10 +78,7 @@ ALTERNATIVE_PRIORITY = "100"
78ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" 78ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr"
79ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" 79ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
80 80
81ALTERNATIVE_${PN}-doc = "libblkid.3 blkid.8 findfs.8 fsck.8" 81ALTERNATIVE_${PN}-doc = "fsck.8"
82ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3"
83ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8"
84ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8"
85ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" 82ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
86 83
87RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps bash" 84RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps bash"