Patch review
cover Patch review
Last set of patches for honister before 3.4.4. Please review.
No problems seen while testing:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3565
Thanks,
Anuj
The following changes since commit 4c556b4fd07a3ce9128019b51e5623e8eeeb7400:
license_image.bbclass: close package.manifest file (2022-04-19 22:22:49 +0800)
are available in the Git repository at:
git://push.openembedded.org/openembedded-core-contrib anujm/honister
Dmitry Baryshkov (1):
linux-firmware: correct license for ar3k firmware
Konrad Weihmann (1):
gmp: add missing COPYINGv3
Peter Kjellerstedt (1):
u-boot: Inherit pkgconfig
Richard Purdie (2):
alsa-tools: Ensure we install correctly
shadow-native: Simplify and fix syslog disable patch
wangmy (1):
linux-firmware: upgrade 20220310 -> 20220411
zhengruoqin (1):
wireless-regdb: upgrade 2022.02.18 -> 2022.04.08
meta/recipes-bsp/u-boot/u-boot-common.inc | 3 +
...01-Disable-use-of-syslog-for-sysroot.patch | 150 +++++-------------
...20220310.bb => linux-firmware_20220411.bb} | 8 +-
....02.18.bb => wireless-regdb_2022.04.08.bb} | 2 +-
.../alsa/alsa-tools_1.2.5.bb | 1 +
meta/recipes-support/gmp/gmp_6.2.1.bb | 8 +-
6 files changed, 53 insertions(+), 119 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20220310.bb => linux-firmware_20220411.bb} (99%)
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.02.18.bb => wireless-regdb_2022.04.08.bb} (94%)Signature · 1 line
2.35.1
PATCH 1/7 gmp: add missing COPYINGv3
From: Konrad Weihmann <[email protected]>
add COPYINGv3 license text to LIC_FILES_CHKSUM
--- meta/recipes-support/gmp/gmp_6.2.1.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
meta/recipes-support/gmp/gmp_6.2.1.bb +5 -3
@@ -2,9 +2,11 @@ require gmp.inc LICENSE = "GPLv2+ | LGPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \ " REVISION = ""
Signature · 1 line
2.35.1
PATCH 2/7 alsa-tools: Ensure we install correctly
In reply to Anuj MittalFrom: Richard Purdie <[email protected]>
With the fix for #8621, cleandirs is now applied to autotools_do_install and this results in a lot of the install targets to be removed. Ensure cleandirs isn't set for autotools_do_install.
--- meta/recipes-multimedia/alsa/alsa-tools_1.2.5.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-multimedia/alsa/alsa-tools_1.2.5.bb +1 -0
@@ -71,6 +71,7 @@ python do_compile() { } python do_install() { + d.delVarFlag("autotools_do_install", "cleandirs") for subdir in d.getVar("PACKAGECONFIG").split(): subdir = subdir.replace("--", "/") bb.note("Installing %s" % subdir)
Signature · 1 line
2.35.1
PATCH 3/7 u-boot: Inherit pkgconfig
In reply to Anuj MittalFrom: Peter Kjellerstedt <[email protected]>
pkg-config is used by the Makefiles, and thus pkgconfig needs to be inherited.
--- meta/recipes-bsp/u-boot/u-boot-common.inc | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-bsp/u-boot/u-boot-common.inc +3 -0
@@ -19,4 +19,7 @@ SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ S = "${WORKDIR}/git" B = "${WORKDIR}/build" + +inherit pkgconfig + do_configure[cleandirs] = "${B}"
Signature · 1 line
2.35.1
PATCH 4/7 linux-firmware: upgrade 20220310 -> 20220411
In reply to Anuj MittalFrom: wangmy <[email protected]>
License-Update:
Version of driver files updated
Added files for some drivers
---
...{linux-firmware_20220310.bb => linux-firmware_20220411.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20220310.bb => linux-firmware_20220411.bb} (99%)meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20220310.bb +2 -2
@@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=45a9c4a92d152e9495db81e1192f2bdc \ + file://WHENCE;md5=4cf67d71a21887c682c3989a4318745e \ " # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -205,7 +205,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "5938ee717b2023b48f6bfcf344b40ddc947e3e22c0bc36d4c3418f90fea68182" +SRC_URI[sha256sum] = "020b11f6412f4956f5a6f98de7d41867d2b30ea0ce81b1e2d206ec9840363849" inherit allarch
Signature · 1 line
2.35.1
PATCH 5/7 wireless-regdb: upgrade 2022.02.18 -> 2022.04.08
In reply to Anuj MittalFrom: zhengruoqin <[email protected]>
---
...ireless-regdb_2022.02.18.bb => wireless-regdb_2022.04.08.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.02.18.bb => wireless-regdb_2022.04.08.bb} (94%)meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.04.08.bb renamed from meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.02.18.bb +1 -1
@@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f" +SRC_URI[sha256sum] = "884ba2e3c1e8b98762b6dc25ff60b5ec75c8d33a39e019b3ed4aa615491460d3" inherit bin_package allarch
Signature · 1 line
2.35.1
PATCH 6/7 linux-firmware: correct license for ar3k firmware
In reply to Anuj MittalFrom: Dmitry Baryshkov <[email protected]>
According to the WHENCE file, some a3k firmware files are licensed under the special ar3k license, while others are licensed under the more generic Atheros license. Document this by adding extending the LICENSE:${PN}-ar3k and depending on both of them.
--- meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux-firmware/linux-firmware_20220411.bb +2 -2
@@ -352,7 +352,7 @@ FILES:${PN}-carl9170 = " \ RDEPENDS:${PN}-carl9170 += "${PN}-gplv2-license" # For QualCommAthos -LICENSE:${PN}-ar3k = "Firmware-qualcommAthos_ar3k" +LICENSE:${PN}-ar3k = "Firmware-qualcommAthos_ar3k & Firmware-atheros_firmware" LICENSE:${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" LICENSE:${PN}-ath10k = "Firmware-qualcommAthos_ath10k" LICENSE:${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k"
@@ -376,7 +376,7 @@ FILES:${PN}-qca = " \ ${nonarch_base_libdir}/firmware/qca \ " -RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license" +RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license" RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" RDEPENDS:${PN}-qca += "${PN}-ath10k-license"
Signature · 1 line
2.35.1
PATCH 7/7 shadow-native: Simplify and fix syslog disable patch
In reply to Anuj MittalFrom: Richard Purdie <[email protected]>
Shadow is happily spamming the host syslog with messages and shouldn't be which suggests the patch isn't working. Redo it to work at the configure level which is simpler and hopefully more effective.
This is a squashed cherry-pick of commit 8f181686 (shadow-native:
Simplify and fix syslog disable patch) and commit e1f21d0d (shadow:
Disable the use of syslog() for the native tools).
--- ...01-Disable-use-of-syslog-for-sysroot.patch | 150 +++++------------- 1 file changed, 39 insertions(+), 111 deletions(-)
meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +39 -111
@@ -1,124 +1,52 @@ -From 30a3906a0a21120fa6bbc918b6258ab9303fbeaa Mon Sep 17 00:00:00 2001 -From: Scott Garman <[email protected]> -Date: Thu, 14 Apr 2016 12:28:57 +0200 -Subject: [PATCH] Disable use of syslog for sysroot +From 8b845fff891798a03bdf21354b52e4487c2c0200 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <[email protected]> +Date: Thu, 14 Apr 2022 23:11:53 +0000 +Subject: [PATCH] Disable use of syslog for shadow-native tools Disable use of syslog to prevent sysroot user and group additions from writing entries to the host's syslog. This patch should only be used with the shadow-native recipe. -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Scott Garman <[email protected]> +Upstream-Status: Inappropriate [OE specific configuration] +Signed-off-by: Richard Purdie <[email protected]> Signed-off-by: Peter Kjellerstedt <[email protected]> -Signed-off-by: Chen Qi <[email protected]> --- - src/groupadd.c | 3 +++ - src/groupdel.c | 3 +++ - src/groupmems.c | 3 +++ - src/groupmod.c | 3 +++ - src/useradd.c | 3 +++ - src/userdel.c | 4 ++++ - src/usermod.c | 3 +++ - 7 files changed, 22 insertions(+) + configure.ac | 2 +- + src/login_nopam.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/src/groupadd.c b/src/groupadd.c -index d7f68b1..5fe5f43 100644 ---- a/src/groupadd.c -+++ b/src/groupadd.c -@@ -34,6 +34,9 @@ - - #ident "$Id$" - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <ctype.h> - #include <fcntl.h> - #include <getopt.h> -diff --git a/src/groupdel.c b/src/groupdel.c -index 5c89312..2aefc5a 100644 ---- a/src/groupdel.c -+++ b/src/groupdel.c -@@ -34,6 +34,9 @@ - +diff --git a/configure.ac b/configure.ac +index 5dcae19..b2c58f5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -204,7 +204,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd", + [Path to passwd program.]) + + dnl XXX - quick hack, should disappear before anyone notices :). +-AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) ++#AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) + if test "$ac_cv_func_ruserok" = "yes"; then + AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.]) + AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).]) +diff --git a/src/login_nopam.c b/src/login_nopam.c +index df6ba88..fc24e13 100644 +--- a/src/login_nopam.c ++++ b/src/login_nopam.c +@@ -29,7 +29,6 @@ + #ifndef USE_PAM #ident "$Id$" -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <ctype.h> - #include <fcntl.h> - #include <grp.h> -diff --git a/src/groupmems.c b/src/groupmems.c -index 654a8f3..6b2026b 100644 ---- a/src/groupmems.c -+++ b/src/groupmems.c -@@ -32,6 +32,9 @@ - - #include <config.h> - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <fcntl.h> - #include <getopt.h> - #include <grp.h> -diff --git a/src/groupmod.c b/src/groupmod.c -index acd6f35..a2c5247 100644 ---- a/src/groupmod.c -+++ b/src/groupmod.c -@@ -34,6 +34,9 @@ - - #ident "$Id$" - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <ctype.h> - #include <fcntl.h> - #include <getopt.h> -diff --git a/src/useradd.c b/src/useradd.c -index 127177e..b80e505 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -34,6 +34,9 @@ - - #ident "$Id$" - -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <assert.h> - #include <ctype.h> - #include <errno.h> -diff --git a/src/userdel.c b/src/userdel.c -index 79a7c89..c1e010a 100644 ---- a/src/userdel.c -+++ b/src/userdel.c -@@ -31,6 +31,10 @@ - */ - - #include <config.h> -+ -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG -+ - #include <assert.h> - #include <dirent.h> - #include <errno.h> -diff --git a/src/usermod.c b/src/usermod.c -index 03bb9b9..e15fdd4 100644 ---- a/src/usermod.c -+++ b/src/usermod.c -@@ -34,6 +34,9 @@ - - #ident "$Id$" +-#include "prototypes.h" + /* + * This module implements a simple but effective form of login access + * control based on login names and on host (or domain) names, internet +@@ -57,6 +56,8 @@ + #include <netinet/in.h> + #include <arpa/inet.h> /* for inet_ntoa() */ -+/* Disable use of syslog since we're running this command against a sysroot */ -+#undef USE_SYSLOG ++#include "prototypes.h" + - #include <assert.h> - #include <ctype.h> - #include <errno.h> + #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64) + #undef MAXHOSTNAMELEN + #define MAXHOSTNAMELEN 256
Signature · 1 line
2.35.1