summaryrefslogtreecommitdiffstats
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)
downloadpoky-ddc0eecb085684dbaeb9015f3018ae009d2dc9c0.tar.gz
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 c3654206f7..dd0dcea6bf 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"
5PR = "r2" 5PR = "r2"
6 6
7do_stage () { 7do_stage () {
8 oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/ 8 #oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
9 oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ 9 oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
10 oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ 10 oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
11 oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/ 11 oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/
@@ -21,10 +21,10 @@ do_stage () {
21 for h in ${ext2fsheaders}; do 21 for h in ${ext2fsheaders}; do
22 install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" 22 install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
23 done 23 done
24 install -d ${STAGING_INCDIR}/blkid 24 #install -d ${STAGING_INCDIR}/blkid
25 for h in blkid.h blkid_types.h; do 25 #for h in blkid.h blkid_types.h; do
26 install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h" 26 # install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
27 done 27 #done
28 install -d ${STAGING_INCDIR}/uuid 28 install -d ${STAGING_INCDIR}/uuid
29 install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h" 29 install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
30 30
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb
index 77da0d579f..b6c014768a 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 \
21e2pheaders = "e2p.h" 21e2pheaders = "e2p.h"
22 22
23do_stage () { 23do_stage () {
24 oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/ 24 #oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
25 oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ 25 oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
26 oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ 26 oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
27 oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/ 27 oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/
@@ -33,10 +33,10 @@ do_stage () {
33 for h in ${ext2fsheaders}; do 33 for h in ${ext2fsheaders}; do
34 install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" 34 install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
35 done 35 done
36 install -d ${STAGING_INCDIR}/blkid 36 #install -d ${STAGING_INCDIR}/blkid
37 for h in blkid.h blkid_types.h; do 37 #for h in blkid.h blkid_types.h; do
38 install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h" 38 # install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
39 done 39 #done
40 install -d ${STAGING_INCDIR}/uuid 40 install -d ${STAGING_INCDIR}/uuid
41 install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h" 41 install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
42 42