summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-09-24 07:24:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-24 11:30:31 +0100
commitd3e03abebaa4ce4b20f61143375b207d25a7e1ef (patch)
tree155373c03624ddea6fba1b939e8c497f148d81bc /meta/recipes-core
parent22a4046ab36498f7c7ea3f7518acd2c89f8163c3 (diff)
downloadpoky-d3e03abebaa4ce4b20f61143375b207d25a7e1ef.tar.gz
util-linux: Ensure that ${sbindir} is respected
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc4
-rw-r--r--meta/recipes-core/util-linux/util-linux/configure-sbindir.patch18
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.21.2.bb3
3 files changed, 23 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 79e0608d36..2c5267f086 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -38,7 +38,9 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
38 --enable-kill --enable-last --enable-mesg --enable-partx \ 38 --enable-kill --enable-last --enable-mesg --enable-partx \
39 --enable-raw --enable-rdev --enable-reset --disable-login-utils \ 39 --enable-raw --enable-rdev --enable-reset --disable-login-utils \
40 --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ 40 --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \
41 --enable-libuuid --enable-libblkid --enable-fsck --without-udev" 41 --enable-libuuid --enable-libblkid --enable-fsck --without-udev \
42 usrsbin_execdir='${sbindir}' \
43"
42 44
43FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" 45FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
44 46
diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
new file mode 100644
index 0000000000..f1f5ef4e4f
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
@@ -0,0 +1,18 @@
1util-linux: take ${sbindir} from the environment if it is set there
2
3Signed-off-by: Phil Blundell <pb@pbcl.net>
4Upstream-Status: Inappropriate [configuration]
5
6--- util-linux-2.21.2/configure.ac~ 2012-09-22 09:29:12.354215377 +0100
7+++ util-linux-2.21.2/configure.ac 2012-09-22 16:47:14.713628946 +0100
8@@ -67,7 +67,9 @@
9 usrbin_execdir='${exec_prefix}/bin'
10 AC_SUBST([usrbin_execdir])
11
12-usrsbin_execdir='${exec_prefix}/sbin'
13+if [ -z "$usrsbin_execdir" ]; then
14+ usrsbin_execdir='${exec_prefix}/sbin'
15+fi
16 AC_SUBST([usrsbin_execdir])
17
18 usrlib_execdir='${exec_prefix}/'$libdirname
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
index 6ef31633dc..e8f00fcb5e 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.21" 1MAJOR_VERSION = "2.21"
2PR = "r2" 2PR = "r3"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+
@@ -8,6 +8,7 @@ LICENSE_${PN}-lscpu = "GPLv3+"
8SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ 8SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
9 file://util-linux-ng-2.16-mount_lock_path.patch \ 9 file://util-linux-ng-2.16-mount_lock_path.patch \
10 file://uclibc-__progname-conflict.patch \ 10 file://uclibc-__progname-conflict.patch \
11 file://configure-sbindir.patch \
11" 12"
12 13
13SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3" 14SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3"