mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

util-linux: move libraries to base_libdir

Browse Source 
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).

(From OE-Core rev: 91c0f9e35da826055cda6662732c069dc7c31f96)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Garman
2012-01-04 22:30:31 -08:00
committed by Richard Purdie
parent d1536ee2b5
commit f5023f53ea
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/util-linux/util-linux.inc
+11 -9
View File
@@ -17,7 +17,6 @@ inherit autotools gettext pkgconfig
DEPENDS = "zlib ncurses" DEPENDS = "zlib ncurses"
DEPENDS_virtclass-native = " lzo-native" DEPENDS_virtclass-native = " lzo-native"
SRC_URI = "ftp://ftp.infradead.org/pub/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ SRC_URI = "ftp://ftp.infradead.org/pub/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
file://MCONFIG \ file://MCONFIG \
file://swapargs.h \ 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-mount util-linux-readprofile util-linux-libblkid \
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ 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-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 \ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
--enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \ --disable-makeinstall-chown --enable-elvtune --enable-init \
--disable-login-utils --enable-write --enable-arch --enable-mount --with-fsprobe=builtin --enable-libuuid --enable-libblkid --enable-fsck" --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-*.*" 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-readprofile = "${base_sbindir}/readprofile.${PN}"
FILES_util-linux-uuidgen = "${bindir}/uuidgen" FILES_util-linux-uuidgen = "${bindir}/uuidgen"
FILES_util-linux-libblkid = "${libdir}/libblkid.so.*" FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid" FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.a ${base_libdir}/libblkid.la ${includedir}/blkid"
FILES_util-linux-libuuid = "${libdir}/libuuid.so.*" FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*"
FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid" 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-lscpu = "${bindir}/lscpu"
FILES_util-linux-fsck = "${base_sbindir}/fsck*" FILES_util-linux-fsck = "${base_sbindir}/fsck*"
meta/recipes-core/util-linux/util-linux_2.20.1.bb
+1 -1
View File
@@ -1,5 +1,5 @@
MAJOR_VERSION = "2.20" MAJOR_VERSION = "2.20"
PR = "r0" PR = "r1"
require util-linux.inc require util-linux.inc
# note that `lscpu' is under GPLv3+ # note that `lscpu' is under GPLv3+