diff options
| author | Phil Blundell <philb@gnu.org> | 2012-09-24 07:24:51 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-24 11:11:53 +0100 |
| commit | 6fdca45ec85e226f570917d2d1aaa2aa39ab6b42 (patch) | |
| tree | e7ca08cde3ea9b181df9eb19cf9912eb17b6b836 /meta/recipes-core | |
| parent | e7b82cb4d107bfbfa5c939d406dd6ce6615b24e1 (diff) | |
| download | openembedded-core-6fdca45ec85e226f570917d2d1aaa2aa39ab6b42.tar.gz openembedded-core-6fdca45ec85e226f570917d2d1aaa2aa39ab6b42.tar.bz2 openembedded-core-6fdca45ec85e226f570917d2d1aaa2aa39ab6b42.zip | |
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.
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.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux/configure-sbindir.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.21.2.bb | 3 |
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 \ --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 --without-udev" + --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ + usrsbin_execdir='${sbindir}' \ +" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" 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 @@ +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 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 @@ MAJOR_VERSION = "2.21" -PR = "r2" +PR = "r3" require util-linux.inc # note that `lscpu' is under GPLv3+ @@ -8,6 +8,7 @@ LICENSE_${PN}-lscpu = "GPLv3+" SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ file://util-linux-ng-2.16-mount_lock_path.patch \ file://uclibc-__progname-conflict.patch \ + file://configure-sbindir.patch \ " SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3" |