summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-05-22 09:43:44 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-05-22 09:43:44 +0100
commitddc0eecb085684dbaeb9015f3018ae009d2dc9c0 (patch)
tree8c9fa8383a66187154380c3f004d82fb07b295a9
parente6a3149428ef2d42d9a9df78a19c2e52496f3deb (diff)
downloadopenembedded-core-ddc0eecb085684dbaeb9015f3018ae009d2dc9c0.tar.gz
openembedded-core-ddc0eecb085684dbaeb9015f3018ae009d2dc9c0.tar.bz2
openembedded-core-ddc0eecb085684dbaeb9015f3018ae009d2dc9c0.tar.xz
openembedded-core-ddc0eecb085684dbaeb9015f3018ae009d2dc9c0.zip
e2fsprogs: Don't install blkid as its now provided by util-linux
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb10
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb10
2 files changed, 10 insertions, 10 deletions
diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb
index c3654206f..dd0dcea6b 100644
--- 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 77da0d579..b6c014768 100644
--- 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"