summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2019-06-12 14:08:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-12 21:08:52 +0100
commit949cbf198c2b6ce326710cabf679b6a073fe661b (patch)
treebd5d0837dd9d9ee3e9a101e584e02e75abdb0cf5 /meta/recipes-core
parent0f3a7044ceff8fb41cdb368e9984575847886276 (diff)
downloadpoky-949cbf198c2b6ce326710cabf679b6a073fe661b.tar.gz
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 <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc18
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.33.2.bb (renamed from meta/recipes-core/util-linux/util-linux_2.32.1.bb)4
2 files changed, 11 insertions, 11 deletions
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
6 6
7SECTION = "base" 7SECTION = "base"
8 8
9LICENSE = "GPLv2+ & LGPLv2.1+ & BSD" 9LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause"
10 10
11LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c \ 11LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 \
12 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 12 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
13 file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 13 file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
14 file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \ 14 file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
15 file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \ 15 file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \
16 file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \ 16 file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \
17 file://libuuid/COPYING;md5=b442ffb762cf8d3e9df1b99e0bb4af70 \ 17 file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \
18 file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ 18 file://libmount/COPYING;md5=7c7e39fb7d70ffe5d693a643e29987c2 \
19 file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" 19 file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04"
20 20
21#gtk-doc is not enabled as it requires xmlto which requires util-linux 21#gtk-doc is not enabled as it requires xmlto which requires util-linux
22inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest 22inherit 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.33.2.bb
index e0bd383631..538e27612c 100644
--- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.33.2.bb
@@ -9,5 +9,5 @@ SRC_URI += "file://configure-sbindir.patch \
9 file://avoid_parallel_tests.patch \ 9 file://avoid_parallel_tests.patch \
10 file://check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch \ 10 file://check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch \
11" 11"
12SRC_URI[md5sum] = "9e5b1b8c1dc99455bdb6b462cf9436d9" 12SRC_URI[md5sum] = "91653b90fcbe9c161153e39b8cc69fb5"
13SRC_URI[sha256sum] = "86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2" 13SRC_URI[sha256sum] = "631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97"