diff options
author | André Draszik <andre.draszik@jci.com> | 2019-02-05 02:32:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-12 14:04:31 +0000 |
commit | 9c60ee4656d36e5208d7e19f8b2bce1a75f47944 (patch) | |
tree | c128bdf76bfddb7e9550b58e8368885c6fcbbdd5 | |
parent | 9fb14cb924d13b93492484286d95e4ad1136b700 (diff) | |
download | poky-9c60ee4656d36e5208d7e19f8b2bce1a75f47944.tar.gz |
util-linux: final cleanup
* use ${PN} instead of util-linux
* use PACKAGESPLITFUNCS for creating util-linux-lib* packages
rather than an _append OVERRIDE
* sort ALTERNATIVE_LINK_NAME alphabetically
* use systemd_system_unitdir instead of open-coding
* inherit manpages so as to benefit from man-db processing (note
that manpages are not generated here, we just want the
automatic update of the package index caches
* use EXTRA_OEMAKE instead of duplicating command line arguments
[YOCTO #13058]
(From OE-Core rev: 6b71a118debb841b7507fc7830712197480a8661)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 157 |
1 files changed, 66 insertions, 91 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 93aa3e407c..ea654e193a 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c | |||
19 | file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" | 19 | file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" |
20 | 20 | ||
21 | #gtk-doc is not enabled as it requires xmlto which requires util-linux | 21 | #gtk-doc is not enabled as it requires xmlto which requires util-linux |
22 | inherit autotools gettext pkgconfig systemd update-alternatives python3-dir bash-completion ptest | 22 | inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest |
23 | DEPENDS = "zlib ncurses virtual/crypt" | 23 | DEPENDS = "zlib ncurses virtual/crypt" |
24 | DEPENDS_append_class-native = " lzo-native" | 24 | DEPENDS_append_class-native = " lzo-native" |
25 | DEPENDS_append_class-nativesdk = " lzo-native" | 25 | DEPENDS_append_class-nativesdk = " lzo-native" |
@@ -28,8 +28,8 @@ MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | |||
28 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \ | 28 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${MAJOR_VERSION}/${BP}.tar.xz \ |
29 | " | 29 | " |
30 | 30 | ||
31 | PACKAGES =+ "util-linux-swaponoff" | 31 | PACKAGES =+ "${PN}-swaponoff" |
32 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" | 32 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmount', '', d)}" |
33 | 33 | ||
34 | python util_linux_binpackages () { | 34 | python util_linux_binpackages () { |
35 | def pkg_hook(f, pkg, file_regex, output_pattern, modulename): | 35 | def pkg_hook(f, pkg, file_regex, output_pattern, modulename): |
@@ -73,7 +73,16 @@ python util_linux_binpackages () { | |||
73 | # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS | 73 | # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS |
74 | PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " | 74 | PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages " |
75 | 75 | ||
76 | PACKAGES_DYNAMIC = "^util-linux-.*" | 76 | python util_linux_libpackages() { |
77 | do_split_packages(d, root=d.getVar('UTIL_LINUX_LIBDIR'), file_regex=r'^lib(.*)\.so\..*$', | ||
78 | output_pattern='${PN}-lib%s', | ||
79 | description='${PN} lib%s', | ||
80 | extra_depends='', prepend=True, allow_links=True) | ||
81 | } | ||
82 | |||
83 | PACKAGESPLITFUNCS =+ "util_linux_libpackages" | ||
84 | |||
85 | PACKAGES_DYNAMIC = "^${PN}-.*" | ||
77 | 86 | ||
78 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" | 87 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" |
79 | UTIL_LINUX_LIBDIR = "${libdir}" | 88 | UTIL_LINUX_LIBDIR = "${libdir}" |
@@ -97,44 +106,42 @@ EXTRA_OECONF = "\ | |||
97 | 106 | ||
98 | PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" | 107 | PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
99 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," | 108 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," |
100 | |||
101 | # Respect the systemd feature for uuidd | 109 | # Respect the systemd feature for uuidd |
102 | PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/, --without-systemd --without-systemdsystemunitdir,systemd" | 110 | PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" |
103 | |||
104 | # Build setpriv requires libcap-ng | 111 | # Build setpriv requires libcap-ng |
105 | PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," | 112 | PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng," |
106 | |||
107 | # Build python bindings for libmount | 113 | # Build python bindings for libmount |
108 | PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3" | 114 | PACKAGECONFIG[pylibmount] = "--with-python=3 --enable-pylibmount,--without-python --disable-pylibmount,python3" |
109 | |||
110 | # Readline support | 115 | # Readline support |
111 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" | 116 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" |
112 | 117 | ||
118 | EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" | ||
119 | |||
113 | ALLOW_EMPTY_${PN} = "1" | 120 | ALLOW_EMPTY_${PN} = "1" |
114 | FILES_${PN} = "" | 121 | FILES_${PN} = "" |
115 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" | 122 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" |
116 | |||
117 | FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" | 123 | FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" |
118 | |||
119 | FILES_${PN}-mount = "${sysconfdir}/default/mountall" | 124 | FILES_${PN}-mount = "${sysconfdir}/default/mountall" |
120 | FILES_util-linux-runuser = "${sysconfdir}/pam.d/runuser*" | 125 | FILES_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" |
121 | FILES_util-linux-su = "${sysconfdir}/pam.d/su-l" | 126 | FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" |
122 | CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" | 127 | CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" |
123 | FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ | 128 | FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ |
124 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ | 129 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ |
125 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" | 130 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" |
126 | 131 | ||
127 | # Util-linux' blkid replaces the e2fsprogs one | 132 | # Util-linux' blkid replaces the e2fsprogs one |
128 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" | 133 | RCONFLICTS_${PN}-blkid = "e2fsprogs-blkid" |
129 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" | 134 | RREPLACES_${PN}-blkid = "e2fsprogs-blkid" |
130 | 135 | ||
131 | RRECOMMENDS_${PN}_class-native = "" | 136 | RRECOMMENDS_${PN}_class-native = "" |
132 | RRECOMMENDS_${PN}_class-nativesdk = "" | 137 | RRECOMMENDS_${PN}_class-nativesdk = "" |
133 | RDEPENDS_${PN}_class-native = "" | 138 | RDEPENDS_${PN}_class-native = "" |
134 | RDEPENDS_${PN}_class-nativesdk = "" | 139 | RDEPENDS_${PN}_class-nativesdk = "" |
135 | 140 | ||
136 | RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" | 141 | RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev ${PN}-libuuid-dev" |
137 | 142 | ||
143 | RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" | ||
144 | RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" | ||
138 | RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" | 145 | RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" |
139 | ALLOW_EMPTY_${PN}-swaponoff = "1" | 146 | ALLOW_EMPTY_${PN}-swaponoff = "1" |
140 | 147 | ||
@@ -144,17 +151,11 @@ SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" | |||
144 | SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" | 151 | SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" |
145 | SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" | 152 | SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" |
146 | 153 | ||
147 | do_compile () { | ||
148 | set -e | ||
149 | oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' | ||
150 | } | ||
151 | |||
152 | do_install () { | 154 | do_install () { |
153 | # with ccache the timestamps on compiled files may | 155 | # with ccache the timestamps on compiled files may |
154 | # end up earlier than on their inputs, this allows | 156 | # end up earlier than on their inputs, this allows |
155 | # for the resultant compilation in the install step. | 157 | # for the resultant compilation in the install step. |
156 | oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ | 158 | oe_runmake 'CC=${CC}' 'LD=${LD}' \ |
157 | 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ | ||
158 | 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install | 159 | 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install |
159 | 160 | ||
160 | mkdir -p ${D}${base_bindir} | 161 | mkdir -p ${D}${base_bindir} |
@@ -208,38 +209,67 @@ do_install_append_class-native () { | |||
208 | 209 | ||
209 | ALTERNATIVE_PRIORITY = "80" | 210 | ALTERNATIVE_PRIORITY = "80" |
210 | 211 | ||
211 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" | 212 | ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" |
212 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" | ||
213 | ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" | ||
214 | ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" | ||
215 | ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" | 213 | ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" |
216 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" | ||
217 | ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal" | 214 | ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal" |
218 | ALTERNATIVE_LINK_NAME[chrt] = "${bindir}/chrt" | 215 | ALTERNATIVE_LINK_NAME[chrt] = "${bindir}/chrt" |
216 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" | ||
219 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" | 217 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" |
220 | ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" | 218 | ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" |
219 | ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" | ||
221 | ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" | 220 | ALTERNATIVE_LINK_NAME[flock] = "${bindir}/flock" |
221 | ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" | ||
222 | ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" | ||
223 | ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" | ||
224 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | ||
225 | ALTERNATIVE_${PN}-agetty = "getty" | ||
226 | ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" | ||
227 | ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" | ||
222 | ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" | 228 | ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" |
229 | ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" | ||
230 | ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" | ||
231 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" | ||
223 | ALTERNATIVE_${PN}-last = "last lastb" | 232 | ALTERNATIVE_${PN}-last = "last lastb" |
224 | ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" | 233 | ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" |
225 | ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb" | 234 | ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb" |
226 | ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger" | 235 | ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger" |
236 | ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" | ||
227 | ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg" | 237 | ALTERNATIVE_LINK_NAME[mesg] = "${bindir}/mesg" |
238 | ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" | ||
239 | ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" | ||
240 | ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" | ||
241 | ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" | ||
242 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" | ||
228 | ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter" | 243 | ALTERNATIVE_LINK_NAME[nsenter] = "${bindir}/nsenter" |
244 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" | ||
245 | ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" | ||
229 | ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice" | 246 | ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice" |
230 | ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" | 247 | ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" |
248 | ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" | ||
231 | ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid" | 249 | ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid" |
250 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" | ||
251 | ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" | ||
252 | ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" | ||
253 | ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" | ||
254 | ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" | ||
232 | ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset" | 255 | ALTERNATIVE_LINK_NAME[taskset] = "${bindir}/taskset" |
256 | ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" | ||
257 | ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" | ||
233 | ALTERNATIVE_LINK_NAME[utmpdump] = "${bindir}/utmpdump" | 258 | ALTERNATIVE_LINK_NAME[utmpdump] = "${bindir}/utmpdump" |
234 | ALTERNATIVE_LINK_NAME[wall] = "${bindir}/wall" | 259 | ALTERNATIVE_LINK_NAME[wall] = "${bindir}/wall" |
235 | ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" | ||
236 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" | ||
237 | 260 | ||
238 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" | 261 | ALTERNATIVE_${PN}-doc = "blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1" |
239 | ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" | 262 | ALTERNATIVE_${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" |
240 | 263 | ||
264 | ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" | ||
265 | ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" | ||
266 | ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" | ||
267 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" | ||
268 | ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" | ||
241 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" | 269 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" |
242 | ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" | 270 | ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" |
271 | ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" | ||
272 | ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" | ||
243 | ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" | 273 | ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" |
244 | ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" | 274 | ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" |
245 | ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" | 275 | ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" |
@@ -247,67 +277,12 @@ ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" | |||
247 | ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" | 277 | ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" |
248 | ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" | 278 | ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" |
249 | ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" | 279 | ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" |
250 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" | ||
251 | ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" | ||
252 | ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" | ||
253 | ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" | ||
254 | ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" | ||
255 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" | ||
256 | ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" | 280 | ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" |
257 | ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" | 281 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" |
258 | ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" | ||
259 | |||
260 | ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" | ||
261 | |||
262 | ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" | ||
263 | |||
264 | ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" | ||
265 | |||
266 | ALTERNATIVE_util-linux-agetty = "getty" | ||
267 | ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" | ||
268 | ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" | ||
269 | |||
270 | ALTERNATIVE_LINK_NAME[mount] = "${base_bindir}/mount" | ||
271 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" | ||
272 | ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" | ||
273 | |||
274 | ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile" | ||
275 | |||
276 | ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" | ||
277 | |||
278 | ALTERNATIVE_LINK_NAME[swapoff] = "${base_sbindir}/swapoff" | ||
279 | ALTERNATIVE_LINK_NAME[swapon] = "${base_sbindir}/swapon" | ||
280 | |||
281 | ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" | ||
282 | |||
283 | ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" | ||
284 | |||
285 | ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" | ||
286 | |||
287 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | ||
288 | |||
289 | ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" | ||
290 | |||
291 | ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" | ||
292 | |||
293 | ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" | ||
294 | 282 | ||
295 | ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" | ||
296 | |||
297 | ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" | ||
298 | 283 | ||
299 | BBCLASSEXTEND = "native nativesdk" | 284 | BBCLASSEXTEND = "native nativesdk" |
300 | 285 | ||
301 | python populate_packages_prepend() { | ||
302 | do_split_packages(d, d.getVar('UTIL_LINUX_LIBDIR'), r'^lib(.*)\.so\..*$', | ||
303 | output_pattern='util-linux-lib%s', | ||
304 | description='util-linux lib%s', | ||
305 | extra_depends='', prepend=True, allow_links=True) | ||
306 | } | ||
307 | |||
308 | RDEPENDS_${PN}-bash-completion += "util-linux-lsblk" | ||
309 | RDEPENDS_${PN}-ptest = "bash grep coreutils which btrfs-tools ${PN}" | ||
310 | |||
311 | do_compile_ptest() { | 286 | do_compile_ptest() { |
312 | oe_runmake buildtest-TESTS | 287 | oe_runmake buildtest-TESTS |
313 | } | 288 | } |