util-linux's ChangeLog file simply points to the git log, and there are numerous changes between 2.38.1 and 2.39:
https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/log There is a notable license change - README.licensing adds the BSD-2-Clause variant between these versions, but there is no corresponding file in Documentation/licenses; it's been added it under LICENSE in the recipe along with a reference to the common-licenses version. The README.licensing file also lists GPL-3.0-or-later for some of the code, so add it as well and include a checksum. Signed-off-by: Trevor Gamblin <[email protected]> --- ...ux-libuuid_2.38.1.bb => util-linux-libuuid_2.39.bb} | 0 meta/recipes-core/util-linux/util-linux.inc | 10 +++++----- .../{util-linux_2.38.1.bb => util-linux_2.39.bb} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-core/util-linux/{util-linux-libuuid_2.38.1.bb => util-linux-libuuid_2.39.bb} (100%) rename meta/recipes-core/util-linux/{util-linux_2.38.1.bb => util-linux_2.39.bb} (100%) diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.38.1.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.39.bb similarity index 100% rename from meta/recipes-core/util-linux/util-linux-libuuid_2.38.1.bb rename to meta/recipes-core/util-linux/util-linux-libuuid_2.39.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 3868b1c41d..f9e6fb7d21 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -6,16 +6,18 @@ disk partitioning, kernel message management, filesystem creation, and system lo SECTION = "base" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & BSD-3-Clause & BSD-4-Clause" +LICENSE = "GPL-3.0-or-later & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause" LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" LICENSE:${PN}-libmount = "LGPL-2.1-or-later" LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=12ae7768a65ec8f2e44d930df9cb43fa \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://Documentation/licenses/COPYING.GPL-3.0-or-later;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ + file://${COREBASE}/meta/files/common-licenses/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \ file://Documentation/licenses/COPYING.BSD-3-Clause;md5=58dcd8452651fc8b07d1f65ce07ca8af \ file://Documentation/licenses/COPYING.BSD-4-Clause-UC;md5=263860f8968d8bafa5392cab74285262 \ file://libuuid/COPYING;md5=6d2cafc999feb2c2de84d4d24b23290c \ @@ -35,8 +37,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-check-for-sys-pidfd.h.patch \ - file://0001-configure.ac-Improve-check-for-magic.patch \ " -SRC_URI[sha256sum] = "60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f" +SRC_URI[sha256sum] = "32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb" diff --git a/meta/recipes-core/util-linux/util-linux_2.38.1.bb b/meta/recipes-core/util-linux/util-linux_2.39.bb similarity index 100% rename from meta/recipes-core/util-linux/util-linux_2.38.1.bb rename to meta/recipes-core/util-linux/util-linux_2.39.bb -- 2.40.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182332): https://lists.openembedded.org/g/openembedded-core/message/182332 Mute This Topic: https://lists.openembedded.org/mt/99287313/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
