aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-01-04 22:30:31 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-05 11:17:53 +0000
commit91c0f9e35da826055cda6662732c069dc7c31f96 (patch)
tree37734df67ff4353f1f57acc394d21152da4e797d /meta/recipes-core/util-linux
parent3a52df9c057b25c25fc2013ac6c5bf602cc8b4a7 (diff)
downloadopenembedded-core-contrib-91c0f9e35da826055cda6662732c069dc7c31f96.tar.gz
openembedded-core-contrib-91c0f9e35da826055cda6662732c069dc7c31f96.tar.bz2
openembedded-core-contrib-91c0f9e35da826055cda6662732c069dc7c31f96.zip
util-linux: move libraries to base_libdir
Various util-linux programs in base_sbindir (/sbin) linked to libraries located under exec_prefix (/usr). Since this is not safe, move these libraries from libdir (/usr/lib) to base_libdir (/lib). Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc20
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.20.1.bb2
2 files changed, 12 insertions, 10 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 5445f4f7cd2..6e568a42a15 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -17,7 +17,6 @@ inherit autotools gettext pkgconfig
DEPENDS = "zlib ncurses"
DEPENDS_virtclass-native = " lzo-native"
-
SRC_URI = "ftp://ftp.infradead.org/pub/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
file://MCONFIG \
file://swapargs.h \
@@ -30,11 +29,14 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
util-linux-mount util-linux-readprofile util-linux-libblkid \
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
- util-linux-chkdupexe util-linux-mkfs util-linux-mcookie"
+ util-linux-chkdupexe util-linux-mkfs util-linux-mcookie"
-EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
- --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
- --disable-login-utils --enable-write --enable-arch --enable-mount --with-fsprobe=builtin --enable-libuuid --enable-libblkid --enable-fsck"
+EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
+ --disable-makeinstall-chown --enable-elvtune --enable-init \
+ --enable-kill --enable-last --enable-mesg --enable-partx \
+ --enable-raw --enable-rdev --enable-reset --disable-login-utils \
+ --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \
+ --enable-libuuid --enable-libblkid --enable-fsck"
FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
@@ -50,10 +52,10 @@ FILES_util-linux-umount = "${base_bindir}/umount.${PN}"
FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${PN}"
FILES_util-linux-uuidgen = "${bindir}/uuidgen"
-FILES_util-linux-libblkid = "${libdir}/libblkid.so.*"
-FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid"
-FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
-FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid"
+FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
+FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.a ${base_libdir}/libblkid.la ${includedir}/blkid"
+FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*"
+FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid.a ${base_libdir}/libuuid.la ${includedir}/uuid"
FILES_util-linux-lscpu = "${bindir}/lscpu"
FILES_util-linux-fsck = "${base_sbindir}/fsck*"
diff --git a/meta/recipes-core/util-linux/util-linux_2.20.1.bb b/meta/recipes-core/util-linux/util-linux_2.20.1.bb
index a569131eabc..aa2c6ff1e0d 100644
--- a/meta/recipes-core/util-linux/util-linux_2.20.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.20.1.bb
@@ -1,5 +1,5 @@
MAJOR_VERSION = "2.20"
-PR = "r0"
+PR = "r1"
require util-linux.inc
# note that `lscpu' is under GPLv3+