From bbd6098ef48c96141267c8e22d0694220a528067 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 24 Mar 2021 21:41:53 +0000 Subject: util-linux-libuuid: Simplify recipe and rename from util-linux-uuid 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. (From OE-Core rev: 65efd76198ad805060fe28714765cd423fa748dc) Signed-off-by: Richard Purdie --- .../util-linux/util-linux-libuuid_2.36.2.bb | 16 ++++++++++++++++ .../util-linux/util-linux-uuid_2.36.2.bb | 20 -------------------- meta/recipes-core/util-linux/util-linux.inc | 1 - meta/recipes-core/util-linux/util-linux_2.36.2.bb | 6 +++--- 4 files changed, 19 insertions(+), 24 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb delete mode 100644 meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb new file mode 100644 index 0000000000..9612c491cd --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb @@ -0,0 +1,16 @@ +# To allow util-linux to optionally build-depend on cryptsetup, libuuid is +# split out of the main recipe, as it's needed by cryptsetup + +require util-linux.inc + +inherit autotools gettext pkgconfig + +S = "${WORKDIR}/util-linux-${PV}" +EXTRA_OECONF += "--disable-all-programs --enable-libuuid" +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 +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb b/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb deleted file mode 100644 index 65e4d23b7e..0000000000 --- a/meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -# To allow util-linux to optionally build-depend on cryptsetup, libuuid is -# split out of the main recipe, as it's needed by cryptsetup - -require util-linux.inc - -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" - -do_install_append() { - rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir} ${D}${base_sbindir} ${D}${exec_prefix}/sbin -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4031c586c9..cbf6102ee0 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 50a70cd452..c79cf782d1 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* -- cgit v1.2.3-54-g00ecf