e2fsprogs: Don't install blkid as its now provided by util-linux

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb
index c3654206f7f5fae1bddbc95353a5e088809db7a4..dd0dcea6bf52e41e065f509044ed4fca6ce1546c 100644 (file)
--- a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb
@@ -5,7 +5,7 @@ DEPENDS = "gettext-native"
 PR = "r2"
 
 do_stage () {
-       oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
+       #oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
        oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
        oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
        oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/
@@ -21,10 +21,10 @@ do_stage () {
        for h in ${ext2fsheaders}; do
                install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
        done
-       install -d ${STAGING_INCDIR}/blkid
-       for h in blkid.h blkid_types.h; do
-               install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
-       done
+       #install -d ${STAGING_INCDIR}/blkid
+       #for h in blkid.h blkid_types.h; do
+       #       install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
+       #done
        install -d ${STAGING_INCDIR}/uuid
         install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
         

diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb
index 77da0d579f24fb1c921dde308cae220e652f91be..b6c014768a5f688a9bc877d80e2a045b6f8c49f0 100644 (file)
--- a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb
@@ -21,7 +21,7 @@ ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \
 e2pheaders = "e2p.h"
 
 do_stage () {
-       oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
+       #oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
        oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
        oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
        oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/
@@ -33,10 +33,10 @@ do_stage () {
        for h in ${ext2fsheaders}; do
                install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
        done
-       install -d ${STAGING_INCDIR}/blkid
-       for h in blkid.h blkid_types.h; do
-               install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
-       done
+       #install -d ${STAGING_INCDIR}/blkid
+       #for h in blkid.h blkid_types.h; do
+       #       install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
+       #done
        install -d ${STAGING_INCDIR}/uuid
         install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"