diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-07-25 00:15:54 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-07-25 00:20:14 +0300 |
commit | b7d2861976669d4f6decc55762ba83fe0371d6d5 (patch) | |
tree | 895805a16305cf31bccbf50b9baa866b232afa49 /poky/meta/recipes-core | |
parent | 5bea8d8239056487ed7ec39d7b1c319c664dcf68 (diff) | |
download | openbmc-b7d2861976669d4f6decc55762ba83fe0371d6d5.tar.xz |
poky: subtree update:968fcf4989..23deb29c1b
Arthur She (1):
igt-gpu-tools: Add PACKAGECONFIG for Chamelium support
Bruce Ashfield (4):
linux-yocto/5.4: update to v5.4.51
linux-yocto-rt/5.4: fix mmdrop stress test issues
kernel-yocto: account for extracted defconfig in elements check
kernel-devsrc: fix on-target module build for v5.8+
Changqing Li (2):
dpkg: change SRC_URI to take dpkg from git
gtk-immodules-cache.bbclass: fix post install scriptlet error
Charlie Davies (1):
u-boot: fix condition to allow use of *.cfg
Chen Qi (1):
rpm: fix nativesdk's default var location
Christian Eggers (2):
avahi: Fix typo in recipe
util-linux: Set license for library sub packages
Daniel Ammann (1):
image.bbclass: improve wording when image size exceeds the specified limit
Dmitry Baryshkov (1):
gcc-10.1: add fix for PR 96130
Douglas (2):
nativesdk: clear MACHINE_FEATURES
nativesdk: Set the CXXFLAGS to the BUILDSDK_CXXFLAGS
He Zhe (1):
cryptodev-module: Backport a patch to fix build failure with kernel v5.8
Hongxu Jia (1):
e2fsprogs: fix up check for hardlinks always false if inode > 0xFFFFFFFF
Jens Rehsack (3):
subversion: extend for nativesdk
serf: extend for nativesdk
kmod: add packageconfig for xz and ssl
Joshua Watt (8):
virtual/libgbm is the provider of gbm.pc
diffoscope: upgrade 150 -> 151
python3-pycryptodomex: upgrade 3.9.7 -> 3.9.8
python3-pycryptodome: upgrade 3.9.7 -> 3.9.8
classes/reproducible: Move to library code
lib/oe/reproducible: Fix error when no git HEAD
classes/cmake: Fix host detection
classes/package: Use HOST_OS for runtime dependencies
Kamil Dziezyk (1):
qemu: fix for virtfs configuration error in qemu 5.0.0
Kevin Hao (3):
wic/filemap: Drop the unused block_is_unmapped()
wic/filemap: Drop the unused get_unmapped_ranges()
wic/filemap: Fall back to standard copy when no way to get the block map
Khem Raj (4):
go: Disbale CGO for riscv64
go-dep: Fix build on riscv64
musl: Update to latest tip
site: Make sys_siglist default to no
Konrad Weihmann (2):
bitbake: pyshyacc: allow double COMMA statements
ptest: append to FILES
Kurt Kiefer (1):
linux-firmware: add ibt-20 package
Lee Chee Yang (1):
bison: fix Argument list too long error
Mingli Yu (1):
python3: define a profile directory path
Naveen Saini (3):
libva: upgrade 2.7.1 -> 2.8.0
libva-initial: upgrade 2.7.1 -> 2.8.0
libva-utils: upgrade 2.7.1 -> 2.8.0
Oleksandr (1):
expat: Added ptest
Pierre-Jean Texier (1):
u-boot: upgrade 2020.04 -> 2020.07
Rasmus Villemoes (1):
cml1: Move find_cfgs() helper to cml1.bbclass
Ricardo Salveti (1):
sudo: set with-rundir to /run/sudo
Richard Purdie (34):
bitbake: fetch2: Change git fetcher not to destroy old references
oeqa/selftest/sstatetests: Avoid polluting DL_DIR
bitbake: server/process: Fix a rare lockfile race
qemurunner: Ensure pid location is deterministic
qemurunner: Add extra debug info when qemu fails to start
bitbake: server/process: Ensure UI-less servers don't sit in infinite loops
oeqa/utils/qemurunner: Fix missing pid file tracebacks
mpfr: upgrade 4.0.2 -> 4.1.0
libuv: upgrade 1.38.0 -> 1.38.1
btrfs-tools: upgrade 5.6.1 -> 5.7
init-system-helpers: upgrade 1.57 -> 1.58
createrepo-c: upgrade 0.15.11 -> 0.16.0
mtd-utils: upgrade 2.1.1 -> 2.1.2
dpkg: upgrade 1.20.0 -> 1.20.5
python3-cython: upgrade 0.29.20 -> 0.29.21
python3-git: upgrade 3.1.3 -> 3.1.7
asciidoc: upgrade 9.0.0 -> 9.0.1
libnsl2: upgrade 1.2.0 -> 1.3.0
rpcsvc-proto: upgrade 1.4.1 -> 1.4.2
stress-ng: upgrade 0.11.14 -> 0.11.15
epiphany: upgrade 3.36.2 -> 3.36.3
ffmpeg: upgrade 4.3 -> 4.3.1
gnupg: upgrade 2.2.20 -> 2.2.21
mpg123: upgrade 1.26.1 -> 1.26.2
libevent: upgrade 2.1.11 -> 2.1.12
webkitgtk: upgrade 2.28.2 -> 2.28.3
libgcrypt: upgrade 1.8.5 -> 1.8.6
bitbake: server/process: Fix note reference -> info
bitbake: cooker: Fix unmatched files handling leading to misleading warnings
bitbake: build: Allow deltask to take multiple tasknames
pseudo: Update to add OFC fcntl lock updates
oeqa/qemurunner: Add priority/nice information for running processes
bitbake: cooker: Improve multiconfig configuration error reporting
bitbake: cooker: Handle multiconfig name mappings correctly
Robert Yang (1):
openssl: openssl-bin requires openssl-conf to run
Ross Burton (9):
insane: consolidate skipping of temporary do_package files
perf: add PACKAGECONFIG for CoreSight support
autotools: don't special-case help2man-native for dependencies
flex: fix build with autoconf 2.70
nasm: fix build with autoconf 2.70
init-ifupdown: always make machine-specific
insane: improve arch test messages
startup-notification: add time_t type mismatch patch from upstream
gcc: mitigate the Straight-line Speculation attack
Sakib Sajal (5):
qemu: fix CVE-2020-13362
qemu: fix CVE-2020-13659
qemu: fix CVE-2020-13800
qemu: fix CVE-2020-13791
busybox: make hwclock compatible with glibc 2.31
Tanu Kaskinen (2):
alsa-lib: upgrade 1.2.3.1 -> 1.2.3.2
pulseaudio: improve the Thumb frame pointer fix
Taras Kondratiuk (1):
nfs-utils: use rpcgen tool from HOSTTOOLS_DIR
Tim Orling (2):
lib/oe/recipeutils.py: add AUTHOR; BBCLASSEXTEND
scripts/lib/recipetool/create.py: fix regex strings
Wang Mingyu (4):
dbus: upgrade 1.12.18 -> 1.12.20
fribidi: upgrade 1.0.9 -> 1.0.10
glib-2.0: upgrade 2.64.3 -> 2.64.4
libvorbis: upgrade 1.3.6 -> 1.3.7
Yi Zhao (1):
bind: upgrade 9.11.19 -> 9.11.21
Yongxin Liu (2):
linux-firmware: fix the wrong file path for ibt-misc
linux-firmware: move ibt-misc to the end of ibt packages
akuster (3):
cve-check.bbclass: always save cve report
ref-system-requirements: update supported hosts lists
glibc: whitelist CVE-2010-10029
zhengruoqin (1):
gnutls: Fix krb5 code license to GPLv2.1+ to match the LICENSE file.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iae9b13b7fe09bb3c0ab953a063793c95e8b17468
Diffstat (limited to 'poky/meta/recipes-core')
16 files changed, 219 insertions, 23 deletions
diff --git a/poky/meta/recipes-core/busybox/busybox.inc b/poky/meta/recipes-core/busybox/busybox.inc index 6cfdcd7344..45aaa2b41c 100644 --- a/poky/meta/recipes-core/busybox/busybox.inc +++ b/poky/meta/recipes-core/busybox/busybox.inc @@ -133,16 +133,6 @@ do_prepare_config () { fi } -# returns all the elements from the src uri that are .cfg files -def find_cfgs(d): - sources=src_patches(d, True) - sources_list=[] - for s in sources: - if s.endswith('.cfg'): - sources_list.append(s) - - return sources_list - do_configure () { set -x do_prepare_config diff --git a/poky/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch b/poky/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch new file mode 100644 index 0000000000..8d1f272120 --- /dev/null +++ b/poky/meta/recipes-core/busybox/busybox/0001-hwclock-make-glibc-2.31-compatible.patch @@ -0,0 +1,83 @@ +From 5b2fc5746c352eb2b27bfc9fb224580d9852d0fa Mon Sep 17 00:00:00 2001 +From: Sakib Sajal <sakib.sajal@windriver.com> +Date: Fri, 17 Jul 2020 17:27:21 +0000 +Subject: [PATCH] hwclock: make glibc 2.31 compatible + +NEWS for glibc version 2.31 +=========================== + +Deprecated and removed features, and other changes affecting compatibility: + +* The settimeofday function can still be used to set a system-wide + time zone when the operating system supports it. This is because + the Linux kernel reused the API, on some architectures, to describe + a system-wide time-zone-like offset between the software clock + maintained by the kernel, and the "RTC" clock that keeps time when + the system is shut down. + + However, to reduce the odds of this offset being set by accident, + settimeofday can no longer be used to set the time and the offset + simultaneously. If both of its two arguments are non-null, the call + will fail (setting errno to EINVAL). + + Callers attempting to set this offset should also be prepared for + the call to fail and set errno to ENOSYS; this already happens on + the Hurd and on some Linux architectures. The Linux kernel + maintainers are discussing a more principled replacement for the + reused API. After a replacement becomes available, we will change + settimeofday to fail with ENOSYS on all platforms when its 'tzp' + argument is not a null pointer. + + settimeofday itself is obsolescent according to POSIX. Programs + that set the system time should use clock_settime and/or the adjtime + family of functions instead. We may cease to make settimeofday + available to newly linked binaries after there is a replacement for + Linux's time-zone-like offset API. + +hwclock had two calls to settimeofday, in functions to_sys_clock and +set_system_clock_timezone, where both the arguments to settimeofday +were valid (non-null). +Therefore, split the call, once for timezone and once for timeval. + +Fixes #12756 + +Upstream-Status: Pending + +Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> +--- + util-linux/hwclock.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c +index dc97d8f..cf346e8 100644 +--- a/util-linux/hwclock.c ++++ b/util-linux/hwclock.c +@@ -131,8 +131,10 @@ static void to_sys_clock(const char **pp_rtcname, int utc) + + tv.tv_sec = read_rtc(pp_rtcname, NULL, utc); + tv.tv_usec = 0; +- if (settimeofday(&tv, &tz)) +- bb_simple_perror_msg_and_die("settimeofday"); ++ if (settimeofday(NULL, &tz)) ++ bb_simple_perror_msg_and_die("settimeofday: timezone"); ++ if (settimeofday(&tv, NULL)) ++ bb_simple_perror_msg_and_die("settimeofday: timeval"); + } + + static void from_sys_clock(const char **pp_rtcname, int utc) +@@ -283,8 +285,10 @@ static void set_system_clock_timezone(int utc) + gettimeofday(&tv, NULL); + if (!utc) + tv.tv_sec += tz.tz_minuteswest * 60; +- if (settimeofday(&tv, &tz)) +- bb_simple_perror_msg_and_die("settimeofday"); ++ if (settimeofday(NULL, &tz)) ++ bb_simple_perror_msg_and_die("settimeofday: timezone"); ++ if (settimeofday(&tv, NULL)) ++ bb_simple_perror_msg_and_die("settimeofday: timeval"); + } + + //usage:#define hwclock_trivial_usage +-- +2.24.1 + diff --git a/poky/meta/recipes-core/busybox/busybox_1.32.0.bb b/poky/meta/recipes-core/busybox/busybox_1.32.0.bb index 0dfdfdb549..aeea40fbc1 100644 --- a/poky/meta/recipes-core/busybox/busybox_1.32.0.bb +++ b/poky/meta/recipes-core/busybox/busybox_1.32.0.bb @@ -43,6 +43,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ + file://0001-hwclock-make-glibc-2.31-compatible.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " diff --git a/poky/meta/recipes-core/dbus/dbus-test_1.12.18.bb b/poky/meta/recipes-core/dbus/dbus-test_1.12.20.bb index 755c841bad..755c841bad 100644 --- a/poky/meta/recipes-core/dbus/dbus-test_1.12.18.bb +++ b/poky/meta/recipes-core/dbus/dbus-test_1.12.20.bb diff --git a/poky/meta/recipes-core/dbus/dbus.inc b/poky/meta/recipes-core/dbus/dbus.inc index 3bdb7ea4ff..dcbcc0a9d6 100644 --- a/poky/meta/recipes-core/dbus/dbus.inc +++ b/poky/meta/recipes-core/dbus/dbus.inc @@ -10,8 +10,8 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "4ca570c281be35d0b30ab83436712242" -SRC_URI[sha256sum] = "64cf4d70840230e5e9bc784d153880775ab3db19d656ead8a0cb9c0ab5a95306" +SRC_URI[md5sum] = "dfe8a71f412e0b53be26ed4fbfdc91c4" +SRC_URI[sha256sum] = "f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe" EXTRA_OECONF = "--disable-xml-docs \ --disable-doxygen-docs \ diff --git a/poky/meta/recipes-core/dbus/dbus_1.12.18.bb b/poky/meta/recipes-core/dbus/dbus_1.12.20.bb index cf6f7dc0ef..cf6f7dc0ef 100644 --- a/poky/meta/recipes-core/dbus/dbus_1.12.18.bb +++ b/poky/meta/recipes-core/dbus/dbus_1.12.20.bb diff --git a/poky/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch b/poky/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch new file mode 100644 index 0000000000..c5c18ead74 --- /dev/null +++ b/poky/meta/recipes-core/expat/expat/0001-Add-output-of-tests-result.patch @@ -0,0 +1,83 @@ +From aa84835a00bfd65e784d58411e76f60658e939dc Mon Sep 17 00:00:00 2001 +From: Oleksandr Popovych <oleksandr.s.popovych@globallogic.com> +Date: Tue, 18 Feb 2020 19:04:55 +0200 +Subject: [PATCH] Add output of tests result + +Added console output of testing results in form 'RESULT: TEST_NAME'. + +Changed verbose mode of test application set by '-v' ('--verbose') +argument to CK_NORMAL. +Added new supported argument '-vv' ('--extra-verbose') that changes +verbose mode of test application to CK_VERBOSE. Results of each test +are shown in output only if this mode is set. + +Upstream-Status: Denied + +This patch changes potentially deprecated feature that shoud be changed +in upstream. [https://github.com/libexpat/libexpat/issues/382] + +Signed-off-by: Oleksandr Popovych <oleksandr.s.popovych@globallogic.com> +--- + tests/minicheck.c | 10 +++++++++- + tests/runtests.c | 4 +++- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/expat/tests/minicheck.c b/expat/tests/minicheck.c +index a5a1efb..94fa412 100644 +--- a/tests/minicheck.c ++++ b/tests/minicheck.c +@@ -164,6 +164,8 @@ srunner_run_all(SRunner *runner, int verbosity) { + if (tc->setup != NULL) { + /* setup */ + if (setjmp(env)) { ++ if (verbosity >= CK_VERBOSE) ++ printf("SKIP: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -171,6 +173,8 @@ srunner_run_all(SRunner *runner, int verbosity) { + } + /* test */ + if (setjmp(env)) { ++ if (verbosity >= CK_VERBOSE) ++ printf("FAIL: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } +@@ -178,12 +182,16 @@ srunner_run_all(SRunner *runner, int verbosity) { + + /* teardown */ + if (tc->teardown != NULL) { +- if (setjmp(env)) { ++ if (setjmp(env)) { ++ if (verbosity >= CK_VERBOSE) ++ printf("PASS: %s\n", _check_current_function); + add_failure(runner, verbosity); + continue; + } + tc->teardown(); + } ++ if (verbosity >= CK_VERBOSE) ++ printf("PASS: %s\n", _check_current_function); + } + tc = tc->next_tcase; + } +diff --git a/tests/runtests.c b/expat/tests/runtests.c +index 7791fe0..75724e5 100644 +--- a/tests/runtests.c ++++ b/tests/runtests.c +@@ -11619,9 +11619,11 @@ main(int argc, char *argv[]) { + for (i = 1; i < argc; ++i) { + char *opt = argv[i]; + if (strcmp(opt, "-v") == 0 || strcmp(opt, "--verbose") == 0) +- verbosity = CK_VERBOSE; ++ verbosity = CK_NORMAL; + else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0) + verbosity = CK_SILENT; ++ else if (strcmp(opt, "-vv") == 0 || strcmp(opt, "--extra-verbose") == 0) ++ verbosity = CK_VERBOSE; + else { + fprintf(stderr, "runtests: unknown option '%s'\n", opt); + return 2; +-- +2.17.1 diff --git a/poky/meta/recipes-core/expat/expat/run-ptest b/poky/meta/recipes-core/expat/expat/run-ptest new file mode 100644 index 0000000000..1b39cec8e5 --- /dev/null +++ b/poky/meta/recipes-core/expat/expat/run-ptest @@ -0,0 +1,23 @@ +#!/bin/bash + +output=${1:-"expat_tests.log"} # default log file + +# logging function +function testCheck() { + testExec="$1" + shift + echo && echo ${testExec} && ./${testExec} "$@" + error=$? + result=$([[ ${error} -eq 0 ]] && echo "PASS" || echo "FAIL") + echo "${result}: ${testExec}" && echo "============================" +} + +export output +export -f testCheck +TIME=$(which time) + +echo "Architecture: $(uname -m)" > ${output} +echo "Image: $(uname -sr)" >> ${output} +${TIME} -f 'Execution time: %e s' bash -c "testCheck runtests -vv" |& tee -a ${output} +${TIME} -f 'Execution time: %e s' bash -c "testCheck runtestspp -vv" |& tee -a ${output} +echo diff --git a/poky/meta/recipes-core/expat/expat_2.2.9.bb b/poky/meta/recipes-core/expat/expat_2.2.9.bb index 8f3db41352..f477f99baf 100644 --- a/poky/meta/recipes-core/expat/expat_2.2.9.bb +++ b/poky/meta/recipes-core/expat/expat_2.2.9.bb @@ -8,15 +8,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://libtool-tag.patch \ + file://run-ptest \ + file://0001-Add-output-of-tests-result.patch \ " SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" SRC_URI[sha256sum] = "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" -inherit autotools lib_package +EXTRA_OECMAKE_class-native += "-DEXPAT_BUILD_DOCS=OFF" -do_configure_prepend () { - rm -f ${S}/conftools/libtool.m4 +RDEPENDS_${PN}-ptest += "bash" + +inherit cmake lib_package ptest + +do_install_ptest_class-target() { + install -m 755 ${B}/tests/* ${D}${PTEST_PATH} } -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND += "native nativesdk" diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.64.3.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.64.4.bb index 2e5f7a0e2a..e4c834caf2 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.64.3.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.64.4.bb @@ -20,8 +20,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "ccc48e58545cac45f5b3df3b8aeaff13" -SRC_URI[sha256sum] = "fe9cbc97925d14c804935f067a3ad77ef55c0bbe9befe68962318f5a767ceb22" +SRC_URI[md5sum] = "0a4f67e9a9d729976e2f797e36fc1a57" +SRC_URI[sha256sum] = "f7e0b325b272281f0462e0f7fff25a833820cac19911ff677251daf6d87bce50" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. diff --git a/poky/meta/recipes-core/glibc/glibc_2.31.bb b/poky/meta/recipes-core/glibc/glibc_2.31.bb index 61679e2c1c..9b2cf1bdeb 100644 --- a/poky/meta/recipes-core/glibc/glibc_2.31.bb +++ b/poky/meta/recipes-core/glibc/glibc_2.31.bb @@ -1,6 +1,8 @@ require glibc.inc require glibc-version.inc +CVE_CHECK_WHITELIST += "CVE-2020-10029" + DEPENDS += "gperf-native bison-native make-native" NATIVESDKFIXES ?= "" diff --git a/poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb index 733ae41f20..b6fc8a4d41 100644 --- a/poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +++ b/poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb @@ -34,7 +34,7 @@ do_install_append_qemuall () { touch ${D}${sysconfdir}/network/nm-disabled-eth0 } -PACKAGE_ARCH_qemuall = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${MACHINE_ARCH}" RDEPENDS_${PN} = "netbase" RCONFLICTS_${PN} = "netbase (< 1:5.0)" diff --git a/poky/meta/recipes-core/initscripts/init-system-helpers_1.57.bb b/poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb index e41ac21a28..b591f412c6 100644 --- a/poky/meta/recipes-core/initscripts/init-system-helpers_1.57.bb +++ b/poky/meta/recipes-core/initscripts/init-system-helpers_1.58.bb @@ -16,7 +16,7 @@ SECTION = "base" LICENSE = "BSD-3-Clause & GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=ee2b1830fcfead84d07bc060ec43e072" -SRCREV = "760c625ec0e1ffebec2e391d891d389da0f65726" +SRCREV = "6a1860c6f5ad295af605ddf588933544e7c24ce1" SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-core/musl/musl.inc b/poky/meta/recipes-core/musl/musl.inc index bdce412162..54edfc88e5 100644 --- a/poky/meta/recipes-core/musl/musl.inc +++ b/poky/meta/recipes-core/musl/musl.inc @@ -9,7 +9,7 @@ standards-conformance and safety." HOMEPAGE = "http://www.musl-libc.org/" LICENSE = "MIT" SECTION = "libs" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f95ee848a08ad253c04723da00cedb01" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" INHIBIT_DEFAULT_DEPS = "1" diff --git a/poky/meta/recipes-core/musl/musl_git.bb b/poky/meta/recipes-core/musl/musl_git.bb index 0913b09aaf..ed2178b5a4 100644 --- a/poky/meta/recipes-core/musl/musl_git.bb +++ b/poky/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "fca7428c096066482d8c3f52450810288e27515c" +SRCREV = "0a005f499cf39822166dd4db3d2d31f0639f1b1b" BASEVER = "1.2.0" diff --git a/poky/meta/recipes-core/util-linux/util-linux.inc b/poky/meta/recipes-core/util-linux/util-linux.inc index 532cceb935..06fbf7a229 100644 --- a/poky/meta/recipes-core/util-linux/util-linux.inc +++ b/poky/meta/recipes-core/util-linux/util-linux.inc @@ -7,6 +7,11 @@ disk partitioning, kernel message management, filesystem creation, and system lo SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" +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 \ @@ -16,7 +21,10 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da 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" + file://libblkid/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ + file://libfdisk/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ + file://libsmartcols/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 |