diff options
| -rw-r--r-- | meta/conf/distro/include/maintainers.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux-libuuid_2.36.2.bb (renamed from meta/recipes-core/util-linux/util-linux-uuid_2.36.2.bb) | 6 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.36.2.bb | 6 |
4 files changed, 5 insertions, 10 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index e1cdf40073..6276331857 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.burton@arm.com>" RECIPE_MAINTAINER_pn-usbinit = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-usbutils = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-util-linux = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-util-linux-uuid = "Chen Qi <Qi.Chen@windriver.com>" +RECIPE_MAINTAINER_pn-util-linux-libuuid = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <alex.kanavin@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 index 65e4d23b7e..9612c491cd 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 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* |