mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

util-linux: Ensure that ${sbindir} is respected

Browse Source 
The configure script uses a hard-coded value for ${usrsbin_execdir},
which is the path that we know as ${sbindir}.  Adjust configure to take
this from the environment if it's set there, and have do_configure()
pass it in.

(From OE-Core rev: 6fdca45ec85e226f570917d2d1aaa2aa39ab6b42)

Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Phil Blundell
2012-09-24 07:24:51 +01:00
committed by Richard Purdie
parent 22a4046ab3
commit d3e03abeba
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-core/util-linux/util-linux.inc
View File

@@ -38,7 +38,9 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
--enable-kill --enable-last --enable-mesg --enable-partx \ --enable-kill --enable-last --enable-mesg --enable-partx \
--enable-raw --enable-rdev --enable-reset --disable-login-utils \ --enable-raw --enable-rdev --enable-reset --disable-login-utils \
--enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \
--enable-libuuid --enable-libblkid --enable-fsck --without-udev" --enable-libuuid --enable-libblkid --enable-fsck --without-udev \
usrsbin_execdir='${sbindir}' \
"
FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"

18
meta/recipes-core/util-linux/util-linux/configure-sbindir.patch Normal file
View File

@@ -0,0 +1,18 @@
util-linux: take ${sbindir} from the environment if it is set there
Signed-off-by: Phil Blundell <pb@pbcl.net>
Upstream-Status: Inappropriate [configuration]
--- util-linux-2.21.2/configure.ac~ 2012-09-22 09:29:12.354215377 +0100
+++ util-linux-2.21.2/configure.ac 2012-09-22 16:47:14.713628946 +0100
@@ -67,7 +67,9 @@
usrbin_execdir='${exec_prefix}/bin'
AC_SUBST([usrbin_execdir])
-usrsbin_execdir='${exec_prefix}/sbin'
+if [ -z "$usrsbin_execdir" ]; then
+ usrsbin_execdir='${exec_prefix}/sbin'
+fi
AC_SUBST([usrsbin_execdir])
usrlib_execdir='${exec_prefix}/'$libdirname

3
meta/recipes-core/util-linux/util-linux_2.21.2.bb
View File

@@ -1,5 +1,5 @@
MAJOR_VERSION = "2.21" MAJOR_VERSION = "2.21"
PR = "r2" PR = "r3"
require util-linux.inc require util-linux.inc
# note that `lscpu' is under GPLv3+ # note that `lscpu' is under GPLv3+
@@ -8,6 +8,7 @@ LICENSE_${PN}-lscpu = "GPLv3+"
SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
file://util-linux-ng-2.16-mount_lock_path.patch \ file://util-linux-ng-2.16-mount_lock_path.patch \
file://uclibc-__progname-conflict.patch \ file://uclibc-__progname-conflict.patch \
file://configure-sbindir.patch \
" "
SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3" SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3"