summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/e2fsprogs
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:35 +0000
commiteaff837048bc4fba0ed64fd612634682fe254d7f (patch)
tree794e3bf699836f5ec92bc7f56fdd45cf73924b0e /meta/recipes-devtools/e2fsprogs
parent7e5256effc6b091e6a4965dc3403b44d663eb2b6 (diff)
downloadopenembedded-core-eaff837048bc4fba0ed64fd612634682fe254d7f.tar.gz
openembedded-core-eaff837048bc4fba0ed64fd612634682fe254d7f.tar.bz2
openembedded-core-eaff837048bc4fba0ed64fd612634682fe254d7f.zip
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) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs')
-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+)*)$"
EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
--enable-elf-shlibs --disable-libuuid --disable-uuidd \
- --enable-libblkid --enable-verbose-makecmds"
+ --disable-libblkid --enable-verbose-makecmds"
EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
@@ -78,10 +78,7 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr"
ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
-ALTERNATIVE_${PN}-doc = "libblkid.3 blkid.8 findfs.8 fsck.8"
-ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3"
-ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8"
-ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8"
+ALTERNATIVE_${PN}-doc = "fsck.8"
ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps bash"