mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
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
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
require e2fsprogs.inc
|
require e2fsprogs.inc
|
||||||
|
|
||||||
PR = "r8"
|
PR = "r9"
|
||||||
|
|
||||||
S = "${WORKDIR}/e2fsprogs-${PV}"
|
S = "${WORKDIR}/e2fsprogs-${PV}"
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@ SRC_URI += "file://no-hardlinks.patch;patch=1"
|
|||||||
|
|
||||||
PARALLEL_MAKE = ""
|
PARALLEL_MAKE = ""
|
||||||
|
|
||||||
EXTRA_OECONF += " --sbindir=${base_sbindir}"
|
EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs"
|
||||||
|
|
||||||
do_compile_prepend () {
|
do_compile_prepend () {
|
||||||
find ./ -print|xargs chmod u=rwX
|
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 libblkid ${STAGING_LIBDIR}/
|
||||||
oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
|
oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
|
||||||
oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
|
oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
|
||||||
|
oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/
|
||||||
install -d ${STAGING_INCDIR}/e2p
|
install -d ${STAGING_INCDIR}/e2p
|
||||||
for h in ${e2pheaders}; do
|
for h in ${e2pheaders}; do
|
||||||
install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
|
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
|
for h in blkid.h blkid_types.h; do
|
||||||
install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
|
install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
|
||||||
done
|
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
|
# blkid used to be part of e2fsprogs but is useful outside, add it
|
||||||
@@ -43,7 +51,7 @@ do_stage () {
|
|||||||
# still works
|
# still works
|
||||||
RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
|
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-blkid = "${base_sbindir}/blkid"
|
||||||
FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
|
FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
|
||||||
FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
|
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-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
|
||||||
FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
|
FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
|
||||||
FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
|
FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
|
||||||
|
FILES_libuuid = "${libdir}/libuuid.so.*"
|
||||||
|
|||||||
Reference in New Issue
Block a user