diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-12-30 15:39:06 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-29 15:36:50 +0000 |
commit | 0f8c09193ecb183715e99782da2f093ea62a9864 (patch) | |
tree | b3fce47b7b0cb8aa41c1b9ebcda099612d9238ba /meta/recipes-core/util-linux/util-linux.inc | |
parent | 09aa2b1ed85408939a8bae433c032ea5da7cc7a5 (diff) | |
download | poky-0f8c09193ecb183715e99782da2f093ea62a9864.tar.gz |
util-linux: upgrade to 2.25.2
fix-configure.patch is removed as it's not appropriate, and the new
version of util-linux has solved the problem this patch is trying to solve.
util-linux-ensure-the-existence-of-directory-for-PAT.patch is removed as
the new version of util-linux has solved the problem this patch is trying
to solve.
util-linux-native.patch is rebased.
util-linux-ng-replace-siginterrupt.patch is rebased.
Add PACKAGECONFIG for 'pylibmount' to build out python bindings for libmount
optionally. util-linux-pylibmount is added to PACKAGES if PACKAGECONFIG has
'pylibmount' in it.
Fix PACAGECONFIG for 'systemd' as the new version has changed things related
to systemd. Now util-linux would have a dependency on systemd if 'systemd' is
in PACKAGECONFIG.
Fix SYSTEMD_PACKAGES, SYSTEMD_SERVICE and SYSTEMD_AUTO_ENABLE variable to match
the new version.
Four lines in do_compile task are deleted because they caused do_compile failure
and nowhere in util-linux are they used. Corresponding files are also removed.
(From OE-Core rev: 264e2fde3a8624c87d2451d2752c9f3ed8911672)
Signed-off-by: Chen Qi <Qi.Chen@windriver.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 | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index e6c00e437e..af30887d80 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -17,16 +17,12 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c | |||
17 | file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ | 17 | file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ |
18 | file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" | 18 | file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" |
19 | 19 | ||
20 | inherit autotools gettext pkgconfig systemd | 20 | inherit autotools gettext pkgconfig systemd update-alternatives python-dir |
21 | DEPENDS = "zlib ncurses" | 21 | DEPENDS = "zlib ncurses" |
22 | DEPENDS_append_class-native = " lzo-native" | 22 | DEPENDS_append_class-native = " lzo-native" |
23 | DEPENDS_append_class-nativesdk = " lzo-native" | 23 | DEPENDS_append_class-nativesdk = " lzo-native" |
24 | 24 | ||
25 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ | 25 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ |
26 | file://MCONFIG \ | ||
27 | file://defines.h \ | ||
28 | file://make_include \ | ||
29 | file://swapargs.h \ | ||
30 | " | 26 | " |
31 | 27 | ||
32 | PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ | 28 | PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ |
@@ -38,6 +34,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
38 | util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ | 34 | util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ |
39 | util-linux-partx ${PN}-bash-completion util-linux-hwclock \ | 35 | util-linux-partx ${PN}-bash-completion util-linux-hwclock \ |
40 | util-linux-findfs util-linux-getopt" | 36 | util-linux-findfs util-linux-getopt" |
37 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" | ||
41 | 38 | ||
42 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ | 39 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ |
43 | --disable-makeinstall-chown \ | 40 | --disable-makeinstall-chown \ |
@@ -56,14 +53,20 @@ PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'p | |||
56 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," | 53 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," |
57 | 54 | ||
58 | # Respect the systemd feature for uuidd | 55 | # Respect the systemd feature for uuidd |
59 | PACKAGECONFIG[systemd] = "--enable-socket-activation --with-systemdsystemunitdir=${systemd_unitdir}/system/, --disable-socket-activation --without-systemdsystemunitdir" | 56 | PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemd --without-systemdsystemunitdir,systemd" |
60 | 57 | ||
61 | # Build setpriv requires libcap-ng | 58 | # Build setpriv requires libcap-ng |
62 | PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," | 59 | PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," |
63 | 60 | ||
61 | # Build python bindings for libmount | ||
62 | PACKAGECONFIG[pylibmount] = "--with-python --enable-pylibmount,--without-python --disable-pylibmount,python" | ||
63 | |||
64 | FILES_${PN}-bash-completion += "${datadir}/bash-completion" | 64 | FILES_${PN}-bash-completion += "${datadir}/bash-completion" |
65 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" | 65 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" |
66 | 66 | ||
67 | FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.la" | ||
68 | FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/.debug/" | ||
69 | |||
67 | FILES_util-linux-agetty = "${base_sbindir}/agetty" | 70 | FILES_util-linux-agetty = "${base_sbindir}/agetty" |
68 | FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" | 71 | FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" |
69 | FILES_util-linux-fstrim = "${base_sbindir}/fstrim" | 72 | FILES_util-linux-fstrim = "${base_sbindir}/fstrim" |
@@ -85,6 +88,8 @@ FILES_util-linux-getopt = "${bindir}/getopt.${BPN}" | |||
85 | 88 | ||
86 | FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" | 89 | FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" |
87 | FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" | 90 | FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" |
91 | FILES_util-linux-pylibmount = "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \ | ||
92 | ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.*" | ||
88 | FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" | 93 | FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" |
89 | FILES_util-linux-lscpu = "${bindir}/lscpu" | 94 | FILES_util-linux-lscpu = "${bindir}/lscpu" |
90 | 95 | ||
@@ -94,7 +99,6 @@ FILES_util-linux-mkfs = "${sbindir}/mkfs" | |||
94 | FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" | 99 | FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" |
95 | FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" | 100 | FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" |
96 | 101 | ||
97 | |||
98 | # Util-linux' blkid replaces the e2fsprogs one | 102 | # Util-linux' blkid replaces the e2fsprogs one |
99 | FILES_util-linux-blkid = "${base_sbindir}/blkid*" | 103 | FILES_util-linux-blkid = "${base_sbindir}/blkid*" |
100 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" | 104 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" |
@@ -113,15 +117,14 @@ RDEPENDS_${PN}_class-nativesdk = "" | |||
113 | 117 | ||
114 | RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" | 118 | RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" |
115 | 119 | ||
116 | SYSTEMD_PACKAGES = "${PN}-uuidd" | 120 | SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" |
117 | SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.service" | 121 | SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" |
122 | SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" | ||
123 | SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" | ||
124 | SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" | ||
118 | 125 | ||
119 | do_compile () { | 126 | do_compile () { |
120 | set -e | 127 | set -e |
121 | install ${WORKDIR}/MCONFIG ${S}/MCONFIG | ||
122 | install ${WORKDIR}/make_include ${S}/make_include | ||
123 | install ${WORKDIR}/swapargs.h ${S}/mount-deprecated/swapargs.h | ||
124 | install ${WORKDIR}/defines.h ${S}/defines.h | ||
125 | oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' | 128 | oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' |
126 | } | 129 | } |
127 | 130 | ||
@@ -164,8 +167,6 @@ do_install () { | |||
164 | rm -f ${D}${bindir}/chkdupexe | 167 | rm -f ${D}${bindir}/chkdupexe |
165 | } | 168 | } |
166 | 169 | ||
167 | inherit update-alternatives | ||
168 | |||
169 | ALTERNATIVE_PRIORITY = "100" | 170 | ALTERNATIVE_PRIORITY = "100" |
170 | 171 | ||
171 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" | 172 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" |