mirror of
https://git.yoctoproject.org/poky
synced 2026-08-04 13:17:45 +02:00
67db5f4f55
License-Update: =============== GPL-2.0 is changed to GPL-2.0-only in README.licensing. The following two patches are removed as they've been there in new release: 0001-login-utils-include-libgen.h-for-basename-API.patch mit-license.patch Other existing patches are refreshed to avoid patch-fuzz error. A new PACKAGECONFIG, lastlog2, is added, which serves as a switch to build Y2038 safe lastlog pam module. This is a new functionality added in 2.40. This 2.40.1 version has the problem of unnecessary remake, causing intermmittent errors at parallel make. The do_compile:prepend is a workaround for this. Upstream issue and PR are: https://github.com/util-linux/util-linux/issues/3061 https://github.com/util-linux/util-linux/pull/3064 do_install is changed to do_install:append, the legacy codes are removed. They've been there since the born of oe-core. I tested with ccache, there's no error. A new dependency, diffutils, is added to ptest. Because the mkswap-offset test case needs 'cmp' from diffutils. The tests/ts/misc/enosys test case is deleted for musl. This is because the test case is comparing error description output and that's libc specific. Results below can demonstrate the case. ''' root@qemux86-64:/usr/lib/util-linux/ptest# cat /usr/lib/util-linux/ptest/tests/expected/misc/enosys-ioctl test_enosys: ioctl r=0 errno=Success test_enosys: ioctl r=-1 errno=Function not implemented test_enosys: ioctl r=-1 errno=Inappropriate ioctl for device test_enosys: ioctl r=-1 errno=Inappropriate ioctl for device test_enosys: ioctl r=-1 errno=Function not implemented root@qemux86-64:/usr/lib/util-linux/ptest# cat /usr/lib/util-linux/ptest/tests/output/misc/enosys-ioctl test_enosys: ioctl r=0 errno=No error information test_enosys: ioctl r=-1 errno=Function not implemented test_enosys: ioctl r=-1 errno=Not a tty test_enosys: ioctl r=-1 errno=Not a tty test_enosys: ioctl r=-1 errno=Function not implemented ''' (From OE-Core rev: 2c5f70e7e73362502a7d8d0773fbd04520b26eef) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
32 lines
946 B
Diff
32 lines
946 B
Diff
From 0387d71516c978899cfd556ca512f530a212b4a9 Mon Sep 17 00:00:00 2001
|
|
From: Phil Blundell <pb@pbcl.net>
|
|
Date: Mon, 24 Sep 2012 07:24:51 +0100
|
|
Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected
|
|
|
|
util-linux: take ${sbindir} from the environment if it is set there
|
|
fix the test, the [ ] syntax was getting eaten by autoconf
|
|
|
|
Signed-off-by: Phil Blundell <pb@pbcl.net>
|
|
Signed-off-by: Saul Wold <sgw@linux.intel.com
|
|
Upstream-Status: Inappropriate [configuration]
|
|
---
|
|
configure.ac | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 23594ff..651ef2b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -110,7 +110,10 @@ AC_SUBST([runstatedir])
|
|
usrbin_execdir='${exec_prefix}/bin'
|
|
AC_SUBST([usrbin_execdir])
|
|
|
|
-usrsbin_execdir='${exec_prefix}/sbin'
|
|
+if test -z "$usrsbin_execdir" ;
|
|
+then
|
|
+ usrsbin_execdir='${exec_prefix}/sbin'
|
|
+fi
|
|
AC_SUBST([usrsbin_execdir])
|
|
|
|
AS_CASE([$libdir],
|