diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-11-16 19:51:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-03 14:47:55 +0000 |
commit | 3d392f5da9677bc2d172668141c803606fbd183a (patch) | |
tree | 877773bccd755fa7d3ccf1658f65ec86d9c94882 /meta/recipes-core/util-linux/util-linux.inc | |
parent | cc242175cd9a03d5a99cfc707f2ab0b170a32fe1 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux.inc')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 21 |
1 files changed, 12 insertions, 9 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" | |||
8 | LICENSE = "GPLv2+ & LGPLv2.1+ & BSD" | 8 | LICENSE = "GPLv2+ & LGPLv2.1+ & BSD" |
9 | 9 | ||
10 | LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \ | 10 | LIC_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 | ||
18 | inherit autotools gettext pkgconfig | 20 | inherit autotools gettext pkgconfig |
19 | DEPENDS = "zlib ncurses" | 21 | DEPENDS = "zlib ncurses" |
@@ -21,7 +23,6 @@ DEPENDS_append_class-native = " lzo-native" | |||
21 | 23 | ||
22 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ | 24 | SRC_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 | |||
36 | EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ | 37 | EXTRA_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 | ||
47 | EXTRA_OECONF_class-native += "--disable-login --disable-su" | ||
48 | |||
45 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" | 49 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" |
46 | 50 | ||
47 | FILES_util-linux-agetty = "${base_sbindir}/agetty" | 51 | FILES_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 | ||
134 | ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root" | 137 | ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root" |
135 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" | 138 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" |
136 | ALTERNATIVE_${PN} += "setsid chrt flock hwclock" | 139 | ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump" |
137 | 140 | ||
138 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" | 141 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" |
139 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" | 142 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" |