[OE-core][dunfell 00/15] Patch review

[OE-core][dunfell 00/15] Patch review

[Steve Sakoman]

Please review these changes for dunfell and have comments back
by end of day Wednesday.

Passed a-full build on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/1157

The following changes since commit cabaf5654db5db12b6576ef0ebae9bc7b422a8ca:

  iso-codes: switch upstream branch master -> main (2020-07-07 07:07:06 -1000)

are available in the Git repository at:

  git://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut

Alexander Kanavin (2):
  gobject-introspection: add a patch to fix a build race
  icu: make filtered data generation optional, serial and off by default

Andrey Zhizhikin (1):
  kernel/yocto: fix search for defconfig from src_uri

Bjarne Michelsen (1):
  devtool: default to empty string, if LIC_FILES_CHKSUM is not available

Bruce Ashfield (2):
  kernel/yocto: ensure that defconfigs are processed first
  linux-yocto/5.4: update to v5.4.50

Christian Eggers (1):
  libnl: Extend for native/nativesdk

Hannu Lounento (1):
  openssl: move ${libdir}/[...]/openssl.cnf to ${PN}-conf

Joshua Watt (2):
  classes/archiver: run do_unpack_and_patch after do_preconfigure
  classes/archive: do_configure should not depend on do_ar_patched

Konrad Weihmann (1):
  systemd: remove kernel-install from base pkg

Rasmus Villemoes (1):
  coreutils: don't split stdbuf to own package with single-binary

Timon Ulrich (2):
  kernel.bbclass: add lz4 dependency and fix the call to lz4
  kernel.bbclass: make dependency on lzop-native conditional

Vacek, Patrick (1):
  oeqa/core/loader: fix regex to include numbers

 meta/classes/archiver.bbclass                 |  4 +--
 meta/classes/kernel-yocto.bbclass             | 34 ++++++++++++-------
 meta/classes/kernel.bbclass                   |  6 ++--
 meta/lib/oeqa/core/loader.py                  |  2 +-
 .../openssl/openssl_1.1.1g.bb                 |  4 ++-
 meta/recipes-core/coreutils/coreutils_8.31.bb | 15 ++++++--
 meta/recipes-core/systemd/systemd_244.3.bb    |  1 -
 ...ency-for-g-ir-compiler-for-building-.patch | 33 ++++++++++++++++++
 .../gobject-introspection_1.62.0.bb           |  1 +
 .../linux/linux-yocto-rt_5.4.bb               |  6 ++--
 .../linux/linux-yocto-tiny_5.4.bb             |  8 ++---
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  | 22 ++++++------
 meta/recipes-support/icu/icu.inc              |  4 ++-
 meta/recipes-support/icu/icu_66.1.bb          |  6 +++-
 meta/recipes-support/libnl/libnl_3.5.0.bb     |  2 ++
 scripts/lib/devtool/upgrade.py                |  4 +--
 16 files changed, 109 insertions(+), 43 deletions(-)
 create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch

-- 
2.17.1

[OE-core][dunfell 01/15] gobject-introspection: add a patch to fix a build race

[Steve Sakoman]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1d6ffc795fc815509e193b28df3a33cc72bfb31b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 ...ency-for-g-ir-compiler-for-building-.patch | 33 +++++++++++++++++++
 .../gobject-introspection_1.62.0.bb           |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch

diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch
new file mode 100644
index 0000000000..adb357b5ec
--- /dev/null
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch
@@ -0,0 +1,33 @@
+From 56ba5656258b82dbc069ab3a61e597c931a16a83 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 17 Jun 2020 11:43:16 +0200
+Subject: [PATCH] gir: add a dependency for g-ir-compiler for building .girs
+
+meson inserts the dependency if the compiler is used directly, but
+fails to do so if the compiler is run through a wrapper. This leads
+to build race errors between building the compiler and using it.
+
+Fix provided by Quentin Schulz <quentin.schulz@streamunlimited.com>
+
+Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/228]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ gir/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gir/meson.build b/gir/meson.build
+index b37fdb81..557e5517 100644
+--- a/gir/meson.build
++++ b/gir/meson.build
+@@ -448,7 +448,7 @@ foreach gir : gir_files
+   typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(),
+     input: gir,
+     output: '@BASENAME@.typelib',
+-    depends: [gobject_gir, ],
++    depends: [gobject_gir, gircompiler, ],
+     command: gircompiler_command,
+     install: true,
+     install_dir: typelibdir,
+-- 
+2.27.0
+
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
index b1371776af..92b0d1d52f 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
@@ -22,6 +22,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
            file://0001-Port-cross-compilation-support-to-meson.patch \
            file://0001-meson.build-disable-tests-when-cross-compiling.patch \
            file://0001-Fix-build-reproducibility.patch \
+           file://0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch \
            "
 
 SRC_URI[md5sum] = "37278eab3704e42234b6080b8cf241f1"
-- 
2.17.1

[OE-core][dunfell 02/15] icu: make filtered data generation optional, serial and off by default

[Steve Sakoman]

From: Alexander Kanavin <alex.kanavin@gmail.com>

Backported from master with two differences:

1. Move exit in do_make_icudata_class-target after big endian patch
application (not required for master since new upstream icu includes
the patch)

2. In do_install_append_class-target test for existence of .dat input
file before calling icupkg

icu data generation was found to be racy, and causig AB failures;
making it serial and leaving it on is not an option as it regresses
to several minutes.

The specific bug is that rules.mk has:

LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH  ../bin/gencnval -s . -d ./out/build/icudt66l mappings/convrtrs.txt

which creates a file and numerous rules like

LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH  ../bin/genrb -s ./misc -d ./out/build/icudt67l -i ./out/build/icudt67l -k -q numberingSystems.txt

which quietly read it. There is no prerequisite for the former to complete first.

The race is extra complicated to fix as rules.mk is itself
generated through a custom in-tree python tool.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit df89e8d1136fd406ba35ae573e2cb0cfc88c6aad)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-support/icu/icu.inc     | 4 +++-
 meta/recipes-support/icu/icu_66.1.bb | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index 6d9728903d..670cbedbcb 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -59,7 +59,9 @@ do_install_append_class-target() {
     # Use icupkg to re-generate it.
     if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then
         rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
-        icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
+	if [ -f ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ]; then
+		icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
+	fi
     fi
 	
 	# Remove build host references...
diff --git a/meta/recipes-support/icu/icu_66.1.bb b/meta/recipes-support/icu/icu_66.1.bb
index a8096c1840..08254648e4 100644
--- a/meta/recipes-support/icu/icu_66.1.bb
+++ b/meta/recipes-support/icu/icu_66.1.bb
@@ -40,11 +40,15 @@ UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases"
 
 EXTRA_OECONF_append_libc-musl = " ac_cv_func_strtod_l=no"
 
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[make-icudata] = ",,,"
+
 do_make_icudata_class-target () {
     cd ${S}
     rm -rf data
     cp -a ${WORKDIR}/data .
     patch -p1 < ${WORKDIR}/0001-Fix-big-endian-build.patch
+    ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)}
     AR='${BUILD_AR}' \
     CC='${BUILD_CC}' \
     CPP='${BUILD_CPP}' \
@@ -56,7 +60,7 @@ do_make_icudata_class-target () {
     LDFLAGS='${BUILD_LDFLAGS}' \
     ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \
     ./runConfigureICU Linux --with-data-packaging=archive
-    oe_runmake ${PARALLEL_MAKE}
+    oe_runmake
     install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat
 }
 
-- 
2.17.1

[OE-core][dunfell 03/15] classes/archiver: run do_unpack_and_patch after do_preconfigure

[Steve Sakoman]

From: Joshua Watt <JPEWhacker@gmail.com>

