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

util-linux: Update to 2.22.1

Browse Source 
Fix the configure-sbindir test, which was not working correctly
add a patch to configure to correctly test if the prefixes are
conatined in libdir so they don't duplicate.

Removed aarch64 patch since it been merged into this version

Rebased util-linux-ng-replace-siginterrupt.patch

(From OE-Core rev: ac807121ce3ba965f3e2a4f664a60ae4e33ce550)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
2012-11-16 19:51:34 +00:00
committed by Richard Purdie
parent cc242175cd
commit 3d392f5da9
7 changed files with 62 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch
View File

@@ -1,18 +0,0 @@
---
fdisk/fdiskbsdlabel.h | 1 +
1 file changed, 1 insertion(+)
--- util-linux-2.21.2.orig/fdisk/fdiskbsdlabel.h
+++ util-linux-2.21.2/fdisk/fdiskbsdlabel.h
@@ -46,10 +46,11 @@
#define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
#if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \
defined (__mips__) || defined (__s390__) || defined (__sh__) || \
+ defined (__aarch64__) || \
defined(__x86_64__) || defined (__avr32__) || defined(__cris__)
#define BSD_LABELSECTOR 1
#define BSD_LABELOFFSET 0
#elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
#define BSD_LABELSECTOR 0

15
meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
View File

@@ -1,18 +1,23 @@
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]
--- 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 @@
Index: util-linux-2.22.1/configure.ac
===================================================================
--- util-linux-2.22.1.orig/configure.ac
+++ util-linux-2.22.1/configure.ac
@@ -73,7 +73,10 @@ AC_SUBST([localstatedir])
usrbin_execdir='${exec_prefix}/bin'
AC_SUBST([usrbin_execdir])
-usrsbin_execdir='${exec_prefix}/sbin'
+if [ -z "$usrsbin_execdir" ]; then
+if test -z "$usrsbin_execdir" ;
+then
+ usrsbin_execdir='${exec_prefix}/sbin'
+fi
AC_SUBST([usrsbin_execdir])
usrlib_execdir='${exec_prefix}/'$libdirname
case $libdir in

20
meta/recipes-core/util-linux/util-linux/fix-configure.patch Normal file
View File

@@ -0,0 +1,20 @@
The userlib_execdir was not getting set correctly, the quoting
was wrong as these quoted items were not getting expanded correctly.
Upstream-Status: Pending
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Index: util-linux-2.22.1/configure.ac
===================================================================
--- util-linux-2.22.1.orig/configure.ac
+++ util-linux-2.22.1/configure.ac
@@ -79,7 +79,7 @@ fi
AC_SUBST([usrsbin_execdir])
case $libdir in
- '${exec_prefix}/'* | '${prefix}/'* | /usr/*)
+ ${exec_prefix}/* | ${prefix}/* | /usr/*)
usrlib_execdir=$libdir ;;
*)
usrlib_execdir='${exec_prefix}'$libdir ;;

14
meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
View File

@@ -16,16 +16,16 @@ make[3]: *** [cache.lo] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: util-linux-2.19.1/configure.ac
Index: util-linux-2.22.1/configure.ac
===================================================================
--- util-linux-2.19.1.orig/configure.ac
+++ util-linux-2.19.1/configure.ac
@@ -250,7 +250,7 @@ esac
--- util-linux-2.22.1.orig/configure.ac
+++ util-linux-2.22.1/configure.ac
@@ -372,7 +372,7 @@ esac
AC_MSG_CHECKING(whether program_invocation_short_name is defined)
-AC_TRY_COMPILE([#include <argp.h>],
+AC_TRY_COMPILE([#include <errno.h>],
[program_invocation_short_name = "test";],
AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
[Define if program_invocation_short_name is defined])
[program_invocation_short_name = "test";],
AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
[Define if program_invocation_short_name is defined])

15
meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
View File

@@ -1,10 +1,10 @@
Upstream-Status: Pending
Index: util-linux-2.21/login-utils/login.c
Index: util-linux-2.22.1/login-utils/login.c
===================================================================
--- util-linux-2.21.orig/login-utils/login.c
+++ util-linux-2.21/login-utils/login.c
@@ -1216,6 +1216,8 @@ int main(int argc, char **argv)
--- util-linux-2.22.1.orig/login-utils/login.c
+++ util-linux-2.22.1/login-utils/login.c
@@ -1239,6 +1239,8 @@ int main(int argc, char **argv)
char *buff;
int childArgc = 0;
int retcode;
@@ -13,14 +13,15 @@ Index: util-linux-2.21/login-utils/login.c
char *pwdbuf = NULL;
struct passwd *pwd = NULL, _pwd;
@@ -1229,7 +1231,9 @@ int main(int argc, char **argv)
timeout = getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
@@ -1252,7 +1254,10 @@ int main(int argc, char **argv)
timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
signal(SIGALRM, timedout);
- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioclt() */
+ (void) sigaction(SIGALRM, NULL, &act);
+ act.sa_flags &= ~SA_RESTART;
+ sigaction(SIGALRM, &act, NULL);
alarm((unsigned int)timeout);
+
alarm(timeout);
signal(SIGQUIT, SIG_IGN);
signal(SIGINT, SIG_IGN);