From 949cbf198c2b6ce326710cabf679b6a073fe661b Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 12 Jun 2019 14:08:20 +0800 Subject: util-linux: upgrade to 2.33.2 The license files' names are changed, but the contents remain the same. However, the LICENSE section of the recipe was wrong. This upgrade change the 'BSD' part to 'BSD-3-Clause & BSD-4-Clause'. (From OE-Core rev: 9bc68bcc79d9e2464b9b29f6bfde8322b65c09b9) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/recipes-core/util-linux/util-linux.inc | 18 +++++++++--------- meta/recipes-core/util-linux/util-linux_2.32.1.bb | 13 ------------- meta/recipes-core/util-linux/util-linux_2.33.2.bb | 13 +++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux_2.32.1.bb create mode 100644 meta/recipes-core/util-linux/util-linux_2.33.2.bb (limited to 'meta') diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 7b9b4d2a30..df1d1224dd 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -6,17 +6,17 @@ disk partitioning, kernel message management, filesystem creation, and system lo SECTION = "base" -LICENSE = "GPLv2+ & LGPLv2.1+ & BSD" +LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \ - file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \ - file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \ - file://libuuid/COPYING;md5=b442ffb762cf8d3e9df1b99e0bb4af70 \ - file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ - file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" + file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ + file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \ + file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \ + file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \ + file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \ + file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04" #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 diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb deleted file mode 100644 index e0bd383631..0000000000 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -require util-linux.inc - -SRC_URI += "file://configure-sbindir.patch \ - file://runuser.pamd \ - file://runuser-l.pamd \ - file://ptest.patch \ - file://run-ptest \ - file://display_testname_for_subtest.patch \ - file://avoid_parallel_tests.patch \ - file://check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch \ -" -SRC_URI[md5sum] = "9e5b1b8c1dc99455bdb6b462cf9436d9" -SRC_URI[sha256sum] = "86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2" diff --git a/meta/recipes-core/util-linux/util-linux_2.33.2.bb b/meta/recipes-core/util-linux/util-linux_2.33.2.bb new file mode 100644 index 0000000000..538e27612c --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.33.2.bb @@ -0,0 +1,13 @@ +require util-linux.inc + +SRC_URI += "file://configure-sbindir.patch \ + file://runuser.pamd \ + file://runuser-l.pamd \ + file://ptest.patch \ + file://run-ptest \ + file://display_testname_for_subtest.patch \ + file://avoid_parallel_tests.patch \ + file://check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch \ +" +SRC_URI[md5sum] = "91653b90fcbe9c161153e39b8cc69fb5" +SRC_URI[sha256sum] = "631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97" -- cgit v1.2.3-54-g00ecf