summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
require e2fsprogs.inc
-PR = "r8"
+PR = "r9"
S = "${WORKDIR}/e2fsprogs-${PV}"
@@ -8,7 +8,7 @@ SRC_URI += "file://no-hardlinks.patch;patch=1"
PARALLEL_MAKE = ""
-EXTRA_OECONF += " --sbindir=${base_sbindir}"
+EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs"
do_compile_prepend () {
find ./ -print|xargs chmod u=rwX
@@ -24,6 +24,7 @@ do_stage () {
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}/
install -d ${STAGING_INCDIR}/e2p
for h in ${e2pheaders}; do
install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
@@ -36,6 +37,13 @@ do_stage () {
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"
+
+ install -d ${STAGING_LIBDIR}/pkgconfig
+ for pc in lib/*/*.pc; do
+ install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h"
+ done
}
# blkid used to be part of e2fsprogs but is useful outside, add it
@@ -43,7 +51,7 @@ do_stage () {
# still works
RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
-PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
+PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks libuuid"
FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
@@ -51,3 +59,4 @@ FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
+FILES_libuuid = "${libdir}/libuuid.so.*"