diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-core/util-linux | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 10 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.37.bb | 86 |
3 files changed, 49 insertions, 49 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb index 9612c491cd..5d759aed94 100644 --- a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb +++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb | |||
@@ -9,7 +9,7 @@ S = "${WORKDIR}/util-linux-${PV}" | |||
9 | EXTRA_OECONF += "--disable-all-programs --enable-libuuid" | 9 | EXTRA_OECONF += "--disable-all-programs --enable-libuuid" |
10 | LICENSE = "BSD-3-Clause" | 10 | LICENSE = "BSD-3-Clause" |
11 | 11 | ||
12 | do_install_append() { | 12 | do_install:append() { |
13 | rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir} ${D}${base_sbindir} ${D}${exec_prefix}/sbin | 13 | rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir} ${D}${base_sbindir} ${D}${exec_prefix}/sbin |
14 | } | 14 | } |
15 | 15 | ||
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 0648366baf..d07f648041 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -7,10 +7,10 @@ disk partitioning, kernel message management, filesystem creation, and system lo | |||
7 | SECTION = "base" | 7 | SECTION = "base" |
8 | 8 | ||
9 | LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" | 9 | LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" |
10 | LICENSE_${PN}-libblkid = "LGPLv2.1+" | 10 | LICENSE:${PN}-libblkid = "LGPLv2.1+" |
11 | LICENSE_${PN}-libfdisk = "LGPLv2.1+" | 11 | LICENSE:${PN}-libfdisk = "LGPLv2.1+" |
12 | LICENSE_${PN}-libmount = "LGPLv2.1+" | 12 | LICENSE:${PN}-libmount = "LGPLv2.1+" |
13 | LICENSE_${PN}-libsmartcols = "LGPLv2.1+" | 13 | LICENSE:${PN}-libsmartcols = "LGPLv2.1+" |
14 | 14 | ||
15 | LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ | 15 | LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ |
16 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 16 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
@@ -25,7 +25,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da | |||
25 | file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ | 25 | file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ |
26 | " | 26 | " |
27 | 27 | ||
28 | FILESEXTRAPATHS_prepend := "${THISDIR}/util-linux:" | 28 | FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" |
29 | MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | 29 | MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
30 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ | 30 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ |
31 | file://configure-sbindir.patch \ | 31 | file://configure-sbindir.patch \ |
diff --git a/meta/recipes-core/util-linux/util-linux_2.37.bb b/meta/recipes-core/util-linux/util-linux_2.37.bb index 2548b7210b..b67c3dcb53 100644 --- a/meta/recipes-core/util-linux/util-linux_2.37.bb +++ b/meta/recipes-core/util-linux/util-linux_2.37.bb | |||
@@ -10,12 +10,12 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmou | |||
10 | python util_linux_binpackages () { | 10 | python util_linux_binpackages () { |
11 | def pkg_hook(f, pkg, file_regex, output_pattern, modulename): | 11 | def pkg_hook(f, pkg, file_regex, output_pattern, modulename): |
12 | pn = d.getVar('PN') | 12 | pn = d.getVar('PN') |
13 | d.appendVar('RRECOMMENDS_%s' % pn, ' %s' % pkg) | 13 | d.appendVar('RRECOMMENDS:%s' % pn, ' %s' % pkg) |
14 | 14 | ||
15 | if d.getVar('ALTERNATIVE_' + pkg): | 15 | if d.getVar('ALTERNATIVE:' + pkg): |
16 | return | 16 | return |
17 | if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): | 17 | if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): |
18 | d.setVar('ALTERNATIVE_' + pkg, modulename) | 18 | d.setVar('ALTERNATIVE:' + pkg, modulename) |
19 | 19 | ||
20 | bindirs = sorted(list(set(d.expand("${base_sbindir} ${base_bindir} ${sbindir} ${bindir}").split()))) | 20 | bindirs = sorted(list(set(d.expand("${base_sbindir} ${base_bindir} ${sbindir} ${bindir}").split()))) |
21 | for dir in bindirs: | 21 | for dir in bindirs: |
@@ -41,9 +41,9 @@ python util_linux_binpackages () { | |||
41 | 41 | ||
42 | pn = d.getVar('PN') | 42 | pn = d.getVar('PN') |
43 | for pkg, links in extras.items(): | 43 | for pkg, links in extras.items(): |
44 | of = d.getVar('FILES_' + pn + '-' + pkg) | 44 | of = d.getVar('FILES:' + pn + '-' + pkg) |
45 | links = of + links | 45 | links = of + links |
46 | d.setVar('FILES_' + pn + '-' + pkg, links) | 46 | d.setVar('FILES:' + pn + '-' + pkg, links) |
47 | } | 47 | } |
48 | 48 | ||
49 | # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS | 49 | # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS |
@@ -63,7 +63,7 @@ PACKAGES_DYNAMIC = "^${PN}-.*" | |||
63 | 63 | ||
64 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" | 64 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" |
65 | UTIL_LINUX_LIBDIR = "${libdir}" | 65 | UTIL_LINUX_LIBDIR = "${libdir}" |
66 | UTIL_LINUX_LIBDIR_class-target = "${base_libdir}" | 66 | UTIL_LINUX_LIBDIR:class-target = "${base_libdir}" |
67 | EXTRA_OECONF = "\ | 67 | EXTRA_OECONF = "\ |
68 | --enable-libuuid --enable-libblkid \ | 68 | --enable-libuuid --enable-libblkid \ |
69 | \ | 69 | \ |
@@ -81,17 +81,17 @@ EXTRA_OECONF = "\ | |||
81 | --libdir='${UTIL_LINUX_LIBDIR}' \ | 81 | --libdir='${UTIL_LINUX_LIBDIR}' \ |
82 | " | 82 | " |
83 | 83 | ||
84 | EXTRA_OECONF_append_class-target = " --enable-setpriv" | 84 | EXTRA_OECONF:append:class-target = " --enable-setpriv" |
85 | EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" | 85 | EXTRA_OECONF:append:class-native = " --without-cap-ng --disable-setpriv" |
86 | EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" | 86 | EXTRA_OECONF:append:class-nativesdk = " --without-cap-ng --disable-setpriv" |
87 | EXTRA_OECONF_append = " --disable-hwclock-gplv3" | 87 | EXTRA_OECONF:append = " --disable-hwclock-gplv3" |
88 | 88 | ||
89 | # enable pcre2 for native/nativesdk to match host distros | 89 | # enable pcre2 for native/nativesdk to match host distros |
90 | # this helps to keep same expectations when using the SDK or | 90 | # this helps to keep same expectations when using the SDK or |
91 | # build host versions during development | 91 | # build host versions during development |
92 | # | 92 | # |
93 | PACKAGECONFIG ?= "pcre2" | 93 | PACKAGECONFIG ?= "pcre2" |
94 | PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam', '', d)}" | 94 | PACKAGECONFIG:class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam', '', d)}" |
95 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," | 95 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," |
96 | # Respect the systemd feature for uuidd | 96 | # Respect the systemd feature for uuidd |
97 | PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" | 97 | PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" |
@@ -106,43 +106,43 @@ PACKAGECONFIG[chfn-chsh] = "--enable-chfn-chsh,--disable-chfn-chsh," | |||
106 | 106 | ||
107 | EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" | 107 | EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" |
108 | 108 | ||
109 | ALLOW_EMPTY_${PN} = "1" | 109 | ALLOW_EMPTY:${PN} = "1" |
110 | FILES_${PN} = "" | 110 | FILES:${PN} = "" |
111 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" | 111 | FILES:${PN}-doc += "${datadir}/getopt/getopt-*.*" |
112 | FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" | 112 | FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" |
113 | FILES_${PN}-mount = "${sysconfdir}/default/mountall" | 113 | FILES:${PN}-mount = "${sysconfdir}/default/mountall" |
114 | FILES_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" | 114 | FILES:${PN}-runuser = "${sysconfdir}/pam.d/runuser*" |
115 | FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" | 115 | FILES:${PN}-su = "${sysconfdir}/pam.d/su-l" |
116 | CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" | 116 | CONFFILES:${PN}-su = "${sysconfdir}/pam.d/su-l" |
117 | FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ | 117 | FILES:${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ |
118 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ | 118 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ |
119 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" | 119 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" |
120 | 120 | ||
121 | # Util-linux' blkid replaces the e2fsprogs one | 121 | # Util-linux' blkid replaces the e2fsprogs one |
122 | RCONFLICTS_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" | 122 | RCONFLICTS:${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" |
123 | RREPLACES_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" | 123 | RREPLACES:${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" |
124 | 124 | ||
125 | RRECOMMENDS_${PN}_class-native = "" | 125 | RRECOMMENDS:${PN}:class-native = "" |
126 | RRECOMMENDS_${PN}_class-nativesdk = "" | 126 | RRECOMMENDS:${PN}:class-nativesdk = "" |
127 | RDEPENDS_${PN}_class-native = "" | 127 | RDEPENDS:${PN}:class-native = "" |
128 | RDEPENDS_${PN}_class-nativesdk = "" | 128 | RDEPENDS:${PN}:class-nativesdk = "" |
129 | 129 | ||
130 | RDEPENDS_${PN} += " util-linux-libuuid" | 130 | RDEPENDS:${PN} += " util-linux-libuuid" |
131 | RDEPENDS_${PN}-dev += " util-linux-libuuid-dev" | 131 | RDEPENDS:${PN}-dev += " util-linux-libuuid-dev" |
132 | 132 | ||
133 | RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" | 133 | RPROVIDES:${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" |
134 | 134 | ||
135 | RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" | 135 | RDEPENDS:${PN}-bash-completion += "${PN}-lsblk" |
136 | RDEPENDS_${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod mdadm procps sed socat which xz" | 136 | RDEPENDS:${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod mdadm procps sed socat which xz" |
137 | RRECOMMENDS_${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop" | 137 | RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop" |
138 | RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" | 138 | RDEPENDS:${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" |
139 | ALLOW_EMPTY_${PN}-swaponoff = "1" | 139 | ALLOW_EMPTY:${PN}-swaponoff = "1" |
140 | 140 | ||
141 | #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" | 141 | #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" |
142 | SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" | 142 | SYSTEMD_SERVICE:${PN}-uuidd = "uuidd.socket uuidd.service" |
143 | SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" | 143 | SYSTEMD_AUTO_ENABLE:${PN}-uuidd = "disable" |
144 | SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" | 144 | SYSTEMD_SERVICE:${PN}-fstrim = "fstrim.timer fstrim.service" |
145 | SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" | 145 | SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable" |
146 | 146 | ||
147 | do_install () { | 147 | do_install () { |
148 | # with ccache the timestamps on compiled files may | 148 | # with ccache the timestamps on compiled files may |
@@ -181,7 +181,7 @@ do_install () { | |||
181 | rm -f ${D}${bindir}/chkdupexe | 181 | rm -f ${D}${bindir}/chkdupexe |
182 | } | 182 | } |
183 | 183 | ||
184 | do_install_append_class-target () { | 184 | do_install:append:class-target () { |
185 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then | 185 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then |
186 | install -d ${D}${sysconfdir}/pam.d | 186 | install -d ${D}${sysconfdir}/pam.d |
187 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser | 187 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser |
@@ -194,14 +194,14 @@ do_install_append_class-target () { | |||
194 | } | 194 | } |
195 | # nologin causes a conflict with shadow-native | 195 | # nologin causes a conflict with shadow-native |
196 | # kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) | 196 | # kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) |
197 | do_install_append_class-native () { | 197 | do_install:append:class-native () { |
198 | rm -f ${D}${base_sbindir}/nologin | 198 | rm -f ${D}${base_sbindir}/nologin |
199 | rm -f ${D}${base_bindir}/kill | 199 | rm -f ${D}${base_bindir}/kill |
200 | } | 200 | } |
201 | 201 | ||
202 | # dm-verity support introduces a circular build dependency, so util-linux-libuuid is split out for target builds | 202 | # dm-verity support introduces a circular build dependency, so util-linux-libuuid is split out for target builds |
203 | # Need to build libuuid for uuidgen, but then delete it and let the other recipe ship it | 203 | # Need to build libuuid for uuidgen, but then delete it and let the other recipe ship it |
204 | do_install_append () { | 204 | do_install:append () { |
205 | rm -rf ${D}${includedir}/uuid ${D}${libdir}/pkgconfig/uuid.pc ${D}${libdir}/libuuid* ${D}${base_libdir}/libuuid* | 205 | rm -rf ${D}${includedir}/uuid ${D}${libdir}/pkgconfig/uuid.pc ${D}${libdir}/libuuid* ${D}${base_libdir}/libuuid* |
206 | } | 206 | } |
207 | 207 | ||
@@ -222,14 +222,14 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" | |||
222 | ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" | 222 | ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" |
223 | ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" | 223 | ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" |
224 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | 224 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" |
225 | ALTERNATIVE_${PN}-agetty = "getty" | 225 | ALTERNATIVE:${PN}-agetty = "getty" |
226 | ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" | 226 | ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" |
227 | ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" | 227 | ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" |
228 | ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" | 228 | ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" |
229 | ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" | 229 | ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" |
230 | ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" | 230 | ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" |
231 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" | 231 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" |
232 | ALTERNATIVE_${PN}-last = "last lastb" | 232 | ALTERNATIVE:${PN}-last = "last lastb" |
233 | ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" | 233 | ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" |
234 | ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb" | 234 | ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb" |
235 | ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger" | 235 | ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger" |