summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-01-04 22:30:32 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-05 11:24:46 +0000
commit67b66d5a29015d02fc428d32f4c3c496e3fd0e2b (patch)
treeed8dda662d4cbe641a11d86b3bb9d7f8bfe638fa /meta/recipes-devtools
parentf5023f53ea3ca29ac71d0441365cc3ad8afbe641 (diff)
downloadpoky-67b66d5a29015d02fc428d32f4c3c496e3fd0e2b.tar.gz
e2fsprogs: move libraries to base_libdir
The e2fsprogs utilities are installed into base_sbindir (/sbin) and should not link to libraries under exec_prefix (/usr). So move these libraries from libdir (/usr/lib) to base_libdir (/lib). (From OE-Core rev: 90a1590f324a05f6b35b62856335aca7ba1f66c0) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb29
1 files changed, 18 insertions, 11 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
index a26d89a5b4..a956247a18 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
@@ -1,6 +1,6 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r3" 3PR = "r4"
4 4
5SRC_URI += "file://quotefix.patch \ 5SRC_URI += "file://quotefix.patch \
6 file://acinclude.m4" 6 file://acinclude.m4"
@@ -11,9 +11,9 @@ SRC_URI[sha256sum] = "3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aa
11 11
12PARALLEL_MAKE = "" 12PARALLEL_MAKE = ""
13 13
14EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd" 14EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd"
15EXTRA_OECONF_darwin = "--sbindir=${base_sbindir} --enable-bsd-shlibs" 15EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
16EXTRA_OECONF_darwin8 = "--sbindir=${base_sbindir} --enable-bsd-shlibs" 16EXTRA_OECONF_darwin8 = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
17 17
18do_configure_prepend () { 18do_configure_prepend () {
19 cp ${WORKDIR}/acinclude.m4 ${S}/ 19 cp ${WORKDIR}/acinclude.m4 ${S}/
@@ -28,9 +28,16 @@ do_install () {
28 oe_runmake 'DESTDIR=${D}' install 28 oe_runmake 'DESTDIR=${D}' install
29 oe_runmake 'DESTDIR=${D}' install-libs 29 oe_runmake 'DESTDIR=${D}' install-libs
30 # We use blkid from util-linux now so remove from here 30 # We use blkid from util-linux now so remove from here
31 rm -f ${D}${libdir}/libblkid* 31 rm -f ${D}${base_libdir}/libblkid*
32 rm -rf ${D}${includedir}/blkid 32 rm -rf ${D}${includedir}/blkid
33 rm -f ${D}${libdir}/pkgconfig/blkid.pc 33 rm -f ${D}${base_libdir}/pkgconfig/blkid.pc
34}
35
36do_install_append () {
37 # e2initrd_helper and the pkgconfig files belong in libdir
38 install -d ${D}${libdir}
39 mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
40 mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
34} 41}
35 42
36# blkid used to be part of e2fsprogs but is useful outside, add it 43# blkid used to be part of e2fsprogs but is useful outside, add it
@@ -47,10 +54,10 @@ FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
47FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" 54FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"
48FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" 55FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
49FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" 56FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
50FILES_libcomerr = "${libdir}/libcom_err.so.*" 57FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
51FILES_libss = "${libdir}/libss.so.*" 58FILES_libss = "${base_libdir}/libss.so.*"
52FILES_libe2p = "${libdir}/libe2p.so.*" 59FILES_libe2p = "${base_libdir}/libe2p.so.*"
53FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*" 60FILES_libext2fs = "${base_libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
54FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed" 61FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so"
55 62
56BBCLASSEXTEND = "native" 63BBCLASSEXTEND = "native"