summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-11-16 19:51:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-03 14:47:55 +0000
commit3d392f5da9677bc2d172668141c803606fbd183a (patch)
tree877773bccd755fa7d3ccf1658f65ec86d9c94882
parentcc242175cd9a03d5a99cfc707f2ab0b170a32fe1 (diff)
downloadpoky-3d392f5da9677bc2d172668141c803606fbd183a.tar.gz
util-linux: Update to 2.22.1
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>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc21
-rw-r--r--meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch18
-rw-r--r--meta/recipes-core/util-linux/util-linux/configure-sbindir.patch15
-rw-r--r--meta/recipes-core/util-linux/util-linux/fix-configure.patch20
-rw-r--r--meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch14
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch15
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.22.1.bb (renamed from meta/recipes-core/util-linux/util-linux_2.21.2.bb)10
7 files changed, 62 insertions, 51 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index f2f9a046bb..058f06fbc2 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -8,12 +8,14 @@ SECTION = "base"
8LICENSE = "GPLv2+ & LGPLv2.1+ & BSD" 8LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
9 9
10LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \ 10LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \
11 file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 11 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://Documentation/licenses/COPYING.GPLv2;md5=8ca43cbc842c2336e835926c2166c28b \ 12 file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
13 file://Documentation/licenses/COPYING.LGPLv2.1;md5=bbb461211a33b134d42ed5ee802b37ff \ 13 file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
14 file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \ 14 file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \
15 file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \ 15 file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
16 file://getopt/COPYING;md5=c3a41733416fb80af7ba1b7e1f712551" 16 file://libuuid/COPYING;md5=aa3ac5b4a5bcb707f714f78794011b80 \
17 file://libmount/COPYING;md5=152f98bc301a5ea649769ede7203ac82 \
18 file://libblkid/COPYING;md5=152f98bc301a5ea649769ede7203ac82"
17 19
18inherit autotools gettext pkgconfig 20inherit autotools gettext pkgconfig
19DEPENDS = "zlib ncurses" 21DEPENDS = "zlib ncurses"
@@ -21,7 +23,6 @@ DEPENDS_append_class-native = " lzo-native"
21 23
22SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ 24SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
23 file://MCONFIG \ 25 file://MCONFIG \
24 file://swapargs.h \
25 file://defines.h \ 26 file://defines.h \
26 file://make_include \ 27 file://make_include \
27 " 28 "
@@ -36,12 +37,15 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
36EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ 37EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
37 --disable-makeinstall-chown --enable-elvtune --enable-init \ 38 --disable-makeinstall-chown --enable-elvtune --enable-init \
38 --enable-kill --enable-last --enable-mesg --enable-partx \ 39 --enable-kill --enable-last --enable-mesg --enable-partx \
39 --enable-raw --enable-rdev --enable-reset --disable-login-utils \ 40 --enable-raw --enable-rdev --enable-reset --disable-login \
41 --disable-vipw --disable-newgrp --disable-chfn-chsh --disable-su \
40 --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ 42 --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \
41 --enable-libuuid --enable-libblkid --enable-fsck --without-udev \ 43 --enable-libuuid --enable-libblkid --enable-fsck --without-udev \
42 usrsbin_execdir='${sbindir}' \ 44 usrsbin_execdir='${sbindir}' \
43" 45"
44 46
47EXTRA_OECONF_class-native += "--disable-login --disable-su"
48
45FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" 49FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
46 50
47FILES_util-linux-agetty = "${base_sbindir}/agetty" 51FILES_util-linux-agetty = "${base_sbindir}/agetty"
@@ -80,7 +84,6 @@ do_compile () {
80 set -e 84 set -e
81 install ${WORKDIR}/MCONFIG ${S}/MCONFIG 85 install ${WORKDIR}/MCONFIG ${S}/MCONFIG
82 install ${WORKDIR}/make_include ${S}/make_include 86 install ${WORKDIR}/make_include ${S}/make_include
83 install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h
84 install ${WORKDIR}/defines.h ${S}/defines.h 87 install ${WORKDIR}/defines.h ${S}/defines.h
85 oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' 88 oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'
86} 89}
@@ -97,7 +100,7 @@ do_install () {
97 100
98 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" 101 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
99 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid blockdev" 102 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid blockdev"
100 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt flock" 103 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock"
101 binprogs_a="dmesg kill more umount mount login reset" 104 binprogs_a="dmesg kill more umount mount login reset"
102 105
103 if [ "${base_sbindir}" != "${sbindir}" ]; then 106 if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -133,7 +136,7 @@ ALTERNATIVE_PRIORITY = "100"
133 136
134ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root" 137ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root"
135ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" 138ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
136ALTERNATIVE_${PN} += "setsid chrt flock hwclock" 139ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump"
137 140
138ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 141ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
139ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 142ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
diff --git a/meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch b/meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch
deleted file mode 100644
index 4480f13ac5..0000000000
--- a/meta/recipes-core/util-linux/util-linux/add-aarch64-support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1---
2 fdisk/fdiskbsdlabel.h | 1 +
3 1 file changed, 1 insertion(+)
4
5--- util-linux-2.21.2.orig/fdisk/fdiskbsdlabel.h
6+++ util-linux-2.21.2/fdisk/fdiskbsdlabel.h
7@@ -46,10 +46,11 @@
8
9 #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
10
11 #if defined (__i386__) || defined (__sparc__) || defined (__arm__) || \
12 defined (__mips__) || defined (__s390__) || defined (__sh__) || \
13+ defined (__aarch64__) || \
14 defined(__x86_64__) || defined (__avr32__) || defined(__cris__)
15 #define BSD_LABELSECTOR 1
16 #define BSD_LABELOFFSET 0
17 #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
18 #define BSD_LABELSECTOR 0
diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
index f1f5ef4e4f..a5b1ff12e5 100644
--- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
+++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
@@ -1,18 +1,23 @@
1util-linux: take ${sbindir} from the environment if it is set there 1util-linux: take ${sbindir} from the environment if it is set there
2fix the test, the [ ] syntax was getting eaten by autoconf
2 3
3Signed-off-by: Phil Blundell <pb@pbcl.net> 4Signed-off-by: Phil Blundell <pb@pbcl.net>
5Signed-off-by: Saul Wold <sgw@linux.intel.com
4Upstream-Status: Inappropriate [configuration] 6Upstream-Status: Inappropriate [configuration]
5 7
6--- util-linux-2.21.2/configure.ac~ 2012-09-22 09:29:12.354215377 +0100 8Index: util-linux-2.22.1/configure.ac
7+++ util-linux-2.21.2/configure.ac 2012-09-22 16:47:14.713628946 +0100 9===================================================================
8@@ -67,7 +67,9 @@ 10--- util-linux-2.22.1.orig/configure.ac
11+++ util-linux-2.22.1/configure.ac
12@@ -73,7 +73,10 @@ AC_SUBST([localstatedir])
9 usrbin_execdir='${exec_prefix}/bin' 13 usrbin_execdir='${exec_prefix}/bin'
10 AC_SUBST([usrbin_execdir]) 14 AC_SUBST([usrbin_execdir])
11 15
12-usrsbin_execdir='${exec_prefix}/sbin' 16-usrsbin_execdir='${exec_prefix}/sbin'
13+if [ -z "$usrsbin_execdir" ]; then 17+if test -z "$usrsbin_execdir" ;
18+then
14+ usrsbin_execdir='${exec_prefix}/sbin' 19+ usrsbin_execdir='${exec_prefix}/sbin'
15+fi 20+fi
16 AC_SUBST([usrsbin_execdir]) 21 AC_SUBST([usrsbin_execdir])
17 22
18 usrlib_execdir='${exec_prefix}/'$libdirname 23 case $libdir in
diff --git a/meta/recipes-core/util-linux/util-linux/fix-configure.patch b/meta/recipes-core/util-linux/util-linux/fix-configure.patch
new file mode 100644
index 0000000000..0ea23183ca
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/fix-configure.patch
@@ -0,0 +1,20 @@
1The userlib_execdir was not getting set correctly, the quoting
2was wrong as these quoted items were not getting expanded correctly.
3
4Upstream-Status: Pending
5
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
7
8Index: util-linux-2.22.1/configure.ac
9===================================================================
10--- util-linux-2.22.1.orig/configure.ac
11+++ util-linux-2.22.1/configure.ac
12@@ -79,7 +79,7 @@ fi
13 AC_SUBST([usrsbin_execdir])
14
15 case $libdir in
16- '${exec_prefix}/'* | '${prefix}/'* | /usr/*)
17+ ${exec_prefix}/* | ${prefix}/* | /usr/*)
18 usrlib_execdir=$libdir ;;
19 *)
20 usrlib_execdir='${exec_prefix}'$libdir ;;
diff --git a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
index 45826b180a..5b743cbc76 100644
--- a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
+++ b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
@@ -16,16 +16,16 @@ make[3]: *** [cache.lo] Error 1
16Signed-off-by: Khem Raj <raj.khem@gmail.com> 16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 17
18Upstream-Status: Pending 18Upstream-Status: Pending
19Index: util-linux-2.19.1/configure.ac 19Index: util-linux-2.22.1/configure.ac
20=================================================================== 20===================================================================
21--- util-linux-2.19.1.orig/configure.ac 21--- util-linux-2.22.1.orig/configure.ac
22+++ util-linux-2.19.1/configure.ac 22+++ util-linux-2.22.1/configure.ac
23@@ -250,7 +250,7 @@ esac 23@@ -372,7 +372,7 @@ esac
24 24
25 25
26 AC_MSG_CHECKING(whether program_invocation_short_name is defined) 26 AC_MSG_CHECKING(whether program_invocation_short_name is defined)
27-AC_TRY_COMPILE([#include <argp.h>], 27-AC_TRY_COMPILE([#include <argp.h>],
28+AC_TRY_COMPILE([#include <errno.h>], 28+AC_TRY_COMPILE([#include <errno.h>],
29 [program_invocation_short_name = "test";], 29 [program_invocation_short_name = "test";],
30 AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1, 30 AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
31 [Define if program_invocation_short_name is defined]) 31 [Define if program_invocation_short_name is defined])
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
index ef56048c60..f131b763ca 100644
--- a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
+++ b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Index: util-linux-2.21/login-utils/login.c 3Index: util-linux-2.22.1/login-utils/login.c
4=================================================================== 4===================================================================
5--- util-linux-2.21.orig/login-utils/login.c 5--- util-linux-2.22.1.orig/login-utils/login.c
6+++ util-linux-2.21/login-utils/login.c 6+++ util-linux-2.22.1/login-utils/login.c
7@@ -1216,6 +1216,8 @@ int main(int argc, char **argv) 7@@ -1239,6 +1239,8 @@ int main(int argc, char **argv)
8 char *buff; 8 char *buff;
9 int childArgc = 0; 9 int childArgc = 0;
10 int retcode; 10 int retcode;
@@ -13,14 +13,15 @@ Index: util-linux-2.21/login-utils/login.c
13 13
14 char *pwdbuf = NULL; 14 char *pwdbuf = NULL;
15 struct passwd *pwd = NULL, _pwd; 15 struct passwd *pwd = NULL, _pwd;
16@@ -1229,7 +1231,9 @@ int main(int argc, char **argv) 16@@ -1252,7 +1254,10 @@ int main(int argc, char **argv)
17 timeout = getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT); 17 timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
18 18
19 signal(SIGALRM, timedout); 19 signal(SIGALRM, timedout);
20- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioclt() */ 20- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioclt() */
21+ (void) sigaction(SIGALRM, NULL, &act); 21+ (void) sigaction(SIGALRM, NULL, &act);
22+ act.sa_flags &= ~SA_RESTART; 22+ act.sa_flags &= ~SA_RESTART;
23+ sigaction(SIGALRM, &act, NULL); 23+ sigaction(SIGALRM, &act, NULL);
24 alarm((unsigned int)timeout); 24+
25 alarm(timeout);
25 signal(SIGQUIT, SIG_IGN); 26 signal(SIGQUIT, SIG_IGN);
26 signal(SIGINT, SIG_IGN); 27 signal(SIGINT, SIG_IGN);
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.1.bb
index 24bed2707c..c72634dc96 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.22.1.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.21" 1MAJOR_VERSION = "2.22"
2PR = "r6" 2PR = "r0"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+
@@ -9,11 +9,11 @@ SRC_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 file://configure-sbindir.patch \
12 file://add-aarch64-support.patch \ 12 file://fix-configure.patch \
13" 13"
14 14
15SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3" 15SRC_URI[md5sum] = "cad23c41a014af766d467b86628bd0fd"
16SRC_URI[sha256sum] = "066f9d8e51bfabd809d266edcd54eefba1cdca57725b95c074fd47fe6fba3d30" 16SRC_URI[sha256sum] = "4297ea2a560f8839d7b3cde72a5955d1458dbad38fe0e3d99ccb1fde3df751b2"
17 17
18# Only lscpu part is gplv3; rest of the code is not, 18# Only lscpu part is gplv3; rest of the code is not,
19# so take out the lscpu parts while running non-gplv3 build. 19# so take out the lscpu parts while running non-gplv3 build.