The commit 8a7c779487 ("classes/archiver: Create patched archive before
configuring") fixed a race condition when using the archiver, but
introduced a bug where the GCC source would occasionally be deleted due
to the archiving code running before do_preconfigure. Instead, make sure
the archiving code runs after do_preconfigure by making
do_unpack_and_patch depend on it. This makes more sense anyway since
do_preconfigure is effectively an extension of do_patch.

This fixes errors like:

 cat: .../gcc/defaults.h: No such file or directory

when making certain configuration changes

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d4be264061023ae0ea6e023d82a7b99605bfc22c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/classes/archiver.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index a8d3afcbe9..bf275f4543 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -583,8 +583,8 @@ do_deploy_archives[sstate-outputdirs] = "${DEPLOY_DIR_SRC}"
 addtask do_deploy_archives_setscene
 
 addtask do_ar_original after do_unpack
-addtask do_unpack_and_patch after do_patch
-addtask do_ar_patched after do_unpack_and_patch before do_preconfigure do_configure
+addtask do_unpack_and_patch after do_patch do_preconfigure
+addtask do_ar_patched after do_unpack_and_patch before do_configure
 addtask do_ar_configured after do_unpack_and_patch
 addtask do_ar_mirror after do_fetch
 addtask do_dumpdata
-- 
2.17.1

[OE-core][dunfell 04/15] classes/archive: do_configure should not depend on do_ar_patched

[Steve Sakoman]

From: Joshua Watt <JPEWhacker@gmail.com>

The commit d4be264061 ("classes/archiver: run do_unpack_and_patch after
do_preconfigure") correctly moved do_unpack_and_patch to depend on
do_preconfigure, but left do_ar_patched as a dependency of do_configure
introduced from 8a7c779487 ("classes/archiver: Create patched archive
before configuring"). Having do_configure depend on do_ar_patched is
blatantly wrong. Firstly, doing so causes the taskhash of do_configure
to change which is undesirable. Secondly, the anon python that sets up
the tasks carefully skips GCC recipes that depend on gcc-source to
provide their source code since running do_unpack_and_patch in them
would delete the source code. Adding in the dependency effectively
bypasses this and makes these recipes delete the shared gcc-source

This fixes errors (for real this time) like:

 cat: .../gcc/defaults.h: No such file or directory

when making certain configuration changes.

For posterity, you could easily reproduce gcc-source being erased by
running the commands (replacing aarch64 with your correct target arch):

 bitbake -c cleanall gcc-source gcc-cross-aarch64
 bitbake -c do_deploy_archives gcc-source

 # The following would fail because
 # gcc-cross-aarch64:do_unpack_and_patch erases shared source, so
 # do_configure after that fails.
 bitbake gcc-cross-aarch64

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f02c1904330da47a25cf85f0077712f584f4ee5b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/classes/archiver.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index bf275f4543..1a3c190604 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -584,7 +584,7 @@ addtask do_deploy_archives_setscene
 
 addtask do_ar_original after do_unpack
 addtask do_unpack_and_patch after do_patch do_preconfigure
-addtask do_ar_patched after do_unpack_and_patch before do_configure
+addtask do_ar_patched after do_unpack_and_patch
 addtask do_ar_configured after do_unpack_and_patch
 addtask do_ar_mirror after do_fetch
 addtask do_dumpdata
-- 
2.17.1

[OE-core][dunfell 05/15] kernel/yocto: ensure that defconfigs are processed first

[Steve Sakoman]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

It is uncommon that a BSP definition and a defconfig are used in
a single configuration. That being said, it is a valid way to
organize kernel configuration meta data.

When a defconfig is used, either on the src_uri or from in
the kernel tree, it is normally expected that it is the baseline,
with all options applied on top of it.

With this commit, we detect either type of defconfig and ensure
that it is used first, followed by the fragments in their
previous order. This allows existing configuration stacks to
remain the same, while ensuring that a defconfig combined stack
works as expected.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e6845327b69396d843a2f3c4c3ac9400ae9caedf)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/classes/kernel-yocto.bbclass | 33 ++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 5bc627066e..41d8620e67 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -131,7 +131,7 @@ do_kernel_metadata() {
 			else
 				cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
 			fi
-			sccs="${WORKDIR}/defconfig"
+			in_tree_defconfig="${WORKDIR}/defconfig"
 		else
 			bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree"
 		fi
@@ -153,14 +153,24 @@ do_kernel_metadata() {
 	patches="${@" ".join(find_patches(d,''))}"
 	feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
 
-	# a quick check to make sure we don't have duplicate defconfigs
-	# If there's a defconfig in the SRC_URI, did we also have one from
-	# the KBUILD_DEFCONFIG processing above ?
-	if [ -n "$sccs" ]; then
-	    # we did have a defconfig from above. remove any that might be in the src_uri
-	    sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
+	# a quick check to make sure we don't have duplicate defconfigs If
+	# there's a defconfig in the SRC_URI, did we also have one from the
+	# KBUILD_DEFCONFIG processing above ?
+	src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
+	# drop and defconfig's from the src_uri variable, we captured it just above here if it existed
+	sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
+	if [ -n "$in_tree_defconfig" ]; then
+		sccs_defconfig=$in_tree_defconfig
+		if [ -n "$src_uri_defconfig" ]; then
+			bbwarn "[NOTE]: defconfig was supplied both via KBUILD_DEFCONFIG and SRC_URI. Dropping SRC_URI defconfig"
+		fi
+	else
+		# if we didn't have an in-tree one, make our defconfig the one
+		# from the src_uri. Note: there may not have been one from the
+		# src_uri, so this can be an empty variable.
+		sccs_defconfig=$src_uri_defconfig
 	fi
-	sccs="$sccs $sccs_from_src_uri"
+	sccs="$sccs_from_src_uri"
 
 	# check for feature directories/repos/branches that were part of the
 	# SRC_URI. If they were supplied, we convert them into include directives
@@ -187,11 +197,10 @@ do_kernel_metadata() {
 	# expand kernel features into their full path equivalents
 	bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
 	if [ -z "$bsp_definition" ]; then
-		echo "$sccs" | grep -q defconfig
-		if [ $? -ne 0 ]; then
+		if [ -z "$sccs_defconfig" ]; then
 			bbfatal_log "Could not locate BSP definition for ${KMACHINE}/${LINUX_KERNEL_TYPE} and no defconfig was provided"
 		fi
-
+	else
 		# if the bsp definition has "define KMETA_EXTERNAL_BSP t",
 		# then we need to set a flag that will instruct the next
 		# steps to use the BSP as both configuration and patches.
@@ -206,7 +215,7 @@ do_kernel_metadata() {
 	elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
 	if [ -n "${elements}" ]; then
 		echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
-		scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
+		scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches ${KERNEL_FEATURES}
 		if [ $? -ne 0 ]; then
 			bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
 		fi
-- 
2.17.1

[OE-core][dunfell 06/15] kernel/yocto: fix search for defconfig from src_uri

[Steve Sakoman]

From: Andrey Zhizhikin <andrey.z@gmail.com>

Fetcher provides full paths to defconfig and scc files, which awk
comparison operator does not catch during construction of
src_uri_defconfig and sccs_from_src_uri lists. This causes the
src_uri_defconfig variable to come out empty, and fails further
validation if defconfig is only supplied via SRC_URI.

Replace comparison operator with awk match function which searches for
sub-string during filtering, effectively placing defconfig from SRC_URI
into src_uri_defconfig and scc files in sccs_from_src_uri respectively.

Fixes: 23dcff0d396c (kernel/yocto: ensure that defconfigs are processed first)
Cc: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f52ce0fa98bf3bd72df7467031001f3128c145f2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/classes/kernel-yocto.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 41d8620e67..54a1a1627a 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -156,9 +156,10 @@ do_kernel_metadata() {
 	# a quick check to make sure we don't have duplicate defconfigs If
 	# there's a defconfig in the SRC_URI, did we also have one from the
 	# KBUILD_DEFCONFIG processing above ?
-	src_uri_defconfig=$(echo $sccs_from_src_uri | awk '{ if ($0=="defconfig") { print $0 } }' RS=' ')
+	src_uri_defconfig=$(echo $sccs_from_src_uri | awk '(match($0, "defconfig") != 0) { print $0 }' RS=' ')
 	# drop and defconfig's from the src_uri variable, we captured it just above here if it existed
-	sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '{ if ($0!="defconfig") { print $0 } }' RS=' ')
+	sccs_from_src_uri=$(echo $sccs_from_src_uri | awk '(match($0, "defconfig") == 0) { print $0 }' RS=' ')
+
 	if [ -n "$in_tree_defconfig" ]; then
 		sccs_defconfig=$in_tree_defconfig
 		if [ -n "$src_uri_defconfig" ]; then
-- 
2.17.1

[OE-core][dunfell 07/15] kernel.bbclass: add lz4 dependency and fix the call to lz4

[Steve Sakoman]

From: Timon Ulrich <t.ulrich@anapur.de>

If the initramfs image is type lz4, then a native lz4 is needed.

Additionally an output filename needs to be specified when calling lz4,
otherwise STDOUT will be used implicitly.

Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c83a7aec59defbbc049d44ba34a7a409ada4fa19)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/classes/kernel.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 6d07b29e2d..9e3c34ad48 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -5,6 +5,7 @@ KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel")
 
 PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }"
 DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native bison-native"
+DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", "lz4-native", "", d)}"
 PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
 
 do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot"
@@ -210,7 +211,7 @@ copy_initramfs() {
 				;;
 			*lz4)
 				echo "lz4 decompressing image"
-				lz4 -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
+				lz4 -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
 				break
 				;;
 			*lzo)
-- 
2.17.1

[OE-core][dunfell 08/15] kernel.bbclass: make dependency on lzop-native conditional

[Steve Sakoman]

From: Timon Ulrich <t.ulrich@anapur.de>

a native lzop is only needed when an lzo compressed initramfs is actually present

Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1217ddf070261c5fe523729b2a833bd38f1e4ccd)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/classes/kernel.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 9e3c34ad48..af7e88b380 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -4,7 +4,8 @@ KERNEL_PACKAGE_NAME ??= "kernel"
 KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }"
 
 PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }"
-DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native bison-native"
+DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native bison-native"
+DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lzo", "lzop-native", "", d)}"
 DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", "lz4-native", "", d)}"
 PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
 
-- 
2.17.1

[OE-core][dunfell 09/15] systemd: remove kernel-install from base pkg

[Steve Sakoman]

From: Konrad Weihmann <kweihmann@outlook.com>

as this is already packaged in kernel-install package,
it shouldn't be part of the base package

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ed04241f30e12e7c0479026a9e354e49dfa4119c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-core/systemd/systemd_244.3.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb
index 341ac6bbc5..c52a01b2dd 100644
--- a/meta/recipes-core/systemd/systemd_244.3.bb
+++ b/meta/recipes-core/systemd/systemd_244.3.bb
@@ -536,7 +536,6 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${bindir}/resolvectl \
                 ${bindir}/timedatectl \
                 ${bindir}/bootctl \
-                ${bindir}/kernel-install \
                 ${exec_prefix}/lib/tmpfiles.d/*.conf \
                 ${exec_prefix}/lib/systemd \
                 ${exec_prefix}/lib/modules-load.d \
-- 
2.17.1

[OE-core][dunfell 10/15] oeqa/core/loader: fix regex to include numbers

[Steve Sakoman]

From: "Vacek, Patrick" <patrick.vacek@here.com>

The previous version only included the numbers 1 and 2 in the allowed characters
for the module name. In the past, this was (\w+) so all numbers were allowed.
Now it explicitly includes all numbers again.

Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f241fa493536ac953c1dac303917c6e75b459e28)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/lib/oeqa/core/loader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py
index 73c5788508..11978213b8 100644
--- a/meta/lib/oeqa/core/loader.py
+++ b/meta/lib/oeqa/core/loader.py
@@ -46,7 +46,7 @@ def _built_modules_dict(modules):
     for module in modules:
         # Assumption: package and module names do not contain upper case
         # characters, whereas class names do
-        m = re.match(r'^([1-2a-z_.]+)(?:\.(\w[^.]*)(?:\.([^.]+))?)?$', module, flags=re.ASCII)
+        m = re.match(r'^([0-9a-z_.]+)(?:\.(\w[^.]*)(?:\.([^.]+))?)?$', module, flags=re.ASCII)
         if not m:
             continue
 
-- 
2.17.1

[OE-core][dunfell 11/15] linux-yocto/5.4: update to v5.4.50

[Steve Sakoman]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

Updating linux-yocto/5.4 to the latest korg -stable release that comprises
the following commits:

    e75220890bf6 Linux 5.4.50
    a160afebd779 Revert "tty: hvc: Fix data abort due to race in hvc_open"
    ffd40b7962d4 xfs: add agf freeblocks verify in xfs_agf_verify
    cc66553004f4 dm writecache: add cond_resched to loop in persistent_memory_claim()
    a51e71cbf6e6 dm writecache: correct uncommitted_block when discarding uncommitted entry
    de1d70dad6f2 xprtrdma: Fix handling of RDMA_ERROR replies
    4d35ca872ac3 NFSv4 fix CLOSE not waiting for direct IO compeletion
    02917bef8f1b pNFS/flexfiles: Fix list corruption if the mirror count changes
    7b99577ff376 SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment()
    c27d205baa82 sunrpc: fixed rollback in rpc_gssd_dummy_populate()
    60bdb51d44fa Staging: rtl8723bs: prevent buffer overflow in update_sta_support_rate()
    c6f88afa6ae1 drm/amdgpu: add fw release for sdma v5_0
    05124abe1fb0 drm/radeon: fix fb_div check in ni_init_smc_spll_table()
    834a3aa2ceb4 drm: rcar-du: Fix build error
    176a3c488476 drm/amd: fix potential memleak in err branch
    0b3cc973f16f ring-buffer: Zero out time extend if it is nested and not absolute
    9a59a88b3d31 tracing: Fix event trigger to accept redundant spaces
    c036eb65fdfc arm64: dts: imx8mn-ddr4-evk: correct ldo1/ldo2 voltage range
    90bd9c611f21 arm64: dts: imx8mm-evk: correct ldo1/ldo2 voltage range
    73f79b420bd0 arm64: perf: Report the PC value in REGS_ABI_32 mode
    7a9e3e25a9d2 mm/memcontrol.c: add missed css_put()
    ff6aff13a8cf ocfs2: fix panic on nfs server over ocfs2
    a8d82ebaee97 ocfs2: fix value of OCFS2_INVALID_SLOT
    4685df862c8b ocfs2: load global_inode_alloc
    7fa716a594a6 ocfs2: avoid inode removal while nfsd is accessing it
    fbca1aee1397 mm/slab: use memzero_explicit() in kzfree()
    a79c3a99ac81 btrfs: fix failure of RWF_NOWAIT write into prealloc extent beyond eof
    863a197f7f10 btrfs: check if a log root exists before locking the log_mutex on unlink
    53a081661047 btrfs: fix data block group relocation failure due to concurrent scrub
    0a4dfc69ea7e btrfs: fix bytes_may_use underflow when running balance and scrub in parallel
    df13086490db x86/asm/64: Align start of __clear_user() loop to 16-bytes
    3ceaf206b706 x86/cpu: Use pinning mask for CR4 bits needing to be 0
    96a80133559f KVM: VMX: Stop context switching MSR_IA32_UMWAIT_CONTROL
    8ccc6ac51eac KVM: nVMX: Plumb L2 GPA through to PML emulation
    5774f9fa563b KVM: X86: Fix MSR range of APIC registers in X2APIC mode
    0236040fcf97 erofs: fix partially uninitialized misuse in z_erofs_onlinepage_fixup
    824d0b6225f3 ACPI: configfs: Disallow loading ACPI tables when locked down
    3c4f9a5541bb ACPI: sysfs: Fix pm_profile_attr type
    6ee4d61403d2 ALSA: hda/realtek: Add mute LED and micmute LED support for HP systems
    1a1bc3ae6935 ALSA: hda/realtek - Add quirk for MSI GE63 laptop
    0211e0d7f185 ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table
    f06a6294e113 RISC-V: Don't allow write+exec only page mapping request in mmap
    26b0956cb374 block: update hctx map when use multiple maps
    72647ea37700 blktrace: break out of blktrace setup on concurrent calls
    d14eb5d8f0f4 kprobes: Suppress the suspicious RCU warning on kprobes
    8ed391a3dbc4 recordmcount: support >64k sections
    803d114e8f19 kbuild: improve cc-option to clean up all temporary files
    cbed4eb0a92f arm64: sve: Fix build failure when ARM64_SVE=y and SYSCTL=n
    a9a3b33b20aa s390/vdso: fix vDSO clock_getres()
    68a3cbc44660 s390/vdso: Use $(LD) instead of $(CC) to link vDSO
    7c17909a889d s390/ptrace: fix setting syscall number
    64f7b10a91a4 s390/ptrace: pass invalid syscall numbers to tracing
    453cfe187723 pinctrl: tegra: Use noirq suspend/resume callbacks
    7851257375ae pinctrl: qcom: spmi-gpio: fix warning about irq chip reusage
    8dba9173a37a test_objagg: Fix potential memory leak in error handling
    6fd916e24935 net: alx: fix race condition in alx_remove
    855dbf10c9a7 ibmvnic: Harden device login requests
    07b8b2d46371 hwrng: ks-sa - Fix runtime PM imbalance on error
    b8403f7e45e5 riscv/atomic: Fix sign extension for RV64I
    81616542adcc drm/amd/display: Use kfree() to free rgb_user in calculate_user_regamma_ramp()
    f7f181582f1b ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function
    4dfc238a2441 sata_rcar: handle pm_runtime_get_sync failure cases
    83bdf7f8b712 sched/core: Fix PI boosting between RT and DEADLINE tasks
    3dc7138943b1 sched/deadline: Initialize ->dl_boosted
    bfd4981fe3d6 afs: Fix storage of cell names
    5cee9e67596f i2c: core: check returned size of emulated smbus block read
    4a6e6413059e i2c: fsi: Fix the port number field in status register
    0935afc39797 clk: sifive: allocate sufficient memory for struct __prci_data
    b78bae5ab399 net: bcmgenet: use hardware padding of runt frames
    ae6d80f62c73 netfilter: ipset: fix unaligned atomic access
    8d93603bf60c nvme: don't protect ns mutation with ns->head->lock
    f9dc5e708ab8 usb: renesas_usbhs: getting residue from callback_result
    56ee0ed97df5 usb: gadget: udc: Potential Oops in error handling code
    a3a86515d017 scsi: lpfc: Avoid another null dereference in lpfc_sli4_hba_unset()
    1e812023f478 ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram()
    61f488765dff cxgb4: move handling L2T ARP failures to caller
    065f225ef975 net: qede: fix use-after-free on recovery and AER handling
    f490e70fa7eb net: qede: fix PTP initialization on recovery
    7180c8fc4a03 net: qed: fix excessive QM ILT lines consumption
    32cf4ff4ec52 net: qed: fix NVMe login fails over VFs
    d0717a95a06b net: qede: stop adding events on an already destroyed workqueue
    164d9a15652f net: qed: fix async event callbacks unregistering
    5cf7f0c68405 net: qed: fix left elements count calculation
    33104571648b iommu/vt-d: Update scalable mode paging structure coherency
    ede796e5ac87 iommu/vt-d: Enable PCI ACS for platform opt in hint
    67db9e032b6e selftests/net: report etf errors correctly
    34f45567462d RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads()
    d3edf648f398 s390/qeth: fix error handling for isolation mode cmds
    9e89c2d5da87 ASoC: rockchip: Fix a reference count leak.
    4aeb21584e55 RDMA/cma: Protect bind_list and listen_list while finding matching cm id
    f0078dc6750f RDMA/qedr: Fix KASAN: use-after-free in ucma_event_handler+0x532
    66143ecb9e3c RDMA/rvt: Fix potential memory leak caused by rvt_alloc_rq
    d6fb7f457456 rxrpc: Fix handling of rwind from an ACK packet
    73cff44e66e3 ARM: dts: NSP: Correct FA2 mailbox node
    f1ee7d3a2c1a bpf: Don't return EINVAL from {get,set}sockopt when optlen > PAGE_SIZE
    0f3aa6c6d6ad devmap: Use bpf_map_area_alloc() for allocating hash buckets
    b93df0f6d7cd regmap: Fix memory leak from regmap_register_patch
    5f6b834e110b x86/resctrl: Fix a NULL vs IS_ERR() static checker warning in rdt_cdp_peer_get()
    99ab61cc8b75 ARM: dts: Fix duovero smsc interrupt for suspend
    07f7c547698b ARM: dts: am335x-pocketbeagle: Fix mmc0 Write Protect
    d909f9db0caa bpf, xdp, samples: Fix null pointer dereference in *_user code
    0608288c6caa samples/bpf: xdp_redirect_cpu: Set MAX_CPUS according to NR_CPUS
    b59ed5668c4e ASoC: fsl_ssi: Fix bclk calculation for mono channel
    3947dd237ef5 RDMA/siw: Fix pointer-to-int-cast warning in siw_rx_pbl()
    34f105349369 regualtor: pfuze100: correct sw1a/sw2 on pfuze3000
    1fa27418054f ASoC: qcom: common: set correct directions for dailinks
    47c7ae0ca9d7 ASoc: q6afe: add support to get port direction
    92444a57e365 efi/esrt: Fix reference count leak in esre_create_sysfs_entry.
    8c236ac4376a efi/tpm: Verify event log header before parsing
    e50cf858d118 ASoC: q6asm: handle EOS correctly
    41b2debf35ef xfrm: Fix double ESP trailer insertion in IPsec crypto offload.
    475a7b09b4bb ARM: OMAP2+: Fix legacy mode dss_reset
    527ddb339d6b bus: ti-sysc: Ignore clockactivity unless specified as a quirk
    1f5197a5ad97 bus: ti-sysc: Flush posted write on enable and disable
    21d511c6c9c2 IB/hfi1: Fix module use count flaw due to leftover module put calls
    2a4c0bf5c70e IB/mad: Fix use after free when destroying MAD agent
    588ad2b29ea3 loop: replace kill_bdev with invalidate_bdev
    d9a74e455070 cdc-acm: Add DISABLE_ECHO quirk for Microchip/SMSC chip
    d6522bc320d7 xhci: Return if xHCI doesn't support LPM
    14d46386226e xhci: Fix enumeration issue when setting max packet size for FS devices.
    c09be4f57956 xhci: Fix incorrect EP_STATE_MASK
    e615f58fa86c cifs/smb3: Fix data inconsistent when zero file range
    bd2f2ac0ab96 cifs/smb3: Fix data inconsistent when punch hole
    572a11131ad3 cifs: Fix cached_fid refcnt leak in open_shroot
    1f551a056b30 scsi: zfcp: Fix panic on ERP timeout for previously dismissed ERP action
    d3a251b84797 scsi: qla2xxx: Keep initiator ports after RSCN
    be8df027079b usb: cdns3: ep0: add spinlock for cdns3_check_new_setup
    a0668653be26 usb: cdns3: ep0: fix the test mode set incorrectly
    79175ae5f996 usb: cdns3: trace: using correct dir value
    25e1bb1e6c36 ALSA: usb-audio: Fix OOB access of mixer element list
    1cc2d29710c2 ALSA: usb-audio: add quirk for Samsung USBC Headset (AKG)
    0c4ff206043e ALSA: usb-audio: add quirk for Denon DCD-1500RE
    74a7ad9d975c ALSA: usb-audio: Add implicit feedback quirk for SSL2+.
    895ec8c86e13 usb: typec: tcpci_rt1711h: avoid screaming irq causing boot hangs
    fe2daefad98a usb: host: ehci-exynos: Fix error check in exynos_ehci_probe()
    c1e71a51c2f5 xhci: Poll for U0 after disabling USB2 LPM
    9d814bd14cff usb: host: xhci-mtk: avoid runtime suspend when removing hcd
    9200037a6ab6 USB: ehci: reopen solution for Synopsys HC bug
    ffeb58a0daf0 usb: add USB_QUIRK_DELAY_INIT for Logitech C922
    6b3eb8af48cb usb: dwc2: Postponed gadget registration to the udc class driver
    195c1d1dd8cf USB: ohci-sm501: Add missed iounmap() in remove
    2274a7421e73 binder: fix null deref of proc->context
    3621616af99b ALSA: usb-audio: Fix potential use-after-free of streams
    335add4ac891 fix a braino in "sparc32: fix register window handling in genregs32_[gs]et()"
    32e5a15f1084 net: sched: export __netdev_watchdog_up()
    9d3d40ec7dee btrfs: fix a block group ref counter leak after failure to remove block group
    8ae850cddf27 Revert "i2c: tegra: Fix suspending in active runtime PM state"
    052a7fdd86fb tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT
    942315134313 sch_cake: fix a few style nits
    b1aa7e5fa163 sch_cake: don't call diffserv parsing code when it is not needed
    ea2628dd586d sch_cake: don't try to reallocate or unshare skb unconditionally
    3c6208267218 ip_tunnel: fix use-after-free in ip_tunnel_lookup()
    9baf076d797f net: phy: Check harder for errors in get_phy_id()
    568c5aaf6c2d ip6_gre: fix use-after-free in ip6gre_tunnel_lookup()
    35db638692db tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes
    fe3a5d8fc372 tcp: grow window for OOO packets only for SACK flows
    cb22ce3346f2 tcp: don't ignore ECN CWR on pure ACK
    dc43f7e807a8 sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket
    fea864489c90 rxrpc: Fix notification call on completion of discarded calls
    6956830cf981 rocker: fix incorrect error handling in dma_rings_init
    a908f986ddf7 openvswitch: take into account de-fragmentation/gso_size in execute_check_pkt_len
    27b70214fc69 net: usb: ax88179_178a: fix packet alignment padding
    67571b1ab296 net: increment xmit_recursion level in dev_direct_xmit()
    97a1d2aa6cdd net: Fix the arp error in some cases
    742f2358b324 net: fix memleak in register_netdevice()
    9e693934cd59 net: Do not clear the sock TX queue in sk_set_socket()
    9f217d6dd796 net: core: reduce recursion limit value
    f32325b100ea net: bridge: enfore alignment for ethernet address
    57a976e676e1 mvpp2: ethtool rxtx stats fix
    fa0d7e09da1d mld: fix memory leak in ipv6_mc_destroy_dev()
    009b3e294a90 ibmveth: Fix max MTU limit
    f060107ccc97 geneve: allow changing DF behavior after creation
    ce06fcb6a66d enetc: Fix tx rings bitmap iteration range, irq handling
    b90ca32531bf block/bio-integrity: don't free 'buf' if bio_integrity_add_page() failed

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0ed1c289ceebd66f2bbfd9dfc8deae0985fbf239)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 .../linux/linux-yocto-rt_5.4.bb               |  6 ++---
 .../linux/linux-yocto-tiny_5.4.bb             |  8 +++----
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  | 22 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index e5401587d6..a4b593b96d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "f611b456c071c5898e3762a190b71e3a51b0ad65"
-SRCREV_meta ?= "30814016b37dc93699992221763ad4e2960b02fa"
+SRCREV_machine ?= "6415a4e7c405526f97049ede833f52127a5ce7a1"
+SRCREV_meta ?= "416566e1f01c3c02ca5b3a03d0943df387d521f0"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.4.49"
+LINUX_VERSION ?= "5.4.50"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index fb2d37405d..0622d33835 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.4.49"
+LINUX_VERSION ?= "5.4.50"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine_qemuarm ?= "ddf262a3be1304a97d62bb8f60a0c0ae2b41fdc9"
-SRCREV_machine ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
-SRCREV_meta ?= "30814016b37dc93699992221763ad4e2960b02fa"
+SRCREV_machine_qemuarm ?= "1a8a14e45f01cfee926c5b35d2d67e6f1a7eebfc"
+SRCREV_machine ?= "94667198aabf869571bdff5291a24956796faddf"
+SRCREV_meta ?= "416566e1f01c3c02ca5b3a03d0943df387d521f0"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index fc8c442ef1..2476b3502c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -12,16 +12,16 @@ KBRANCH_qemux86  ?= "v5.4/standard/base"
 KBRANCH_qemux86-64 ?= "v5.4/standard/base"
 KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "93677fbb328db35b696740a0c34e05036e75f1b7"
-SRCREV_machine_qemuarm64 ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
-SRCREV_machine_qemumips ?= "c2068f8b670dce4a8d409981a8993df12b993fd3"
-SRCREV_machine_qemuppc ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
-SRCREV_machine_qemuriscv64 ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
-SRCREV_machine_qemux86 ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
-SRCREV_machine_qemux86-64 ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
-SRCREV_machine_qemumips64 ?= "4c723a6a9eb908e34d228c5a478af237d9baabf8"
-SRCREV_machine ?= "ec485bd4afef57715eb45ba331b04b3f941e43bb"
-SRCREV_meta ?= "30814016b37dc93699992221763ad4e2960b02fa"
+SRCREV_machine_qemuarm ?= "99743105f331e90852ccb9e72ce26134dbcafec6"
+SRCREV_machine_qemuarm64 ?= "94667198aabf869571bdff5291a24956796faddf"
+SRCREV_machine_qemumips ?= "886870e5abaeaaf753fb50a1e5be56336c44c642"
+SRCREV_machine_qemuppc ?= "94667198aabf869571bdff5291a24956796faddf"
+SRCREV_machine_qemuriscv64 ?= "94667198aabf869571bdff5291a24956796faddf"
+SRCREV_machine_qemux86 ?= "94667198aabf869571bdff5291a24956796faddf"
+SRCREV_machine_qemux86-64 ?= "94667198aabf869571bdff5291a24956796faddf"
+SRCREV_machine_qemumips64 ?= "7548abbb409eeef6f0575eed25231090f902559e"
+SRCREV_machine ?= "94667198aabf869571bdff5291a24956796faddf"
+SRCREV_meta ?= "416566e1f01c3c02ca5b3a03d0943df387d521f0"
 
 # remap qemuarm to qemuarma15 for the 5.4 kernel
 # KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.49"
+LINUX_VERSION ?= "5.4.50"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
-- 
2.17.1

[OE-core][dunfell 12/15] openssl: move ${libdir}/[...]/openssl.cnf to ${PN}-conf

[Steve Sakoman]

From: Hannu Lounento <hannu.lounento@vaisala.com>

Some openssl command line operations like creating an X.509 CSR require
the file /usr/lib/ssl-1.1/openssl.cnf to exist and fail if it doesn't

    root@qemux86-64:~# openssl req -out my.csr -new -newkey rsa:2048 -nodes -keyout my.key
    Can't open /usr/lib/ssl-1.1/openssl.cnf for reading, No such file or directory
    140289168594176:error:02001002:system library:fopen:No such file or directory:../openssl-1.1.1g/crypto/bio/bss_file.c:69:fopen('/usr/lib/ssl-1.1/openssl.cnf','r')
    140289168594176:error:2006D080:BIO routines:BIO_new_file:no such file:../openssl-1.1.1g/crypto/bio/bss_file.c:76:

which is the case e.g. in core-image-minimal with just the
package openssl-bin added to the image by declaring

    IMAGE_INSTALL_append = " openssl-bin"

e.g. in local.conf.

The file did not exist in the aforementioned image / configuration
because it was packaged to the main openssl package

    FILES_${PN} =+ "${libdir}/ssl-1.1/*"

(there is no other FILES specification that would match the file either)
and

    path/to/poky/build$ rpm --query --package --list tmp/deploy/rpm/core2_64/openssl-1.1.1g-r0.core2_64.rpm
    [...]
    /usr/lib/ssl-1.1/openssl.cnf
    [...]

Hence move /usr/lib/ssl-1.1/openssl.cnf (and openssl.cnf.dist as it
seems closely related) to the ${PN}-conf package to have it installed
with ${PN}-bin, which already (indirectly) depends on ${PN}-conf.

Note that the openssl recipe has the comment

    Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
    package RRECOMMENDS on this package. This will enable the configuration
    file to be installed for both the openssl-bin package and the libcrypto
    package since the openssl-bin package depends on the libcrypto package.

but openssl-conf only contained /etc/ssl/openssl.cnf

    path/to/poky/build$ rpm --query --package --list tmp/deploy/rpm/core2_64/openssl-conf-1.1.1g-r0.core2_64.rpm
    /etc
    /etc/ssl
    /etc/ssl/openssl.cnf

/usr/lib/ssl-1.1/openssl.cnf is actually only a symlink that points to
../../../etc/ssl/openssl.cnf.

Other files and directories in /usr/lib/ssl-1.1/ were considered as well
because they seem to be configuration files and / or related to
(symlinks pointing to) /etc. They were not moved though, because based
on our use case and testing moving the openssl.cnf symlink is sufficient
for fixing the immediate problem and we lack knowledge about the other
files in order to make a decision to change their packaging.

Signed-off-by: Hannu Lounento <hannu.lounento@vaisala.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c1632d7041fe0c18ec61abfa79a9c025af43c033)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-connectivity/openssl/openssl_1.1.1g.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1g.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1g.bb
index 66fa8f7d0a..47ed6b7640 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1g.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1g.bb
@@ -191,7 +191,9 @@ PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc"
 
 FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
 FILES_libssl = "${libdir}/libssl${SOLIBS}"
-FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
+FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf \
+                      ${libdir}/ssl-1.1/openssl.cnf* \
+                      "
 FILES_${PN}-engines = "${libdir}/engines-1.1"
 FILES_${PN}-misc = "${libdir}/ssl-1.1/misc"
 FILES_${PN} =+ "${libdir}/ssl-1.1/*"
-- 
2.17.1

[OE-core][dunfell 13/15] devtool: default to empty string, if LIC_FILES_CHKSUM is not available

[Steve Sakoman]

From: Bjarne Michelsen <bjarne_michelsen@hotmail.com>

[Bug 13971] https://bugzilla.yoctoproject.org/show_bug.cgi?id=13971

A recipe using LICENSE=CLOSED would normally not have LIC_FILES_CHKSUM
set.
If LIC_FILES_CHKSUM was not set, it would cause `devtool upgrade` to fail.

This fixes the issue by defaulting to an empty string if
LIC_FILES_CHKSUM is not found.

[YOCTO #13971]

Signed-off-by: Bjarne Michelsen <bjarne_michelsen@hotmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 95e112f0f465868e98285509ea0d1a624a439ac2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 scripts/lib/devtool/upgrade.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index cb6dce378a..327916ade3 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -550,12 +550,12 @@ def upgrade(args, config, basepath, workspace):
         try:
             logger.info('Extracting current version source...')
             rev1, srcsubdir1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides)
-            old_licenses = _extract_licenses(srctree, rd.getVar('LIC_FILES_CHKSUM'))
+            old_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or ""))
             logger.info('Extracting upgraded version source...')
             rev2, md5, sha256, srcbranch, srcsubdir2 = _extract_new_source(args.version, srctree, args.no_patch,
                                                     args.srcrev, args.srcbranch, args.branch, args.keep_temp,
                                                     tinfoil, rd)
-            new_licenses = _extract_licenses(srctree, rd.getVar('LIC_FILES_CHKSUM'))
+            new_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or ""))
             license_diff = _generate_license_diff(old_licenses, new_licenses)
             rf, copied = _create_new_recipe(args.version, md5, sha256, args.srcrev, srcbranch, srcsubdir1, srcsubdir2, config.workspace_path, tinfoil, rd, license_diff, new_licenses, srctree, args.keep_failure)
         except bb.process.CmdError as e:
-- 
2.17.1

[OE-core][dunfell 14/15] libnl: Extend for native/nativesdk

[Steve Sakoman]

From: Christian Eggers <ceggers@arri.de>

libnl is required by networkmanager.

Signed-off-by: Christian Eggers <ceggers@arri.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b3c96103a5063eeefb0c537227eab3f77616b9c0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-support/libnl/libnl_3.5.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-support/libnl/libnl_3.5.0.bb b/meta/recipes-support/libnl/libnl_3.5.0.bb
index c0609c4d90..9d0e1441a9 100644
--- a/meta/recipes-support/libnl/libnl_3.5.0.bb
+++ b/meta/recipes-support/libnl/libnl_3.5.0.bb
@@ -40,3 +40,5 @@ FILES_${PN}-route = "${libdir}/libnl-route-3.so.*"
 FILES_${PN}-xfrm  = "${libdir}/libnl-xfrm-3.so.*"
 RREPLACES_${PN}-genl = "libnl-genl2"
 RCONFLICTS_${PN}-genl = "libnl-genl2"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
2.17.1

[OE-core][dunfell 15/15] coreutils: don't split stdbuf to own package with single-binary

[Steve Sakoman]

From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>

Commit 992cec44 (coreutils: Move stdbuf into an own package
coreutils-stdbuf) breaks package-qa when the single-binary
PACKAGECONFIG is used:

ERROR: coreutils-8.32-r0 do_package_qa: QA Issue: /usr/bin/stdbuf contained in package coreutils-stdbuf requires /usr/bin/coreutils, but no providers found in RDEPENDS_coreutils-stdbuf? [file-rdeps]
ERROR: coreutils-8.32-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.

With that PACKAGECONFIG, /usr/bin/stdbuf is just a simple "script"
containing the single line

  #!/usr/bin/coreutils --coreutils-prog-shebang=stdbuf

Since there's no point splitting stdbuf to its own package when all
the functionality is in the single big coreutils binary anyway, fix
this by not creating the separate stdbuf package for the single-binary
case. But also make sure that the coreutils-stdbuf item always exists
so recipes can always RDEPEND on coreutils-stdbuf.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 74d24b5b895198898944260136d05e991a203c11)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-core/coreutils/coreutils_8.31.bb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb
index 2b196b7512..0c8452da98 100644
--- a/meta/recipes-core/coreutils/coreutils_8.31.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.31.bb
@@ -59,9 +59,20 @@ base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill l
 
 sbindir_progs= "chroot"
 
-PACKAGE_BEFORE_PN_class-target += "coreutils-stdbuf"
+# Split stdbuf into its own package, so one can include
+# coreutils-stdbuf without getting the rest of coreutils, but make
+# coreutils itself pull in stdbuf, so IMAGE_INSTALL += "coreutils"
+# always provides all coreutils
+PACKAGE_BEFORE_PN_class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}"
 FILES_coreutils-stdbuf = "${bindir}/stdbuf ${libdir}/coreutils/libstdbuf.so"
-RDEPENDS_coreutils_class-target += "coreutils-stdbuf"
+RDEPENDS_coreutils_class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}"
+
+# However, when the single-binary PACKAGECONFIG is used, stdbuf
+# functionality is built into the single coreutils binary, so there's
+# no point splitting /usr/bin/stdbuf to its own package. Instead, add
+# an RPROVIDE so that rdepending on coreutils-stdbuf will work
+# regardless of whether single-binary is in effect.
+RPROVIDES_coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}"
 
 # Let aclocal use the relative path for the m4 file rather than the
 # absolute since coreutils has a lot of m4 files, otherwise there might
-- 
2.17.1

Re: [OE-core][dunfell 08/15] kernel.bbclass: make dependency on lzop-native conditional

[Max Krummenacher]

Hi

Can we drop this one from the backports?

The patch possibly reduces a bit of build time if lzop-native is not used
by any other recipe, but does not fix anything.

One can build a zImage which is compressed with lzo. For a kernel recipe which
does use a zImage with lzo and relies on the kernel.bbclass to add a depend on
lzop-native the build breaks.

Cheers
Max

Am Montag, den 13.07.2020, 04:16 -1000 schrieb Steve Sakoman:
> From: Timon Ulrich <t.ulrich@anapur.de>
> 
> a native lzop is only needed when an lzo compressed initramfs is actually present
> 
> Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit 1217ddf070261c5fe523729b2a833bd38f1e4ccd)
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
>  meta/classes/kernel.bbclass | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 9e3c34ad48..af7e88b380 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -4,7 +4,8 @@ KERNEL_PACKAGE_NAME ??= "kernel"
>  KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else
> d.getVar("KERNEL_PACKAGE_NAME") }"
>  
>  PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }"
> -DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native
> lzop-native bison-native"
> +DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native
> bison-native"
> +DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lzo", "lzop-native", "", d)}"
>  DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", "lz4-native", "", d)}"
>  PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
>  
> 

Re: [OE-core][dunfell 08/15] kernel.bbclass: make dependency on lzop-native conditional

[Andre McCurdy]

On Mon, Jul 13, 2020 at 2:30 PM Max Krummenacher <max.oss.09@gmail.com> wrote:
>
> Hi
>
> Can we drop this one from the backports?
>
> The patch possibly reduces a bit of build time if lzop-native is not used
> by any other recipe, but does not fix anything.
>
> One can build a zImage which is compressed with lzo. For a kernel recipe which
> does use a zImage with lzo and relies on the kernel.bbclass to add a depend on
> lzop-native the build breaks.

If the dependency is there to support compression of the kernel rather
than decompression of the initramfs image then this change should be
reverted in master too.

Re: [OE-core][dunfell 08/15] kernel.bbclass: make dependency on lzop-native conditional

[Steve Sakoman]

On Mon, Jul 13, 2020 at 11:29 AM Max Krummenacher <max.oss.09@gmail.com> wrote:
>
> Can we drop this one from the backports?

Yes, I will remove this patch from my final pull request.

Steve

> The patch possibly reduces a bit of build time if lzop-native is not used
> by any other recipe, but does not fix anything.
>
> One can build a zImage which is compressed with lzo. For a kernel recipe which
> does use a zImage with lzo and relies on the kernel.bbclass to add a depend on
> lzop-native the build breaks.
>
> Cheers
> Max
>
> Am Montag, den 13.07.2020, 04:16 -1000 schrieb Steve Sakoman:
> > From: Timon Ulrich <t.ulrich@anapur.de>
> >
> > a native lzop is only needed when an lzo compressed initramfs is actually present
> >
> > Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > (cherry picked from commit 1217ddf070261c5fe523729b2a833bd38f1e4ccd)
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > ---
> >  meta/classes/kernel.bbclass | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> > index 9e3c34ad48..af7e88b380 100644
> > --- a/meta/classes/kernel.bbclass
> > +++ b/meta/classes/kernel.bbclass
> > @@ -4,7 +4,8 @@ KERNEL_PACKAGE_NAME ??= "kernel"
> >  KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else
> > d.getVar("KERNEL_PACKAGE_NAME") }"
> >
> >  PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }"
> > -DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native
> > lzop-native bison-native"
> > +DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native
> > bison-native"
> > +DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lzo", "lzop-native", "", d)}"
> >  DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", "lz4-native", "", d)}"
> >  PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
> >
> > 
>

Re: [OE-core][dunfell 08/15] kernel.bbclass: make dependency on lzop-native conditional

[Khem Raj]

On 7/13/20 2:29 PM, Max Krummenacher wrote:
> Hi
> 
> Can we drop this one from the backports?
> 
> The patch possibly reduces a bit of build time if lzop-native is not used
> by any other recipe, but does not fix anything.
> 
> One can build a zImage which is compressed with lzo. For a kernel recipe which
> does use a zImage with lzo and relies on the kernel.bbclass to add a depend on
> lzop-native the build breaks.
> 

it seems original patch is not adequate yet, perhaps it should also 
check for KERNEL_IMAGETYPE to have lzo before dropping this dependency, 
once thats taken care, both together are good for dunfell too.

> Cheers
> Max
> 
> Am Montag, den 13.07.2020, 04:16 -1000 schrieb Steve Sakoman:
>> From: Timon Ulrich <t.ulrich@anapur.de>
>>
>> a native lzop is only needed when an lzo compressed initramfs is actually present
>>
>> Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> (cherry picked from commit 1217ddf070261c5fe523729b2a833bd38f1e4ccd)
>> Signed-off-by: Steve Sakoman <steve@sakoman.com>
>> ---
>>   meta/classes/kernel.bbclass | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
>> index 9e3c34ad48..af7e88b380 100644
>> --- a/meta/classes/kernel.bbclass
>> +++ b/meta/classes/kernel.bbclass
>> @@ -4,7 +4,8 @@ KERNEL_PACKAGE_NAME ??= "kernel"
>>   KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else
>> d.getVar("KERNEL_PACKAGE_NAME") }"
>>   
>>   PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }"
>> -DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native
>> lzop-native bison-native"
>> +DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native
>> bison-native"
>> +DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lzo", "lzop-native", "", d)}"
>>   DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", "lz4-native", "", d)}"
>>   PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
>>   
>>
> 
> 
> 
> 

Re: [OE-core][dunfell 08/15] kernel.bbclass: make dependency on lzop-native conditional

[Max Krummenacher]

[-- Attachment #1: Type: text/plain, Size: 2931 bytes --]

Note that the kernel config CONFIG_KERNEL_LZO must also be present to
have the compressed part in the zImage using LZO compression.

E.g. the i.MX defconfig uses that:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm/configs/imx_v6_v7_defconfig?h=v5.8-rc5#n1

I personally don't mind adding the dependency in the same place where I set
the
defconfig, but having the dependency removal trickle down to older releases
seems to not merit the build time gain.

Am Di., 14. Juli 2020 um 01:59 Uhr schrieb Khem Raj <raj.khem@gmail.com>:

>
>
> On 7/13/20 2:29 PM, Max Krummenacher wrote:
> > Hi
> >
> > Can we drop this one from the backports?
> >
> > The patch possibly reduces a bit of build time if lzop-native is not used
> > by any other recipe, but does not fix anything.
> >
> > One can build a zImage which is compressed with lzo. For a kernel recipe
> which
> > does use a zImage with lzo and relies on the kernel.bbclass to add a
> depend on
> > lzop-native the build breaks.
> >
>
> it seems original patch is not adequate yet, perhaps it should also
> check for KERNEL_IMAGETYPE to have lzo before dropping this dependency,
> once thats taken care, both together are good for dunfell too.
>
> > Cheers
> > Max
> >
> > Am Montag, den 13.07.2020, 04:16 -1000 schrieb Steve Sakoman:
> >> From: Timon Ulrich <t.ulrich@anapur.de>
> >>
> >> a native lzop is only needed when an lzo compressed initramfs is
> actually present
> >>
> >> Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
> >> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> >> (cherry picked from commit 1217ddf070261c5fe523729b2a833bd38f1e4ccd)
> >> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> >> ---
> >>   meta/classes/kernel.bbclass | 3 ++-
> >>   1 file changed, 2 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> >> index 9e3c34ad48..af7e88b380 100644
> >> --- a/meta/classes/kernel.bbclass
> >> +++ b/meta/classes/kernel.bbclass
> >> @@ -4,7 +4,8 @@ KERNEL_PACKAGE_NAME ??= "kernel"
> >>   KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME")
> == "kernel") else
> >> d.getVar("KERNEL_PACKAGE_NAME") }"
> >>
> >>   PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME")
> == "kernel") else "" }"
> >> -DEPENDS += "virtual/${TARGET_PREFIX}binutils
> virtual/${TARGET_PREFIX}gcc kmod-native bc-native
> >> lzop-native bison-native"
> >> +DEPENDS += "virtual/${TARGET_PREFIX}binutils
> virtual/${TARGET_PREFIX}gcc kmod-native bc-native
> >> bison-native"
> >> +DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lzo",
> "lzop-native", "", d)}"
> >>   DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4",
> "lz4-native", "", d)}"
> >>   PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
> >>
> >>
> >
> >
> > 
> >
>

[-- Attachment #2: Type: text/html, Size: 4298 bytes --]

[OE-core][dunfell 00/15] Patch review

[Steve Sakoman]

Please review this next set of patches for dunfell and have comments back by
end of day Monday.

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2019

The following changes since commit 707036d4ec12ef1a260adcef78627b26e32e6540:

  linux-yocto/5.4: update to v5.4.105 (2021-03-24 04:30:32 -1000)

are available in the Git repository at:

  git://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut

Anton D. Kachalov (1):
  run-postinsts: do not remove postinsts directory.

Bruce Ashfield (1):
  linux-yocto/5.4: update to v5.4.107

Catalin Enache (1):
  connman: fix CVE-2021-26675, CVE-2021-26676

Christopher Larson (2):
  buildhistory: add missing vardepsexcludes
  image,populate_sdk_base: move 'func' flag setting for sdk command vars

He Zhe (1):
  cryptodev-module: Backport a patch to fix build failure with kernel
    v5.8

Khem Raj (1):
  documentation-audit.sh: Fix typo in specifying LICENSE_FLAGS_WHITELIST

Mark Hatle (1):
  populate_sdk_ext: Avoid copying and producing .pyc files

Michael Trensch (1):
  linux-firmware: Fix packaging

Mikko Rapeli (1):
  openssl: update to 1.1.1k to fix CVE-2021-3450 and CVE-2021-3449

Mingli Yu (1):
  libtool: make sure autoheader run before autoconf

Minjae Kim (1):
  git: fix CVE-2021-21300

Naveen Saini (1):
  cryptodev-module: fix build failure with kernel v5.10

Robert P. J. Day (2):
  bitbake.conf: correct description of HOSTTOOLS_DIR
  packagegroups: delete useless "PROVIDES" lines

 meta/classes/buildhistory.bbclass             |   3 +
 meta/classes/image.bbclass                    |   2 +-
 meta/classes/populate_sdk_base.bbclass        |   7 +
 meta/classes/populate_sdk_ext.bbclass         |   4 +-
 meta/conf/bitbake.conf                        |   2 +-
 meta/lib/oe/copy_buildsystem.py               |   6 +-
 .../connman/connman/CVE-2021-26675.patch      |  62 ++++
 .../connman/connman/CVE-2021-26676-0001.patch | 231 +++++++++++++
 .../connman/connman/CVE-2021-26676-0002.patch |  33 ++
 .../connman/connman_1.37.bb                   |   3 +
 .../{openssl_1.1.1j.bb => openssl_1.1.1k.bb}  |   2 +-
 .../packagegroups/packagegroup-base.bb        |   1 -
 .../packagegroups/packagegroup-core-nfs.bb    |   1 -
 .../git/files/CVE-2021-21300.patch            | 305 ++++++++++++++++++
 meta/recipes-devtools/git/git.inc             |   4 +-
 .../libtool/libtool-2.4.6.inc                 |   1 +
 ...-sure-autoheader-run-before-autoconf.patch |  35 ++
 .../run-postinsts/run-postinsts/run-postinsts |  10 +-
 .../cryptodev/cryptodev-module_1.10.bb        |   2 +
 .../0001-Fix-build-for-Linux-5.8-rc1.patch    |  49 +++
 .../0001-Fix-build-for-Linux-5.9-rc1.patch    |  42 +++
 .../linux-firmware/linux-firmware_20210208.bb |  41 ++-
 .../linux/linux-yocto-rt_5.4.bb               |   6 +-
 .../linux/linux-yocto-tiny_5.4.bb             |   8 +-
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  |  22 +-
 scripts/contrib/documentation-audit.sh        |   2 +-
 26 files changed, 840 insertions(+), 44 deletions(-)
 create mode 100644 meta/recipes-connectivity/connman/connman/CVE-2021-26675.patch
 create mode 100644 meta/recipes-connectivity/connman/connman/CVE-2021-26676-0001.patch
 create mode 100644 meta/recipes-connectivity/connman/connman/CVE-2021-26676-0002.patch
 rename meta/recipes-connectivity/openssl/{openssl_1.1.1j.bb => openssl_1.1.1k.bb} (98%)
 create mode 100644 meta/recipes-devtools/git/files/CVE-2021-21300.patch
 create mode 100644 meta/recipes-devtools/libtool/libtool/0001-Makefile.am-make-sure-autoheader-run-before-autoconf.patch
 create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.8-rc1.patch
 create mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-build-for-Linux-5.9-rc1.patch

-- 
2.25.1

[OE-core][dunfell 00/15] Patch review

[Steve Sakoman]

Please review this next set of patches for dunfell and have comments back by end
of day Wednesday.

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2677

The following changes since commit 8e7c8e43260682efafabc50c757b9c2daff98f13:

  connman: add CVE_PRODUCT (2021-09-24 04:27:46 -1000)

are available in the Git repository at:

  git://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut

Minjae Kim (1):
  vim: fix CVE-2021-3778

Ranjitsinh Rathod (1):
  systemd: Add fix for systemd-networkd crash during free

Richard Purdie (7):
  mtd-utils: upgrade 2.1.1 -> 2.1.2
  pybootchart: Avoid divide by zero
  oeqa/qemurunner: Use oe._exit(), not sys.exit()
  libc_package/buildstats: Fix python regex quoting warnings
  oeqa/selftest/gotoolchain: Fix temp file cleanup
  oeqa/buildproject: Ensure temp directories are cleaned up
  glew: Stop polluting /tmp during builds

Robert P. J. Day (1):
  common-licenses: add "Unlicense" license file

Stefano Babic (1):
  mtd-utils: upgrade 2.1.2 -> 2.1.3

Tom Pollard (2):
  bzip2: Update soname for libbz2 1.0.8
  libsamplerate0: Set correct soname for 0.1.9

William A. Kennington III (1):
  rm_work.bbclass: Fix for files starting with -

sana kazi (1):
  openssh: Fix CVE-2021-28041

 meta/classes/libc-package.bbclass             |   2 +-
 meta/classes/rm_work.bbclass                  |   8 +-
 meta/files/common-licenses/Unlicense          |  24 ++
 meta/lib/buildstats.py                        |   4 +-
 meta/lib/oeqa/selftest/cases/gotoolchain.py   |   6 +
 meta/lib/oeqa/utils/buildproject.py           |   3 +
 meta/lib/oeqa/utils/qemurunner.py             |   2 +-
 meta/lib/oeqa/utils/targetbuild.py            |   4 +-
 .../openssh/openssh/CVE-2021-28041.patch      |  20 ++
 .../openssh/openssh_8.2p1.bb                  |   1 +
 ...-info-for-ordered-set-new-and-introd.patch |  78 +++++
 ...dered_set_clear-free-with-destructor.patch |  35 +++
 ...etwork-add-skeleton-of-request-queue.patch | 285 ++++++++++++++++++
 ...quests-when-link-enters-linger-state.patch |  50 +++
 ...ork-fix-Link-reference-counter-issue.patch | 278 +++++++++++++++++
 ...nk_drop-and-link_detach_from_manager.patch |  67 ++++
 meta/recipes-core/systemd/systemd_244.5.bb    |   6 +
 ...-utils-Fix-return-value-of-ubiformat.patch |  62 ----
 meta/recipes-devtools/mtd/mtd-utils_git.bb    |   9 +-
 meta/recipes-extended/bzip2/bzip2/Makefile.am |   2 +-
 .../glew/glew/notempdir.patch                 |  19 ++
 meta/recipes-graphics/glew/glew_2.2.0.bb      |   1 +
 .../libsamplerate0/shared_version_info.patch  |  13 +
 .../libsamplerate/libsamplerate0_0.1.9.bb     |   1 +
 .../vim/files/CVE-2021-3778.patch             |  49 +++
 meta/recipes-support/vim/vim.inc              |   1 +
 scripts/pybootchartgui/pybootchartgui/draw.py |   5 +-
 27 files changed, 956 insertions(+), 79 deletions(-)
 create mode 100644 meta/files/common-licenses/Unlicense
 create mode 100644 meta/recipes-connectivity/openssh/openssh/CVE-2021-28041.patch
 create mode 100644 meta/recipes-core/systemd/systemd/basic-pass-allocation-info-for-ordered-set-new-and-introd.patch
 create mode 100644 meta/recipes-core/systemd/systemd/introduce-ordered_set_clear-free-with-destructor.patch
 create mode 100644 meta/recipes-core/systemd/systemd/network-add-skeleton-of-request-queue.patch
 create mode 100644 meta/recipes-core/systemd/systemd/network-also-drop-requests-when-link-enters-linger-state.patch
 create mode 100644 meta/recipes-core/systemd/systemd/network-fix-Link-reference-counter-issue.patch
 create mode 100644 meta/recipes-core/systemd/systemd/network-merge-link_drop-and-link_detach_from_manager.patch
 delete mode 100644 meta/recipes-devtools/mtd/mtd-utils/0001-mtd-utils-Fix-return-value-of-ubiformat.patch
 create mode 100644 meta/recipes-graphics/glew/glew/notempdir.patch
 create mode 100644 meta/recipes-multimedia/libsamplerate/libsamplerate0/shared_version_info.patch
 create mode 100644 meta/recipes-support/vim/files/CVE-2021-3778.patch

-- 
2.25.1

[OE-core][dunfell 00/15] Patch review

[Steve Sakoman]

Please review this set of changes for dunfell and have comments back by
end of day Tuesday, November 14

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/6174

The following changes since commit 0dbf3a15321b8033ff8ed86c6aa261fdb9c3d5bb:

  build-appliance-image: Update to dunfell head revision (2023-10-27 04:22:17 -1000)

are available in the Git repository at:

  https://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut

Ashish Sharma (1):
  zlib: Backport fix for CVE-2023-45853

Hitendra Prajapati (1):
  tiff: Security fix for CVE-2023-40745

Lee Chee Yang (1):
  kexec-tools: Ignore Fedora/RedHat specific CVE-2021-20269

Mikko Rapeli (1):
  lz4: use CFLAGS from bitbake

Naveen Saini (2):
  assimp: Explicitly use nobranch=1 in SRC_URI
  resolvconf: Fix fetch error

Peter Marko (1):
  glibc: ignore CVE-2023-4527

Ross Burton (3):
  cve-check: sort the package list in the JSON report
  cve-check: slightly more verbose warning when adding the same package
    twice
  cve-check: don't warn if a patch is remote

Soumya Sambu (1):
  libwebp: Fix CVE-2023-4863

Steve Sakoman (2):
  Revert "qemu: Backport fix for CVE-2023-0330"
  lz4: specify gnu17 in CFLAGS to fix reproducibility issues

Vijay Anusuri (2):
  tiff: CVE patch correction for CVE-2023-3576
  xserver-xorg: Fix for CVE-2023-5367 and CVE-2023-5380

 meta/classes/cve-check.bbclass                |   2 +
 meta/lib/oe/cve_check.py                      |  13 +-
 .../resolvconf/resolvconf_1.82.bb             |   2 +-
 meta/recipes-core/glibc/glibc_2.31.bb         |   7 +
 .../zlib/zlib/CVE-2023-45853.patch            |  40 ++++++
 meta/recipes-core/zlib/zlib_1.2.11.bb         |   1 +
 meta/recipes-devtools/qemu/qemu.inc           |   3 +-
 ...-2023-0330_1.patch => CVE-2023-0330.patch} |   0
 .../qemu/qemu/CVE-2023-0330_2.patch           | 135 ------------------
 meta/recipes-graphics/vulkan/assimp_5.0.1.bb  |   2 +-
 .../xserver-xorg/CVE-2023-5367.patch          |  84 +++++++++++
 .../xserver-xorg/CVE-2023-5380.patch          | 102 +++++++++++++
 .../xorg-xserver/xserver-xorg_1.20.14.bb      |   2 +
 .../kexec/kexec-tools_2.0.20.bb               |   3 +
 ...-2023-3618-1.patch => CVE-2023-3576.patch} |   3 +-
 ...-2023-3618-2.patch => CVE-2023-3618.patch} |   0
 .../libtiff/files/CVE-2023-40745.patch        |  34 +++++
 meta/recipes-multimedia/libtiff/tiff_4.1.0.bb |   5 +-
 ...23-5129.patch => CVE-2023-4863-0001.patch} |  27 ++--
 .../webp/files/CVE-2023-4863-0002.patch       |  53 +++++++
 meta/recipes-multimedia/webp/libwebp_1.1.0.bb |   3 +-
 meta/recipes-support/lz4/lz4_1.9.2.bb         |   3 +-
 22 files changed, 358 insertions(+), 166 deletions(-)
 create mode 100644 meta/recipes-core/zlib/zlib/CVE-2023-45853.patch
 rename meta/recipes-devtools/qemu/qemu/{CVE-2023-0330_1.patch => CVE-2023-0330.patch} (100%)
 delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2023-0330_2.patch
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2023-5367.patch
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2023-5380.patch
 rename meta/recipes-multimedia/libtiff/files/{CVE-2023-3618-1.patch => CVE-2023-3576.patch} (93%)
 rename meta/recipes-multimedia/libtiff/files/{CVE-2023-3618-2.patch => CVE-2023-3618.patch} (100%)
 create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2023-40745.patch
 rename meta/recipes-multimedia/webp/files/{CVE-2023-5129.patch => CVE-2023-4863-0001.patch} (95%)
 create mode 100644 meta/recipes-multimedia/webp/files/CVE-2023-4863-0002.patch

-- 
2.34.1