Skip to contentSkip to conversation

util-linux: upgrade to 2.33.2

PATCH Superseded Chen Qi 2 participants 4 messages Jun 12, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
author
#1 lore raw

PATCH 1/1 util-linux: upgrade to 2.33.2

In reply to Chen Qi

The license files' names are changed, but the contents remain the same.

---
 meta/recipes-core/util-linux/util-linux.inc              | 16 ++++++++--------
 .../{util-linux_2.32.1.bb => util-linux_2.33.2.bb}       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux_2.32.1.bb => util-linux_2.33.2.bb} (72%)
meta/recipes-core/util-linux/util-linux.inc +8 -8
index 7b9b4d2..eaaf408 100644
@@ -8,15 +8,15 @@ SECTION = "base"
 
 LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
 
-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
meta/recipes-core/util-linux/util-linux_2.33.2.bb renamed from meta/recipes-core/util-linux/util-linux_2.32.1.bb +2 -2
similarity index 72%
rename from meta/recipes-core/util-linux/util-linux_2.32.1.bb
rename to meta/recipes-core/util-linux/util-linux_2.33.2.bb
index e0bd383..538e276 100644
@@ -9,5 +9,5 @@ SRC_URI += "file://configure-sbindir.patch \
             file://avoid_parallel_tests.patch \
             file://check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch \
 "
-SRC_URI[md5sum] = "9e5b1b8c1dc99455bdb6b462cf9436d9"
-SRC_URI[sha256sum] = "86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2"
+SRC_URI[md5sum] = "91653b90fcbe9c161153e39b8cc69fb5"
+SRC_URI[sha256sum] = "631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97"
Signature · 1 line
1.9.1

Chen Qi

author
#0 lore raw

cover util-linux: upgrade to 2.33.2

*** BLURB HERE ***
The following changes since commit 9e5a3f40caa37141d292c6dd5914d4670ab57aff:

bitbake: cooker: Ensure mcdeps are processed even if only one multiconfig (2019-06-11 13:27:19 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/util-linux-2.33.2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/util-linux-2.33.2

Chen Qi (1):
util-linux: upgrade to 2.33.2

 meta/recipes-core/util-linux/util-linux.inc              | 16 ++++++++--------
 .../{util-linux_2.32.1.bb => util-linux_2.33.2.bb}       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux_2.32.1.bb => util-linux_2.33.2.bb} (72%)
Signature · 1 line
1.9.1
#2 lore raw
In reply to Chen Qi
Quoted 15 lines · Chen Qi

The license files' names are changed, but the contents remain the same.

---
 meta/recipes-core/util-linux/util-linux.inc              | 16 ++++++++--------
 .../{util-linux_2.32.1.bb => util-linux_2.33.2.bb}       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux_2.32.1.bb => util-linux_2.33.2.bb} (72%)
meta/recipes-core/util-linux/util-linux.inc +0 -0
index 7b9b4d2..eaaf408 100644

meta/recipes-core/util-linux/util-linux.inc SECTION = "base" · line 16

Quoted 7 lines
meta/recipes-core/util-linux/util-linux.inc +1 -1
@@ -8,15 +8,15 @@ SECTION = "base"
 
 LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
...
-                    file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
...
+                    file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \
...

Doesn't this mean that LICENSE is (and already was before) wrong?

meta/files/common-licenses/BSD is the 3 clause BSD licence, but this is the 4 clause licence (with the advertising clause).

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
author
#3 lore raw
Quoted 25 lines · Adrian Bunk
Quoted 15 lines · Chen Qi

The license files' names are changed, but the contents remain the same.

---
  meta/recipes-core/util-linux/util-linux.inc              | 16 ++++++++--------
  .../{util-linux_2.32.1.bb => util-linux_2.33.2.bb}       |  4 ++--
  2 files changed, 10 insertions(+), 10 deletions(-)

rename meta/recipes-core/util-linux/{util-linux_2.32.1.bb => util-linux_2.33.2.bb} (72%)

meta/recipes-core/util-linux/util-linux.inc +0 -0
index 7b9b4d2..eaaf408 100644

meta/recipes-core/util-linux/util-linux.inc SECTION = "base" · line 16

Quoted 7 lines
meta/recipes-core/util-linux/util-linux.inc +1 -1
@@ -8,15 +8,15 @@ SECTION = "base"
 
  LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
...
-                    file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
...
+                    file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \
...

Doesn't this mean that LICENSE is (and already was before) wrong?

Quoted 6 lines

meta/files/common-licenses/BSD is the 3 clause BSD licence, but this is the 4 clause licence (with the advertising clause).

cu
Adrian

Thanks. I've changed this in V2.

Best Regards,

Chen Qi