Rename the recipe from util-linux-uuid to util-linux-libuuid which means
we can drop the custom PACKAGES and FILES defintions which simplifies
things. Also move the LICENSE setting to the libuuid recipe so that
it is correctly applied to the right packages.
This means the standard definitions from bitbake.conf are used, avoiding
errors from situations where users have customised settings causing
failures.
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
meta/conf/distro/include/maintainers.inc | 2 +-
...il-linux-uuid_2.36.2.bb => util-linux-libuuid_2.36.2.bb} | 6 +-----
meta/recipes-core/util-linux/util-linux.inc | 1 -
meta/recipes-core/util-linux/util-linux_2.36.2.bb | 6 +++---
4 files changed, 5 insertions(+), 10 deletions(-)
rename meta/recipes-core/util-linux/{util-linux-uuid_2.36.2.bb =>
util-linux-libuuid_2.36.2.bb} (56%)
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index e1cdf40073c..62763318576 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -722,7 +722,7 @@ RECIPE_MAINTAINER_pn-update-rc.d = "Ross Burton
<ross.bur...@arm.com>"
RECIPE_MAINTAINER_pn-usbinit = "Alexander Kanavin <alex.kana...@gmail.com>"
RECIPE_MAINTAINER_pn-usbutils = "Alexander Kanavin <alex.kana...@gmail.com>"
RECIPE_MAINTAINER_pn-util-linux = "Chen Qi <qi.c...@windriver.com>"
-RECIPE_MAINTAINER_pn-util-linux-uuid = "Chen Qi <qi.c...@windriver.com>"
+RECIPE_MAINTAINER_pn-util-linux-libuuid = "Chen Qi <qi.c...@windriver.com>"
RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster <akuster...@gmail.com>"
RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <alex.kana...@gmail.com>"
RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <alex.kana...@gmail.com>"
diff --git a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
b/meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb
similarity index 56%
rename from meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
rename to meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb
index 65e4d23b7e9..9612c491cd9 100644
--- a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb
+++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb
@@ -7,11 +7,7 @@ inherit autotools gettext pkgconfig
S = "${WORKDIR}/util-linux-${PV}"
EXTRA_OECONF += "--disable-all-programs --enable-libuuid"
-PACKAGES = "util-linux-libuuid util-linux-libuuid-dev
util-linux-libuuid-staticdev util-linux-libuuid-dbg"
-FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
-FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${includedir}
${libdir}/pkgconfig"
-FILES_util-linux-libuuid-staticdev = "${libdir}/libuuid.a"
-FILES_util-linux-libuuid-dbg = "/usr/src ${libdir}/.debug"
+LICENSE = "BSD-3-Clause"
do_install_append() {
rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir}
${D}${base_sbindir} ${D}${exec_prefix}/sbin
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index 4031c586c91..cbf6102ee0a 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -11,7 +11,6 @@ LICENSE_${PN}-libblkid = "LGPLv2.1+"
LICENSE_${PN}-libfdisk = "LGPLv2.1+"
LICENSE_${PN}-libmount = "LGPLv2.1+"
LICENSE_${PN}-libsmartcols = "LGPLv2.1+"
-LICENSE_${PN}-libuuid = "BSD-3-Clause"
LIC_FILES_CHKSUM =
"file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
diff --git a/meta/recipes-core/util-linux/util-linux_2.36.2.bb
b/meta/recipes-core/util-linux/util-linux_2.36.2.bb
index 50a70cd4522..c79cf782d15 100644
--- a/meta/recipes-core/util-linux/util-linux_2.36.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.36.2.bb
@@ -2,7 +2,7 @@ require util-linux.inc
#gtk-doc is not enabled as it requires xmlto which requires util-linux
inherit autotools gettext manpages pkgconfig systemd update-alternatives
python3-dir bash-completion ptest
-DEPENDS = "libcap-ng ncurses virtual/crypt zlib util-linux-uuid"
+DEPENDS = "libcap-ng ncurses virtual/crypt zlib util-linux-libuuid"
PACKAGES =+ "${PN}-swaponoff"
PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount',
'${PN}-pylibmount', '', d)}"
@@ -49,7 +49,7 @@ python util_linux_binpackages () {
# we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS
PACKAGE_PREPROCESS_FUNCS =+ "util_linux_binpackages "
-# skip libuuid as it will be packaged by the util-linux-uuid recipe
+# skip libuuid as it will be packaged by the util-linux-libuuid recipe
python util_linux_libpackages() {
do_split_packages(d, root=d.getVar('UTIL_LINUX_LIBDIR'),
file_regex=r'^lib(?!uuid)(.*)\.so\..*$',
output_pattern='${PN}-lib%s',
@@ -201,7 +201,7 @@ do_install_append_class-native () {
rm -f ${D}${base_bindir}/kill
}
-# dm-verity support introduces a circular build dependency, so util-linux-uuid
is split out for target builds
+# dm-verity support introduces a circular build dependency, so
util-linux-libuuid is split out for target builds
# Need to build libuuid for uuidgen, but then delete it and let the other
recipe ship it
do_install_append () {
rm -rf ${D}${includedir}/uuid ${D}${libdir}/pkgconfig/uuid.pc
${D}${libdir}/libuuid* ${D}${base_libdir}/libuuid*
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#149920):
https://lists.openembedded.org/g/openembedded-core/message/149920
Mute This Topic: https://lists.openembedded.org/mt/81598098/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
