summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-10-08 15:07:14 +0000
committerRoss Burton <ross@openedhand.com>2008-10-08 15:07:14 +0000
commiteb599a92d5f6a9d83a6a0a30def6cfaeea9cdfdc (patch)
treee37588e4ea4f4168571332270e507990a2e41d42 /meta
parent4d3d6fbb416cbe0b0b7d8153d22d7f2c898de25c (diff)
downloadpoky-eb599a92d5f6a9d83a6a0a30def6cfaeea9cdfdc.tar.gz
e2fsprogs: enable dynamic libs, and package libuuid separately
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5459 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb15
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
index 5e9c170c4d..df9c030a51 100644
--- a/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
@@ -1,6 +1,6 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r8" 3PR = "r9"
4 4
5S = "${WORKDIR}/e2fsprogs-${PV}" 5S = "${WORKDIR}/e2fsprogs-${PV}"
6 6
@@ -8,7 +8,7 @@ SRC_URI += "file://no-hardlinks.patch;patch=1"
8 8
9PARALLEL_MAKE = "" 9PARALLEL_MAKE = ""
10 10
11EXTRA_OECONF += " --sbindir=${base_sbindir}" 11EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs"
12 12
13do_compile_prepend () { 13do_compile_prepend () {
14 find ./ -print|xargs chmod u=rwX 14 find ./ -print|xargs chmod u=rwX
@@ -24,6 +24,7 @@ do_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 install -d ${STAGING_INCDIR}/e2p 28 install -d ${STAGING_INCDIR}/e2p
28 for h in ${e2pheaders}; do 29 for h in ${e2pheaders}; do
29 install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" 30 install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
@@ -36,6 +37,13 @@ do_stage () {
36 for h in blkid.h blkid_types.h; do 37 for h in blkid.h blkid_types.h; do
37 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"
38 done 39 done
40 install -d ${STAGING_INCDIR}/uuid
41 install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
42
43 install -d ${STAGING_LIBDIR}/pkgconfig
44 for pc in lib/*/*.pc; do
45 install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h"
46 done
39} 47}
40 48
41# blkid used to be part of e2fsprogs but is useful outside, add it 49# blkid used to be part of e2fsprogs but is useful outside, add it
@@ -43,7 +51,7 @@ do_stage () {
43# still works 51# still works
44RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks" 52RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
45 53
46PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks" 54PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks libuuid"
47FILES_e2fsprogs-blkid = "${base_sbindir}/blkid" 55FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
48FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen" 56FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
49FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" 57FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
@@ -51,3 +59,4 @@ FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
51FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*" 59FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
52FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" 60FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
53FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" 61FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
62FILES_libuuid = "${libdir}/libuuid.so.*"