Date   

Re: [PATCH] gcc: Fix tm.h plugin header

Andrei Gherzan
 

On Mon, 20 Dec 2021, at 01:39, Bernhard Rosenkränzer via lists.openembedded.org wrote:
On Thu, Dec 9, 2021 at 07:40 PM, Andrei Gherzan wrote:

On Thu, 9 Dec 2021, at 16:40, Khem Raj wrote:

On Thu, Dec 9, 2021 at 7:40 AM Andrei Gherzan <andrei@...> wrote:

From: Andrei Gherzan <andrei.gherzan@...>

On x86-64, tm.h (needed to build gcc plugins) tries to include
config/i386/linux64.h, which isn't installed. Fortunately it also isn't
used, so simply removing the include statement is an ok fix.
is it due to multilib support ? if so we might be ok since we may not
be using it
but really it will be good to check it with multilib builds of x86_64/x86
I don't think it is related to multilib but I'll give multilib a try. In my case, the issue was revealed when compiling a kernel plugin config. I can't remember right now which one but I can replicate it for logs.
Hi,
I've had a closer look at the problem, and can confirm the patch doesn't break even in multilib setups.

The problem is that in a non-multilib setup, the config/i386/linux64.h header is not generated, but tm.h tries to include it nevertheless, causing any gcc plugin that #includes tm.h (such as all the gcc plugins in the kernel -- tm.h is included by scripts/gcc-plugins/gcc-common.h) to fail to build.
An alternative fix would be adding
mkdir -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/config/i386
touch ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/config/i386/linux64.h
(creating the file if it isn't there) instead. This would make sure that in cases where config/i386/linux64.h does exist, it doesn't get removed from tm.h (potentially fixing plugins that reference any of the #defines in i386/linux64.h without including the file manually -- but I have yet to see any such plugin).

I will try to get a better fix (not adding the include statement to tm.h in the first place rather than having to remove it later in install scripts) upstream, but in the mean time, the patch fixes our builds before the better fix is ready/applied.

Ping on this patch. Any chance we can pull it in as a first iteration of the solution?

---
Andrei


Re: [yocto] [qa-build-notification] QA notification for completed autobuilder build (yocto-3.1.13.rc1)

Jose Quaresma
 



Teoh, Jay Shen <jay.shen.teoh@...> escreveu no dia terça, 21/12/2021 à(s) 07:46:
Hi all,

This is the full report for yocto-3.1.13.rc1: 
https://git.yoctoproject.org/cgit/cgit.cgi/yocto-testresults-contrib/tree/?h=intel-yocto-testresults

======= Summary ========
No high milestone defects.

new issue found

Bug 14669 - [QA 3.1.13 RC1] failure in ptest :gstreamer1.0.gstreamer-1.0/pipelines_seek.test


======= Bugs ========
https://bugzilla.yoctoproject.org/show_bug.cgi?id=14669

This patch is a bug fix 14669
 


Thanks,
Jay

>-----Original Message-----
>From: qa-build-notification@... <qa-build-
>notification@...> On Behalf Of Richard Purdie
>Sent: Wednesday, 15 December, 2021 3:40 PM
>To: <yocto@...> <yocto@...>
>Cc: qa-build-notification <qa-build-notification@...>
>Subject: [qa-build-notification] QA notification for completed autobuilder build
>(yocto-3.1.13.rc1)
>
>A build flagged for QA (yocto-3.1.13.rc1) was completed on the autobuilder and is
>available at:
>
>
>    https://autobuilder.yocto.io/pub/releases/yocto-3.1.13.rc1
>
>
>Build hash information:
>
>bitbake: f18b65d0b9a6b983d53bde491e1bf2ca56949444
>meta-agl: 6d1ab9f3bb270a773ec5d2f7c8c856796833b559
>meta-arm: ce535dfb96de4d2529f091d7d85a7172c626001c
>meta-aws: 9979cfa676105cb68cfadfdaeabf044d7c919319
>meta-gplv2: 60b251c25ba87e946a0ca4cdc8d17b1cb09292ac
>meta-intel: 87984115eb6ed1a4c17204629dcb100f6b76fe82
>meta-mingw: 524de686205b5d6736661d4532f5f98fee8589b7
>meta-openembedded: 69f94af4d91215e7d4e225bab54bf3bcfee42f1c
>oecore: 90a07178ea26be453d101c2e8b33d3a0f437635d
>poky: 795339092f87672e4f68e4d3bc4cfd0e252d1831
>
>
>
>This is an automated message from the Yocto Project Autobuilder
>Git: git://git.yoctoproject.org/yocto-autobuilder2
>Email: richard.purdie@...
>
>
>
>
>
>
>






--
Best regards,

José Quaresma


[dunfell][PATCH] gstreamer1.0: fix failing ptest

Jose Quaresma
 

From: Anuj Mittal <anuj.mittal@...>

Backport a patch to increase the timeout that might help with the
intermittent seek test failure.

[YOCTO #14194]
[YOCTO #14669]

(From OE-Core rev: a7dc7a35334ad634926a1386f4a56b27aad3ce68)

Signed-off-by: Anuj Mittal <anuj.mittal@...>
Signed-off-by: Richard Purdie <richard.purdie@...>
(cherry picked from commit 7b90027aac9fa41b3dc98765151d761df8dabb97)
Signed-off-by: Jose Quaresma <quaresma.jose@...>
---

This patch is a bug fix 3.1.12.rc1
https://bugzilla.yoctoproject.org/show_bug.cgi?id=14669

Backported from oe-core master

...-use-too-strict-timeout-for-validati.patch | 33 +++++++++++++++++++
.../gstreamer/gstreamer1.0_1.16.3.bb | 1 +
2 files changed, 34 insertions(+)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
new file mode 100644
index 0000000000..e32f3c101f
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch
@@ -0,0 +1,33 @@
+From 1db36347d05d88835519368442e9aa89c64091ad Mon Sep 17 00:00:00 2001
+From: Seungha Yang <seungha@...>
+Date: Tue, 15 Sep 2020 00:54:58 +0900
+Subject: [PATCH] tests: seek: Don't use too strict timeout for validation
+
+Expected segment-done message might not be seen within expected
+time if system is not powerful enough.
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/625>
+
+Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gstreamer/commit?id=f44312ae5d831438fcf8041162079c65321c588c]
+Signed-off-by: Anuj Mittal <anuj.mittal@...>
+Signed-off-by: Jose Quaresma <quaresma.jose@...>
+---
+ tests/check/pipelines/seek.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/check/pipelines/seek.c b/tests/check/pipelines/seek.c
+index 28bb8846d..5f7447bc5 100644
+--- a/tests/check/pipelines/seek.c
++++ b/tests/check/pipelines/seek.c
+@@ -521,7 +521,7 @@ GST_START_TEST (test_loopback_2)
+
+ GST_INFO ("wait for segment done message");
+
+- msg = gst_bus_timed_pop_filtered (bus, (GstClockTime) 2 * GST_SECOND,
++ msg = gst_bus_timed_pop_filtered (bus, GST_CLOCK_TIME_NONE,
+ GST_MESSAGE_SEGMENT_DONE | GST_MESSAGE_ERROR);
+ fail_unless (msg, "no message within the timed window");
+ fail_unless_equals_string (GST_MESSAGE_TYPE_NAME (msg), "segment-done");
+--
+2.29.2
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.3.bb
index a516fabdaf..236d6034d6 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.3.bb
@@ -22,6 +22,7 @@ SRC_URI = " \
file://0003-meson-Add-valgrind-feature.patch \
file://0004-meson-Add-option-for-installed-tests.patch \
file://0005-bufferpool-only-resize-in-reset-when-maxsize-is-larger.patch \
+ file://0006-tests-seek-Don-t-use-too-strict-timeout-for-validati.patch \
"
SRC_URI[md5sum] = "beecf6965a17fb17fa3b262fd36df70a"
SRC_URI[sha256sum] = "692f037968e454e508b0f71d9674e2e26c78475021407fcf8193b1c7e59543c7"
--
2.34.1


[hardknott][PATCH] AArch64 support for Arm's Neoverse N2 CPU

Pgowda
 

The patch backports the AArch64 support for Arm's Neoverse N2 CPU
Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=9428e9267435a62f672e2ba42df46432c021a9cf]

Signed-off-by: pgowda <pgowda.cve@...>
---
meta/recipes-devtools/gcc/gcc-10.2.inc | 1 +
.../gcc/0039-arm64-neoverse-n2-support.patch | 60 +++++++++++++++++++
2 files changed, 61 insertions(+)
create mode 100644 meta/recipes-devtools/gcc/gcc/0039-arm64-neoverse-n2-support.patch

diff --git a/meta/recipes-devtools/gcc/gcc-10.2.inc b/meta/recipes-devtools/gcc/gcc-10.2.inc
index 5626bf20f0..89158258d7 100644
--- a/meta/recipes-devtools/gcc/gcc-10.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-10.2.inc
@@ -74,6 +74,7 @@ SRC_URI = "\
file://0002-CVE-2021-35465.patch \
file://0003-CVE-2021-35465.patch \
file://0004-CVE-2021-35465.patch \
+ file://0039-arm64-neoverse-n2-support.patch \
"
SRC_URI[sha256sum] = "b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c"

diff --git a/meta/recipes-devtools/gcc/gcc/0039-arm64-neoverse-n2-support.patch b/meta/recipes-devtools/gcc/gcc/0039-arm64-neoverse-n2-support.patch
new file mode 100644
index 0000000000..b3e0f396bd
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc/0039-arm64-neoverse-n2-support.patch
@@ -0,0 +1,60 @@
+From 9428e9267435a62f672e2ba42df46432c021a9cf Mon Sep 17 00:00:00 2001
+From: Alex Coplan <alex.coplan@...>
+Date: Tue, 29 Sep 2020 17:09:09 +0100
+Subject: [PATCH] aarch64: Add support for Neoverse N2 CPU
+
+This patch backports the AArch64 support for Arm's Neoverse N2 CPU to
+GCC 10.
+
+gcc/ChangeLog:
+
+ * config/aarch64/aarch64-cores.def: Add Neoverse N2.
+ * config/aarch64/aarch64-tune.md: Regenerate.
+ * doc/invoke.texi: Document AArch64 support for Neoverse N2.
+
+Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=9428e9267435a62f672e2ba42df46432c021a9cf]
+
+Signed-off-by: pgowda <pgowda.cve@...>
+---
+ gcc/config/aarch64/aarch64-cores.def | 3 +++
+ gcc/config/aarch64/aarch64-tune.md | 2 +-
+ gcc/doc/invoke.texi | 4 ++--
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/gcc/config/aarch64/aarch64-cores.def b/gcc/config/aarch64/aarch64-cores.def
+--- a/gcc/config/aarch64/aarch64-cores.def 2020-07-22 23:35:17.320384289 -0700
++++ b/gcc/config/aarch64/aarch64-cores.def 2021-12-21 01:08:45.518472342 -0800
+@@ -135,6 +135,9 @@ AARCH64_CORE("zeus", zeus, cortexa57, 8_
+ /* Qualcomm ('Q') cores. */
+ AARCH64_CORE("saphira", saphira, saphira, 8_4A, AARCH64_FL_FOR_ARCH8_4 | AARCH64_FL_CRYPTO | AARCH64_FL_RCPC, saphira, 0x51, 0xC01, -1)
+
++/* Armv8.5-A Architecture Processors. */
++AARCH64_CORE("neoverse-n2", neoversen2, cortexa57, 8_5A, AARCH64_FL_FOR_ARCH8_5 | AARCH64_FL_I8MM | AARCH64_FL_BF16 | AARCH64_FL_F16 | AARCH64_FL_SVE | AARCH64_FL_SVE2 | AARCH64_FL_SVE2_BITPERM | AARCH64_FL_RNG | AARCH64_FL_MEMTAG, neoversen1, 0x41, 0xd49, -1)
++
+ /* ARMv8-A big.LITTLE implementations. */
+
+ AARCH64_CORE("cortex-a57.cortex-a53", cortexa57cortexa53, cortexa53, 8A, AARCH64_FL_FOR_ARCH8 | AARCH64_FL_CRC, cortexa57, 0x41, AARCH64_BIG_LITTLE (0xd07, 0xd03), -1)
+diff --git a/gcc/config/aarch64/aarch64-tune.md b/gcc/config/aarch64/aarch64-tune.md
+--- a/gcc/config/aarch64/aarch64-tune.md 2020-07-22 23:35:54.684795913 -0700
++++ b/gcc/config/aarch64/aarch64-tune.md 2021-12-21 01:09:56.829252050 -0800
+@@ -1,5 +1,5 @@
+ ;; -*- buffer-read-only: t -*-
+ ;; Generated automatically by gentune.sh from aarch64-cores.def
+ (define_attr "tune"
+- "cortexa34,cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,octeontx,octeontxt81,octeontxt83,thunderxt81,thunderxt83,emag,xgene1,falkor,qdf24xx,exynosm1,phecda,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,cortexa76ae,cortexa77,cortexa65,cortexa65ae,ares,neoversen1,neoversee1,octeontx2,octeontx2t98,octeontx2t96,octeontx2t93,octeontx2f95,octeontx2f95n,octeontx2f95mm,tsv110,thunderx3t110,zeus,saphira,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55,cortexa76cortexa55"
++ "cortexa34,cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,octeontx,octeontxt81,octeontxt83,thunderxt81,thunderxt83,emag,xgene1,falkor,qdf24xx,exynosm1,phecda,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,cortexa76ae,cortexa77,cortexa65,cortexa65ae,ares,neoversen1,neoversee1,octeontx2,octeontx2t98,octeontx2t96,octeontx2t93,octeontx2f95,octeontx2f95n,octeontx2f95mm,tsv110,thunderx3t110,zeus,neoversen2,saphira,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55,cortexa76cortexa55"
+ (const (symbol_ref "((enum attr_tune) aarch64_tune)")))
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+--- a/gcc/doc/invoke.texi 2021-12-21 00:50:18.345426447 -0800
++++ b/gcc/doc/invoke.texi 2021-12-21 01:11:18.547853686 -0800
+@@ -17010,8 +17010,8 @@ performance of the code. Permissible va
+ @samp{cortex-a57}, @samp{cortex-a72}, @samp{cortex-a73}, @samp{cortex-a75},
+ @samp{cortex-a76}, @samp{cortex-a76ae}, @samp{cortex-a77},
+ @samp{cortex-a65}, @samp{cortex-a65ae}, @samp{cortex-a34},
+-@samp{ares}, @samp{exynos-m1}, @samp{emag}, @samp{falkor},
+-@samp{neoverse-e1},@samp{neoverse-n1},@samp{qdf24xx}, @samp{saphira},
++@samp{ares}, @samp{exynos-m1}, @samp{emag}, @samp{falkor}, @samp{neoverse-e1},
++@samp{neoverse-n1}, @samp{neoverse-n2}, @samp{qdf24xx}, @samp{saphira},
+ @samp{phecda}, @samp{xgene1}, @samp{vulcan}, @samp{octeontx},
+ @samp{octeontx81}, @samp{octeontx83},
+ @samp{octeontx2}, @samp{octeontx2t98}, @samp{octeontx2t96}
--
2.31.1


Re: [PATCH] Binutils: CVE-2021-42574

Richard Purdie
 

On Mon, 2021-12-20 at 01:50 -0800, pgowda wrote:
Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=b3aa80b45c4f46029efeb204bb9f2d2c4278a0e5]

Signed-off-by: pgowda <pgowda.cve@...>
---
.../binutils/binutils-2.37.inc | 1 +
.../binutils/0001-CVE-2021-42574.patch | 1998 +++++++++++++++++
2 files changed, 1999 insertions(+)
create mode 100644 meta/recipes-devtools/binutils/binutils/0001-CVE-2021-42574.patch

diff --git a/meta/recipes-devtools/binutils/binutils-2.37.inc b/meta/recipes-devtools/binutils/binutils-2.37.inc
index fca4a80ad2..043f7f8235 100644
--- a/meta/recipes-devtools/binutils/binutils-2.37.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.37.inc
@@ -33,5 +33,6 @@ SRC_URI = "\
file://0016-Check-for-clang-before-checking-gcc-version.patch \
file://0017-bfd-Close-the-file-descriptor-if-there-is-no-archive.patch \
file://0001-elf-Discard-input-.note.gnu.build-id-sections.patch \
+ file://0001-CVE-2021-42574.patch \
"
S = "${WORKDIR}/git"
This fails to compile on mingw:

https://autobuilder.yoctoproject.org/typhoon/#/builders/89/builds/4502/steps/12/logs/stdio

I suspect we also need:

https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=795588aec4f894206863c938bd6d716895886009

Cheers,

Richard


[dunfell][PATCH] dropbear: Fix CVE-2020-36254

Ernst Sjöstrand <ernst.sjostrand@...>
 

Dropbear shares a lot of code with other SSH implementations, so this is
a port of CVE-2018-20685 to dropbear.

Reference:
https://github.com/mkj/dropbear/commit/8f8a3dff705fad774a10864a2e3dbcfa9779ceff

Signed-off-by: Ernst Sjöstrand <ernst.sjostrand@...>
---
meta/recipes-core/dropbear/dropbear.inc | 4 +++-
...c-Port-OpenSSH-CVE-2018-20685-fix-80.patch | 23 +++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-core/dropbear/dropbear/0001-scp.c-Port-OpenSSH-CVE-2018-20685-fix-80.patch

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index d41e8b36dc..83bcdbc0a1 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -22,7 +22,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
file://dropbear.socket \
file://dropbear.default \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} "
+ ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \
+ file://0001-scp.c-Port-OpenSSH-CVE-2018-20685-fix-80.patch \
+ "

PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
file://0006-dropbear-configuration-file.patch \
diff --git a/meta/recipes-core/dropbear/dropbear/0001-scp.c-Port-OpenSSH-CVE-2018-20685-fix-80.patch b/meta/recipes-core/dropbear/dropbear/0001-scp.c-Port-OpenSSH-CVE-2018-20685-fix-80.patch
new file mode 100644
index 0000000000..72ac3e6630
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/0001-scp.c-Port-OpenSSH-CVE-2018-20685-fix-80.patch
@@ -0,0 +1,23 @@
+From c96c48d62aefc372f2105293ddf8cff2d116dc3a Mon Sep 17 00:00:00 2001
+From: Haelwenn Monnier <contact+github.com@...>
+Date: Mon, 25 May 2020 14:54:29 +0200
+Subject: [PATCH] scp.c: Port OpenSSH CVE-2018-20685 fix (#80)
+
+---
+ scp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/scp.c b/scp.c
+index 742ae00..7b8e7d2 100644
+--- a/scp.c
++++ b/scp.c
+@@ -935,7 +935,8 @@ sink(int argc, char **argv)
+ size = size * 10 + (*cp++ - '0');
+ if (*cp++ != ' ')
+ SCREWUP("size not delimited");
+- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
++ if (*cp == '\0' || strchr(cp, '/') != NULL ||
++ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
+ run_err("error: unexpected filename: %s", cp);
+ exit(1);
+ }
--
2.34.0


Re: [qa-build-notification] QA notification for completed autobuilder build (yocto-3.1.13.rc1)

Teoh, Jay Shen
 

Hi all,

This is the full report for yocto-3.1.13.rc1:
https://git.yoctoproject.org/cgit/cgit.cgi/yocto-testresults-contrib/tree/?h=intel-yocto-testresults

======= Summary ========
No high milestone defects.

new issue found

Bug 14669 - [QA 3.1.13 RC1] failure in ptest :gstreamer1.0.gstreamer-1.0/pipelines_seek.test


======= Bugs ========
https://bugzilla.yoctoproject.org/show_bug.cgi?id=14669

Thanks,
Jay

-----Original Message-----
From: qa-build-notification@... <qa-build-
notification@...> On Behalf Of Richard Purdie
Sent: Wednesday, 15 December, 2021 3:40 PM
To: <yocto@...> <yocto@...>
Cc: qa-build-notification <qa-build-notification@...>
Subject: [qa-build-notification] QA notification for completed autobuilder build
(yocto-3.1.13.rc1)

A build flagged for QA (yocto-3.1.13.rc1) was completed on the autobuilder and is
available at:


https://autobuilder.yocto.io/pub/releases/yocto-3.1.13.rc1


Build hash information:

bitbake: f18b65d0b9a6b983d53bde491e1bf2ca56949444
meta-agl: 6d1ab9f3bb270a773ec5d2f7c8c856796833b559
meta-arm: ce535dfb96de4d2529f091d7d85a7172c626001c
meta-aws: 9979cfa676105cb68cfadfdaeabf044d7c919319
meta-gplv2: 60b251c25ba87e946a0ca4cdc8d17b1cb09292ac
meta-intel: 87984115eb6ed1a4c17204629dcb100f6b76fe82
meta-mingw: 524de686205b5d6736661d4532f5f98fee8589b7
meta-openembedded: 69f94af4d91215e7d4e225bab54bf3bcfee42f1c
oecore: 90a07178ea26be453d101c2e8b33d3a0f437635d
poky: 795339092f87672e4f68e4d3bc4cfd0e252d1831



This is an automated message from the Yocto Project Autobuilder
Git: git://git.yoctoproject.org/yocto-autobuilder2
Email: richard.purdie@...







[hardknott][PATCH] Add support for Neoverse N2 CPU

Pgowda
 

This patch backports the AArch32 support for Arm's Neoverse N2 CPU.

Upstream-Status: Backport
[https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=d7e8411f6a333d4054894ad3b23f23415a525230]

Signed-off-by: pgowda <pgowda.cve@...>
---
meta/recipes-devtools/gcc/gcc-10.2.inc | 1 +
.../0038-aarch64-neoverse-n2-support.patch | 88 +++++++++++++++++++
2 files changed, 89 insertions(+)
create mode 100644 meta/recipes-devtools/gcc/gcc/0038-aarch64-neoverse-n2-support.patch

diff --git a/meta/recipes-devtools/gcc/gcc-10.2.inc b/meta/recipes-devtools/gcc/gcc-10.2.inc
index 5626bf20f0..8fcc53df38 100644
--- a/meta/recipes-devtools/gcc/gcc-10.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-10.2.inc
@@ -74,6 +74,7 @@ SRC_URI = "\
file://0002-CVE-2021-35465.patch \
file://0003-CVE-2021-35465.patch \
file://0004-CVE-2021-35465.patch \
+ file://0038-aarch64-neoverse-n2-support.patch \
"
SRC_URI[sha256sum] = "b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c"

diff --git a/meta/recipes-devtools/gcc/gcc/0038-aarch64-neoverse-n2-support.patch b/meta/recipes-devtools/gcc/gcc/0038-aarch64-neoverse-n2-support.patch
new file mode 100644
index 0000000000..3e42266b81
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc/0038-aarch64-neoverse-n2-support.patch
@@ -0,0 +1,88 @@
+From d7e8411f6a333d4054894ad3b23f23415a525230 Mon Sep 17 00:00:00 2001
+From: Alex Coplan <alex.coplan@...>
+Date: Fri, 2 Oct 2020 16:06:15 +0100
+Subject: [PATCH] arm: Add support for Neoverse N2 CPU
+
+This patch backports the AArch32 support for Arm's Neoverse N2 CPU to
+GCC 10.
+
+gcc/ChangeLog:
+
+ * config/arm/arm-cpus.in (neoverse-n2): New.
+ * config/arm/arm-tables.opt: Regenerate.
+ * config/arm/arm-tune.md: Regenerate.
+ * doc/invoke.texi: Document support for Neoverse N2.
+
+Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=d7e8411f6a333d4054894ad3b23f23415a525230]
+
+Signed-off-by: pgowda <pgowda.cve@...>
+---
+ gcc/config/arm/arm-cpus.in | 12 ++++++++++++
+ gcc/config/arm/arm-tables.opt | 3 +++
+ gcc/config/arm/arm-tune.md | 5 +++--
+ gcc/doc/invoke.texi | 6 +++---
+ 4 files changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
+--- a/gcc/config/arm/arm-cpus.in 2021-12-20 20:24:59.912159845 -0800
++++ b/gcc/config/arm/arm-cpus.in 2021-12-20 21:00:04.417003845 -0800
+@@ -1481,6 +1481,18 @@ begin cpu cortex-a76.cortex-a55
+ costs cortex_a57
+ end cpu cortex-a76.cortex-a55
+
++# Armv8.5 A-profile Architecture Processors
++begin cpu neoverse-n2
++ cname neoversen2
++ tune for cortex-a57
++ tune flags LDSCHED
++ architecture armv8.5-a+fp16+bf16+i8mm
++ option crypto add FP_ARMv8 CRYPTO
++ costs cortex_a57
++ vendor 41
++ part 0xd49
++end cpu neoverse-n2
++
+ # V8 M-profile implementations.
+ begin cpu cortex-m23
+ cname cortexm23
+diff --git a/gcc/config/arm/arm-tables.opt b/gcc/config/arm/arm-tables.opt
+--- a/gcc/config/arm/arm-tables.opt 2020-07-22 23:35:54.688795958 -0700
++++ b/gcc/config/arm/arm-tables.opt 2021-12-20 21:00:04.421003776 -0800
+@@ -253,6 +253,9 @@ EnumValue
+ Enum(processor_type) String(cortex-m23) Value( TARGET_CPU_cortexm23)
+
+ EnumValue
++Enum(processor_type) String(neoverse-n2) Value( TARGET_CPU_neoversen2)
++
++EnumValue
+ Enum(processor_type) String(cortex-m33) Value( TARGET_CPU_cortexm33)
+
+ EnumValue
+diff --git a/gcc/config/arm/arm-tune.md b/gcc/config/arm/arm-tune.md
+--- a/gcc/config/arm/arm-tune.md 2020-07-22 23:35:54.684795913 -0700
++++ b/gcc/config/arm/arm-tune.md 2021-12-20 21:02:44.630260284 -0800
+@@ -46,6 +46,6 @@
+ cortexa73cortexa53,cortexa55,cortexa75,
+ cortexa76,cortexa76ae,cortexa77,
+ neoversen1,cortexa75cortexa55,cortexa76cortexa55,
+- cortexm23,cortexm33,cortexm35p,
+- cortexm55,cortexr52"
++ neoversen2,cortexm23,cortexm33,
++ cortexm35p,cortexm55,cortexr52"
+ (const (symbol_ref "((enum attr_tune) arm_tune)")))
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+--- a/gcc/doc/invoke.texi 2021-12-20 20:24:59.916159782 -0800
++++ b/gcc/doc/invoke.texi 2021-12-20 21:03:41.337290704 -0800
+@@ -18857,9 +18857,9 @@ Permissible names are: @samp{arm7tdmi},
+ @samp{cortex-m35p}, @samp{cortex-m55},
+ @samp{cortex-m1.small-multiply}, @samp{cortex-m0.small-multiply},
+ @samp{cortex-m0plus.small-multiply}, @samp{exynos-m1}, @samp{marvell-pj4},
+-@samp{neoverse-n1}, @samp{xscale}, @samp{iwmmxt}, @samp{iwmmxt2},
+-@samp{ep9312}, @samp{fa526}, @samp{fa626}, @samp{fa606te}, @samp{fa626te},
+-@samp{fmp626}, @samp{fa726te}, @samp{xgene1}.
++@samp{neoverse-n1}, @samp{neoverse-n2}, @samp{xscale}, @samp{iwmmxt},
++@samp{iwmmxt2}, @samp{ep9312}, @samp{fa526}, @samp{fa626}, @samp{fa606te},
++@samp{fa626te}, @samp{fmp626}, @samp{fa726te}, @samp{xgene1}.
+
+ Additionally, this option can specify that GCC should tune the performance
+ of the code for a big.LITTLE system. Permissible names are:
--
2.31.1


Re: [PATCH 1/2] busybox: refresh the defconfig from 1.33.0

Andre McCurdy
 

On Mon, Dec 20, 2021 at 5:08 AM Martin Jansa <Martin.Jansa@...> wrote:

Hi,

I don't remember the details, but looks like not intended. I guess I was running with default SRC_URI which contains syslog.cfg and other optional fragments, can you please refresh it again with all .cfg files removed from SRC_URI?
Yes, when refreshing the defconfig you need to do it first with all
config fragments disabled and then review and manually update the
fragments as required as a second step.

Regards,

On Thu, Dec 16, 2021 at 6:26 PM Jan Lübbe <jlu@...> wrote:

Hi Martin,

I just noticed that since this change, syslogd is compiled in by default, even I
have SRC_URI:remove = "file://syslog.cfg" in a bbappend. Is this intentional?
Otherwise, I'd prefer change the back to disabled by default (SRC_URI still
contains syslog.cfg by default).

Regards,
Jan

On Wed, 2021-03-10 at 14:37 +0100, Martin Jansa wrote:
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_FEATURE_KMSG_SYSLOG is not set
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_CFG=y
+# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64
+CONFIG_FEATURE_KMSG_SYSLOG=y
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |



Yocto Project Newcomer & Unassigned Bugs - Help Needed

Stephen Jolley
 

All,

 

The triage team is starting to try and collect up and classify bugs which a newcomer to the project would be able to work on in a way which means people can find them. They're being listed on the triage page under the appropriate heading:

https://wiki.yoctoproject.org/wiki/Bug_Triage#Newcomer_Bugs  Also please review: https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded and how to create a bugzilla account at: https://bugzilla.yoctoproject.org/createaccount.cgi

The idea is these bugs should be straight forward for a person to help work on who doesn't have deep experience with the project.  If anyone can help, please take ownership of the bug and send patches!  If anyone needs help/advice there are people on irc who can likely do so, or some of the more experienced contributors will likely be happy to help too.

 

Also, the triage team meets weekly and does its best to handle the bugs reported into the Bugzilla. The number of people attending that meeting has fallen, as have the number of people available to help fix bugs. One of the things we hear users report is they don't know how to help. We (the triage team) are therefore going to start reporting out the currently 396 unassigned or newcomer bugs.

 

We're hoping people may be able to spare some time now and again to help out with these.  Bugs are split into two types, "true bugs" where things don't work as they should and "enhancements" which are features we'd want to add to the system.  There are also roughly four different "priority" classes right now, “3.4”, “3.5, "3.99" and "Future", the more pressing/urgent issues being in "3.4" and then “3.5”.

 

Please review this link and if a bug is something you would be able to help with either take ownership of the bug, or send me (sjolley.yp.pm@...) an e-mail with the bug number you would like and I will assign it to you (please make sure you have a Bugzilla account).  The list is at: https://wiki.yoctoproject.org/wiki/Bug_Triage_Archive#Unassigned_or_Newcomer_Bugs

 

Thanks,

 

Stephen K. Jolley

Yocto Project Program Manager

(    Cell:                (208) 244-4460

* Email:              sjolley.yp.pm@...

 


Re: [PATCH 0/4] Move crate fetcher to OE_IMPORTS

Richard Purdie
 

On Mon, 2021-12-20 at 17:01 +0000, Paul Barker wrote:
On 17/12/2021 15:36, Matt Madison wrote:
This patch series switches to using the OE_IMPORTS mechanism
for installing the crate fetcher. This simplifies the addition
and clears up issues with interactions between SRCPV and
the shared-state fetching logic.

Matt Madison (4):
lib/crate.py: install crate fetcher on import
base.bbclass: add crate to OE_IMPORTS
cargo_common.bbclass: remove inherit of crate-fetch
classes: remove crate-fetch.bbclass

meta/classes/base.bbclass | 2 +-
meta/classes/cargo_common.bbclass | 2 --
meta/classes/crate-fetch.bbclass | 28 ----------------------------
meta/lib/crate.py | 2 ++
4 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100644 meta/classes/crate-fetch.bbclass
Would a better solution here be to move the crate fetcher into
lib/bb/fetch2/ in bitbake?
I've been wondering about this too.

Does anyone remember how the fetcher lines up against the general fetcher
requirements we have and is there a list of anything that remained to be done
before it could be added to bitbake?

Cheers,

Richard


[PATCH v2 1/3] classes/kernel*: allow disabling symlink creation

Paul Eggleton
 

From: Paul Eggleton <paul.eggleton@...>

Allow setting any of the *_LINK_NAME variables to empty string in order
to disable creating symlinks for kernel artifacts, as you can already
for filesystem images with IMAGE_LINK_NAME. Additionally, for the image
type named symlinks, add a KERNEL_IMAGETYPE_SYMLINK boolean variable
which you can set to 0 to disable those symlinks as well.

Signed-off-by: Paul Eggleton <paul.eggleton@...>
---
meta/classes/kernel-artifact-names.bbclass | 1 +
meta/classes/kernel-devicetree.bbclass | 20 ++++++++++++++------
meta/classes/kernel-fitimage.bbclass | 16 ++++++++++++----
meta/classes/kernel.bbclass | 16 ++++++++++++----
4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass
index a65cddd..e1d943b 100644
--- a/meta/classes/kernel-artifact-names.bbclass
+++ b/meta/classes/kernel-artifact-names.bbclass
@@ -11,6 +11,7 @@ KERNEL_ARTIFACT_LINK_NAME ?= "${MACHINE}"

KERNEL_IMAGE_NAME ?= "${KERNEL_ARTIFACT_NAME}"
KERNEL_IMAGE_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}"
+KERNEL_IMAGETYPE_SYMLINK ?= "1"

KERNEL_DTB_NAME ?= "${KERNEL_ARTIFACT_NAME}"
KERNEL_DTB_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}"
diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
index a50ea4f..c8aaf74 100644
--- a/meta/classes/kernel-devicetree.bbclass
+++ b/meta/classes/kernel-devicetree.bbclass
@@ -83,21 +83,29 @@ do_deploy:append() {
dtb_base_name=`basename $dtb .$dtb_ext`
install -d $deployDir
install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext
- ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name.$dtb_ext
- ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext
+ if [ "${KERNEL_IMAGETYPE_SYMLINK}" = "1" ] ; then
+ ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name.$dtb_ext
+ fi
+ if [ -n "${KERNEL_DTB_LINK_NAME}" ] ; then
+ ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext
+ fi
for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
cat ${D}/${KERNEL_IMAGEDEST}/$type \
$deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
> $deployDir/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
- ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
- $deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+ if [ -n "${KERNEL_DTB_LINK_NAME}" ]; then
+ ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
+ $deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+ fi
if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
cat ${KERNEL_OUTPUT_DIR}/${type}.initramfs \
$deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
> $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
- ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
- $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+ if [ -n "${KERNEL_DTB_LINK_NAME}" ]; then
+ ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
+ $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+ fi
fi
fi
done
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 8718ce7..11dce67 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -722,22 +722,30 @@ kernel_do_deploy:append() {
if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
echo "Copying fit-image.its source file..."
install -m 0644 ${B}/fit-image.its "$deployDir/fitImage-its-${KERNEL_FIT_NAME}.its"
- ln -snf fitImage-its-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${KERNEL_FIT_LINK_NAME}"
+ if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
+ ln -snf fitImage-its-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${KERNEL_FIT_LINK_NAME}"
+ fi

echo "Copying linux.bin file..."
install -m 0644 ${B}/linux.bin $deployDir/fitImage-linux.bin-${KERNEL_FIT_NAME}.bin
- ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}"
+ if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
+ ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}"
+ fi
fi

if [ -n "${INITRAMFS_IMAGE}" ]; then
echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its"
- ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
+ if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
+ ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
+ fi

if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
echo "Copying fitImage-${INITRAMFS_IMAGE} file..."
install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin"
- ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
+ if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
+ ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
+ fi
fi
fi
fi
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 0df24ac..57990bd 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -769,8 +769,12 @@ kernel_do_deploy() {
for imageType in ${KERNEL_IMAGETYPES} ; do
baseName=$imageType-${KERNEL_IMAGE_NAME}
install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType $deployDir/$baseName.bin
- ln -sf $baseName.bin $deployDir/$imageType-${KERNEL_IMAGE_LINK_NAME}.bin
- ln -sf $baseName.bin $deployDir/$imageType
+ if [ -n "${KERNEL_IMAGE_LINK_NAME}" ] ; then
+ ln -sf $baseName.bin $deployDir/$imageType-${KERNEL_IMAGE_LINK_NAME}.bin
+ fi
+ if [ "${KERNEL_IMAGETYPE_SYMLINK}" = "1" ] ; then
+ ln -sf $baseName.bin $deployDir/$imageType
+ fi
done

if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
@@ -783,7 +787,9 @@ kernel_do_deploy() {
TAR_ARGS="$TAR_ARGS --owner=0 --group=0"
tar $TAR_ARGS -cv -C ${D}${root_prefix} lib | gzip -9n > $deployDir/modules-${MODULE_TARBALL_NAME}.tgz

- ln -sf modules-${MODULE_TARBALL_NAME}.tgz $deployDir/modules-${MODULE_TARBALL_LINK_NAME}.tgz
+ if [ -n "${MODULE_TARBALL_LINK_NAME}" ] ; then
+ ln -sf modules-${MODULE_TARBALL_NAME}.tgz $deployDir/modules-${MODULE_TARBALL_LINK_NAME}.tgz
+ fi
fi

if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
@@ -793,7 +799,9 @@ kernel_do_deploy() {
fi
initramfsBaseName=$imageType-${INITRAMFS_NAME}
install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.initramfs $deployDir/$initramfsBaseName.bin
- ln -sf $initramfsBaseName.bin $deployDir/$imageType-${INITRAMFS_LINK_NAME}.bin
+ if [ -n "${INITRAMFS_LINK_NAME}" ] ; then
+ ln -sf $initramfsBaseName.bin $deployDir/$imageType-${INITRAMFS_LINK_NAME}.bin
+ fi
done
fi
}
--
1.8.3.1


[PATCH v2 3/3] classes/qemuboot: allow IMAGE_LINK_NAME to be empty

Paul Eggleton
 

From: Paul Eggleton <paul.eggleton@...>

If IMAGE_LINK_NAME is empty (supported everywhere else) then do not
create the symlink for the .qemuboot file.

Signed-off-by: Paul Eggleton <paul.eggleton@...>
---
meta/classes/qemuboot.bbclass | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index 8cdb544..95cd1d6 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -118,7 +118,10 @@ python do_write_qemuboot_conf() {
import configparser

qemuboot = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_NAME'))
- qemuboot_link = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_LINK_NAME'))
+ if d.getVar('IMAGE_LINK_NAME'):
+ qemuboot_link = "%s/%s.qemuboot.conf" % (d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_LINK_NAME'))
+ else:
+ qemuboot_link = ""
finalpath = d.getVar("DEPLOY_DIR_IMAGE")
topdir = d.getVar('TOPDIR')
cf = configparser.ConfigParser()
@@ -153,7 +156,7 @@ python do_write_qemuboot_conf() {
with open(qemuboot, 'w') as f:
cf.write(f)

- if qemuboot_link != qemuboot:
+ if qemuboot_link and qemuboot_link != qemuboot:
if os.path.lexists(qemuboot_link):
os.remove(qemuboot_link)
os.symlink(os.path.basename(qemuboot), qemuboot_link)
--
1.8.3.1


[PATCH v2 0/3] Enable replacing image symlinks with unversioned files

Paul Eggleton
 

This patchset puts in the remaining pieces to allow disabling symlinks
and then renaming the real files to avoid having the version in their
names, for example:

IMAGE_LINK_NAME = ""
IMAGE_VERSION_SUFFIX = ""
IMAGE_NAME_SUFFIX = ""

INITRAMFS_LINK_NAME = ""

KERNEL_ARTIFACT_NAME = "${MACHINE}"
KERNEL_ARTIFACT_LINK_NAME = ""

KERNEL_FIT_BIN_EXT = ""
KERNEL_IMAGETYPE_SYMLINK = "0"


Changes since v1 (a year ago!):
* Add KERNEL_IMAGETYPE_SYMLINK to allow explicitly disabling kernel
image type named symlinks (e.g. "bzImage")
* Add variables to allow changing/disabling kernel artifact .bin extension
* Fix unconditional IMAGE_LINK_NAME usage in qemuboot.bbclass


The following changes since commit a5459e42f1a6be9c08f303653cc1f73514eca9ef:

oeqa/selftest/bbtests: Use YP sources mirror instead of GNU (2021-12-20 15:28:57 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/kernel-symlinks
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/kernel-symlinks

Paul Eggleton (3):
classes/kernel*: allow disabling symlink creation
classes/kernel*: add variables to allow changing artifact extension
classes/qemuboot: allow IMAGE_LINK_NAME to be empty

meta/classes/kernel-artifact-names.bbclass | 5 +++++
meta/classes/kernel-devicetree.bbclass | 24 ++++++++++++++++--------
meta/classes/kernel-fitimage.bbclass | 20 ++++++++++++++------
meta/classes/kernel.bbclass | 20 ++++++++++++++------
meta/classes/qemuboot.bbclass | 7 +++++--
5 files changed, 54 insertions(+), 22 deletions(-)

--
1.8.3.1


[PATCH v2 2/3] classes/kernel*: add variables to allow changing artifact extension

Paul Eggleton
 

From: Paul Eggleton <paul.eggleton@...>

Allow .bin suffix to be removed (or changed) in the various artifact
filenames. Removing this extension is useful when trying to remove
symlinks and present only unversioned image files (especially for the
FIT image).

Signed-off-by: Paul Eggleton <paul.eggleton@...>
---
meta/classes/kernel-artifact-names.bbclass | 4 ++++
meta/classes/kernel-devicetree.bbclass | 12 ++++++------
meta/classes/kernel-fitimage.bbclass | 8 ++++----
meta/classes/kernel.bbclass | 10 +++++-----
4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass
index e1d943b..e77107c 100644
--- a/meta/classes/kernel-artifact-names.bbclass
+++ b/meta/classes/kernel-artifact-names.bbclass
@@ -8,16 +8,20 @@ inherit image-artifact-names

KERNEL_ARTIFACT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
KERNEL_ARTIFACT_LINK_NAME ?= "${MACHINE}"
+KERNEL_ARTIFACT_BIN_EXT ?= ".bin"

KERNEL_IMAGE_NAME ?= "${KERNEL_ARTIFACT_NAME}"
KERNEL_IMAGE_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}"
+KERNEL_IMAGE_BIN_EXT ?= "${KERNEL_ARTIFACT_BIN_EXT}"
KERNEL_IMAGETYPE_SYMLINK ?= "1"

KERNEL_DTB_NAME ?= "${KERNEL_ARTIFACT_NAME}"
KERNEL_DTB_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}"
+KERNEL_DTB_BIN_EXT ?= "${KERNEL_ARTIFACT_BIN_EXT}"

KERNEL_FIT_NAME ?= "${KERNEL_ARTIFACT_NAME}"
KERNEL_FIT_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}"
+KERNEL_FIT_BIN_EXT ?= "${KERNEL_ARTIFACT_BIN_EXT}"

MODULE_TARBALL_NAME ?= "${KERNEL_ARTIFACT_NAME}"
MODULE_TARBALL_LINK_NAME ?= "${KERNEL_ARTIFACT_LINK_NAME}"
diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
index c8aaf74..b4338da 100644
--- a/meta/classes/kernel-devicetree.bbclass
+++ b/meta/classes/kernel-devicetree.bbclass
@@ -93,18 +93,18 @@ do_deploy:append() {
if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
cat ${D}/${KERNEL_IMAGEDEST}/$type \
$deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
- > $deployDir/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
+ > $deployDir/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
if [ -n "${KERNEL_DTB_LINK_NAME}" ]; then
- ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
- $deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+ ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT} \
+ $deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
fi
if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
cat ${KERNEL_OUTPUT_DIR}/${type}.initramfs \
$deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
- > $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
+ > $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
if [ -n "${KERNEL_DTB_LINK_NAME}" ]; then
- ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
- $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
+ ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT} \
+ $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
fi
fi
fi
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 11dce67..b0c971b 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -727,9 +727,9 @@ kernel_do_deploy:append() {
fi

echo "Copying linux.bin file..."
- install -m 0644 ${B}/linux.bin $deployDir/fitImage-linux.bin-${KERNEL_FIT_NAME}.bin
+ install -m 0644 ${B}/linux.bin $deployDir/fitImage-linux.bin-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}
if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
- ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}"
+ ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} "$deployDir/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}"
fi
fi

@@ -742,9 +742,9 @@ kernel_do_deploy:append() {

if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
echo "Copying fitImage-${INITRAMFS_IMAGE} file..."
- install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin"
+ install -m 0644 ${B}/arch/${ARCH}/boot/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}"
if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
- ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.bin "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
+ ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
fi
fi
fi
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 57990bd..5d70940 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -768,12 +768,12 @@ kernel_do_deploy() {

for imageType in ${KERNEL_IMAGETYPES} ; do
baseName=$imageType-${KERNEL_IMAGE_NAME}
- install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType $deployDir/$baseName.bin
+ install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType $deployDir/$baseName${KERNEL_IMAGE_BIN_EXT}
if [ -n "${KERNEL_IMAGE_LINK_NAME}" ] ; then
- ln -sf $baseName.bin $deployDir/$imageType-${KERNEL_IMAGE_LINK_NAME}.bin
+ ln -sf $baseName${KERNEL_IMAGE_BIN_EXT} $deployDir/$imageType-${KERNEL_IMAGE_LINK_NAME}${KERNEL_IMAGE_BIN_EXT}
fi
if [ "${KERNEL_IMAGETYPE_SYMLINK}" = "1" ] ; then
- ln -sf $baseName.bin $deployDir/$imageType
+ ln -sf $baseName${KERNEL_IMAGE_BIN_EXT} $deployDir/$imageType
fi
done

@@ -798,9 +798,9 @@ kernel_do_deploy() {
continue
fi
initramfsBaseName=$imageType-${INITRAMFS_NAME}
- install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.initramfs $deployDir/$initramfsBaseName.bin
+ install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.initramfs $deployDir/$initramfsBaseName${KERNEL_IMAGE_BIN_EXT}
if [ -n "${INITRAMFS_LINK_NAME}" ] ; then
- ln -sf $initramfsBaseName.bin $deployDir/$imageType-${INITRAMFS_LINK_NAME}.bin
+ ln -sf $initramfsBaseName${KERNEL_IMAGE_BIN_EXT} $deployDir/$imageType-${INITRAMFS_LINK_NAME}${KERNEL_IMAGE_BIN_EXT}
fi
done
fi
--
1.8.3.1


[PATCH 3/3] kmod: expand compression PACKAGECONFIGs

Ross Burton <ross@...>
 

Turn the explicitly enabled zlib support into an enabled by default
PACKAGECONFIG, and add Zstd support (disabled by default).

Signed-off-by: Ross Burton <ross.burton@...>
---
meta/recipes-kernel/kmod/kmod_29.bb | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/kmod/kmod_29.bb b/meta/recipes-kernel/km=
od/kmod_29.bb
index 904a17d9d0..9ac5214df6 100644
--- a/meta/recipes-kernel/kmod/kmod_29.bb
+++ b/meta/recipes-kernel/kmod/kmod_29.bb
@@ -24,17 +24,19 @@ SRC_URI =3D "git://git.kernel.org/pub/scm/utils/kerne=
l/kmod/kmod.git;branch=3Dmaster
=20
S =3D "${WORKDIR}/git"
=20
-EXTRA_OECONF +=3D "--enable-tools --with-zlib"
+EXTRA_OECONF +=3D "--enable-tools"
=20
+PACKAGECONFIG ??=3D "zlib"
PACKAGECONFIG[debug] =3D "--enable-debug,--disable-debug"
PACKAGECONFIG[logging] =3D " --enable-logging,--disable-logging"
PACKAGECONFIG[manpages] =3D "--enable-manpages, --disable-manpages, libx=
slt-native xmlto-native"
-PACKAGECONFIG[xz] =3D "--with-xz,--without-xz,xz"
PACKAGECONFIG[openssl] =3D "--with-openssl,--without-openssl,openssl"
+PACKAGECONFIG[xz] =3D "--with-xz,--without-xz,xz"
+PACKAGECONFIG[zlib] =3D "--with-zlib,--without-zlib,zlib"
+PACKAGECONFIG[zstd] =3D "--with-zstd,--without-zstd,zstd"
=20
GTKDOC_DOCDIR =3D "${S}/libkmod/docs"
=20
-DEPENDS +=3D "zlib"
PROVIDES +=3D "module-init-tools-insmod-static module-init-tools-depmod =
module-init-tools"
RPROVIDES:${PN} +=3D "module-init-tools-insmod-static module-init-tools-=
depmod module-init-tools"
RCONFLICTS:${PN} +=3D "module-init-tools-insmod-static module-init-tools=
-depmod module-init-tools"
--=20
2.25.1


[PATCH 2/3] kmod: merge target/native recipes

Ross Burton <ross@...>
 

There's no good reason to keep separate target and native recipes for
kmod, so merge them into a single kmod_29.bb which uses class extension.

The symlinks are not created differently for target vs native builds, as
the native sbindir is in PATH.

Signed-off-by: Ross Burton <ross.burton@...>
---
meta/recipes-kernel/kmod/kmod-native_git.bb | 15 -------
meta/recipes-kernel/kmod/kmod.inc | 37 ----------------
.../kmod/{kmod_git.bb =3D> kmod_29.bb} | 44 +++++++++++++++----
3 files changed, 35 insertions(+), 61 deletions(-)
delete mode 100644 meta/recipes-kernel/kmod/kmod-native_git.bb
delete mode 100644 meta/recipes-kernel/kmod/kmod.inc
rename meta/recipes-kernel/kmod/{kmod_git.bb =3D> kmod_29.bb} (60%)

diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-k=
ernel/kmod/kmod-native_git.bb
deleted file mode 100644
index 4dd34b1c82..0000000000
--- a/meta/recipes-kernel/kmod/kmod-native_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2012 Khem Raj <raj.khem@...>
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require kmod.inc
-
-DEPENDS +=3D "zlib-native"
-
-inherit native
-
-do_install:append (){
- for tool in depmod insmod lsmod modinfo modprobe rmmod
- do
- ln -s kmod ${D}${bindir}/$tool
- done
-}
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod=
/kmod.inc
deleted file mode 100644
index d527887b78..0000000000
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2012 Khem Raj <raj.khem@...>
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-SUMMARY =3D "Tools for managing Linux kernel modules"
-DESCRIPTION =3D "kmod is a set of tools to handle common tasks with Linu=
x kernel modules like \
- insert, remove, list, check properties, resolve dependenc=
ies and aliases."
-HOMEPAGE =3D "http://kernel.org/pub/linux/utils/kernel/kmod/"
-LICENSE =3D "GPL-2.0+ & LGPL-2.1+"
-LICENSE:libkmod =3D "LGPL-2.1+"
-SECTION =3D "base"
-
-LIC_FILES_CHKSUM =3D "file://COPYING;md5=3Da6f89e2100d9b6cdffcea4f398e37=
343 \
- file://libkmod/COPYING;md5=3Da6f89e2100d9b6cdffcea4f=
398e37343 \
- file://tools/COPYING;md5=3D751419260aa954499f7abaaba=
a882bbe \
- "
-inherit autotools gtk-doc pkgconfig manpages
-
-SRCREV =3D "b6ecfc916a17eab8f93be5b09f4e4f845aabd3d1"
-# Lookout for PV bump too when SRCREV is changed
-PV =3D "29"
-
-SRC_URI =3D "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;bra=
nch=3Dmaster \
- file://depmod-search.conf \
- file://avoid_parallel_tests.patch \
- "
-
-S =3D "${WORKDIR}/git"
-
-EXTRA_OECONF +=3D" --enable-tools --with-zlib"
-
-PACKAGECONFIG[debug] =3D "--enable-debug,--disable-debug"
-PACKAGECONFIG[logging] =3D " --enable-logging,--disable-logging"
-PACKAGECONFIG[manpages] =3D "--enable-manpages, --disable-manpages, libx=
slt-native xmlto-native"
-PACKAGECONFIG[xz] =3D "--with-xz,--without-xz,xz"
-PACKAGECONFIG[openssl] =3D "--with-openssl,--without-openssl,openssl"
-
-GTKDOC_DOCDIR =3D "${S}/libkmod/docs"
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/k=
mod/kmod_29.bb
similarity index 60%
rename from meta/recipes-kernel/kmod/kmod_git.bb
rename to meta/recipes-kernel/kmod/kmod_29.bb
index 234f072fb6..904a17d9d0 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_29.bb
@@ -1,7 +1,38 @@
# Copyright (C) 2012 Khem Raj <raj.khem@...>
# Released under the MIT license (see COPYING.MIT for the terms)
=20
-require kmod.inc
+SUMMARY =3D "Tools for managing Linux kernel modules"
+DESCRIPTION =3D "kmod is a set of tools to handle common tasks with Linu=
x kernel modules like \
+ insert, remove, list, check properties, resolve dependenc=
ies and aliases."
+HOMEPAGE =3D "http://kernel.org/pub/linux/utils/kernel/kmod/"
+LICENSE =3D "GPL-2.0+ & LGPL-2.1+"
+LICENSE:libkmod =3D "LGPL-2.1+"
+SECTION =3D "base"
+
+LIC_FILES_CHKSUM =3D "file://COPYING;md5=3Da6f89e2100d9b6cdffcea4f398e37=
343 \
+ file://libkmod/COPYING;md5=3Da6f89e2100d9b6cdffcea4f=
398e37343 \
+ file://tools/COPYING;md5=3D751419260aa954499f7abaaba=
a882bbe \
+ "
+inherit autotools bash-completion gtk-doc pkgconfig manpages update-alte=
rnatives
+
+SRCREV =3D "b6ecfc916a17eab8f93be5b09f4e4f845aabd3d1"
+
+SRC_URI =3D "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;bra=
nch=3Dmaster \
+ file://depmod-search.conf \
+ file://avoid_parallel_tests.patch \
+ "
+
+S =3D "${WORKDIR}/git"
+
+EXTRA_OECONF +=3D "--enable-tools --with-zlib"
+
+PACKAGECONFIG[debug] =3D "--enable-debug,--disable-debug"
+PACKAGECONFIG[logging] =3D " --enable-logging,--disable-logging"
+PACKAGECONFIG[manpages] =3D "--enable-manpages, --disable-manpages, libx=
slt-native xmlto-native"
+PACKAGECONFIG[xz] =3D "--with-xz,--without-xz,xz"
+PACKAGECONFIG[openssl] =3D "--with-openssl,--without-openssl,openssl"
+
+GTKDOC_DOCDIR =3D "${S}/libkmod/docs"
=20
DEPENDS +=3D "zlib"
PROVIDES +=3D "module-init-tools-insmod-static module-init-tools-depmod =
module-init-tools"
@@ -13,7 +44,7 @@ RREPLACES:${PN} +=3D "module-init-tools-insmod-static m=
odule-init-tools-depmod mod
RCONFLICTS:libkmod2 +=3D "module-init-tools-insmod-static module-init-to=
ols-depmod module-init-tools"
=20
# autotools set prefix to /usr, however we want them in /bin and /sbin
-EXTRA_OECONF +=3D " --bindir=3D${base_bindir} --sbindir=3D${base_sbindir=
}"
+EXTRA_OECONF +=3D "--bindir=3D${base_bindir} --sbindir=3D${base_sbindir}=
"
=20
do_install:append () {
install -dm755 ${D}${base_bindir}
@@ -33,26 +64,21 @@ do_install:append () {
install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${nonarch_ba=
se_libdir}/depmod.d/search.conf"
}
=20
-inherit update-alternatives bash-completion
-
ALTERNATIVE_PRIORITY =3D "70"
=20
ALTERNATIVE:kmod =3D "insmod modprobe rmmod modinfo bin-lsmod lsmod depm=
od"
=20
+ALTERNATIVE_LINK_NAME[depmod] =3D "${base_sbindir}/depmod"
ALTERNATIVE_LINK_NAME[insmod] =3D "${base_sbindir}/insmod"
ALTERNATIVE_LINK_NAME[modprobe] =3D "${base_sbindir}/modprobe"
ALTERNATIVE_LINK_NAME[rmmod] =3D "${base_sbindir}/rmmod"
ALTERNATIVE_LINK_NAME[modinfo] =3D "${base_sbindir}/modinfo"
ALTERNATIVE_LINK_NAME[bin-lsmod] =3D "${base_bindir}/lsmod"
-
ALTERNATIVE_LINK_NAME[lsmod] =3D "${base_sbindir}/lsmod"
ALTERNATIVE_TARGET[lsmod] =3D "${base_bindir}/lsmod.${BPN}"
=20
-ALTERNATIVE_LINK_NAME[depmod] =3D "${base_sbindir}/depmod"
-
PACKAGES =3D+ "libkmod"
-
FILES:libkmod =3D "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${=
SOLIBS}"
FILES:${PN} +=3D "${nonarch_base_libdir}/depmod.d ${nonarch_base_libdir}=
/modprobe.d"
=20
-BBCLASSEXTEND =3D "nativesdk"
+BBCLASSEXTEND =3D "native nativesdk"
--=20
2.25.1


[PATCH 1/3] kmod: remove obsolete ac_pwd manipulation

Ross Burton <ross@...>
 

Remove the change of ac_pwd from config.status as the build is
successful without it (it was added with no explanation in 152c973 when
ptest was enabled).

Signed-off-by: Ross Burton <ross.burton@...>
---
meta/recipes-kernel/kmod/kmod_git.bb | 4 ----
1 file changed, 4 deletions(-)

diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/k=
mod/kmod_git.bb
index 9bd66de430..234f072fb6 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -33,10 +33,6 @@ do_install:append () {
install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${nonarch_ba=
se_libdir}/depmod.d/search.conf"
}
=20
-do_compile:prepend() {
- sed -i 's/ac_pwd=3D/#ac_pwd=3D/' config.status ; sed -i "/#a=
c_pwd=3D/a\ac_pwd=3D'.'" config.status
-}
-
inherit update-alternatives bash-completion
=20
ALTERNATIVE_PRIORITY =3D "70"
--=20
2.25.1


[PATCH] gawk: remove load-sensitive tests

Ross Burton <ross@...>
 

The time and timeout tests are sensitive to system load, and as we run
these on build machines they fail randomly.

[ YOCTO #14371 ]

Signed-off-by: Ross Burton <ross.burton@...>
---
.../gawk/gawk/test-time.patch | 22 -------------------
meta/recipes-extended/gawk/gawk_5.1.1.bb | 6 ++++-
2 files changed, 5 insertions(+), 23 deletions(-)
delete mode 100644 meta/recipes-extended/gawk/gawk/test-time.patch

diff --git a/meta/recipes-extended/gawk/gawk/test-time.patch b/meta/recip=
es-extended/gawk/gawk/test-time.patch
deleted file mode 100644
index 05a68c5faf..0000000000
--- a/meta/recipes-extended/gawk/gawk/test-time.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-The test time.awk does a sleep() and checks that the real sleep duration=
is
-close to the expected duration.
-
-As currently our tests can run on a heavily loaded system, increase the =
range of
-a passing duration.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@...>
-
-diff --git a/test/time.awk b/test/time.awk
-index 517377e2..ca81d92d 100644
---- a/test/time.awk
-+++ b/test/time.awk
-@@ -16,7 +16,7 @@ BEGIN {
- printf "sleep(%s) =3D %s\n",delta,sleep(delta)
- t1 =3D timecheck()
- slept =3D t1-t0
-- if ((slept < 0.9*delta) || (slept > 1.3*delta))
-+ if ((slept < 0.5*delta) || (slept > 2*delta))
- printf "Warning: tried to sleep %.2f secs, but slept for %.2f sec=
s\n",
- delta,slept
- }
diff --git a/meta/recipes-extended/gawk/gawk_5.1.1.bb b/meta/recipes-exte=
nded/gawk/gawk_5.1.1.bb
index 215ac8c860..e3d85c8d53 100644
--- a/meta/recipes-extended/gawk/gawk_5.1.1.bb
+++ b/meta/recipes-extended/gawk/gawk_5.1.1.bb
@@ -17,7 +17,6 @@ PACKAGECONFIG[mpfr] =3D "--with-mpfr,--without-mpfr, mp=
fr"
=20
SRC_URI =3D "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
file://run-ptest \
- file://test-time.patch \
"
=20
SRC_URI[sha256sum] =3D "6168d8d1dc8f74bd17d9dc22fa9634c49070f232343b7449=
01da15fb4f06bffd"
@@ -48,6 +47,11 @@ do_install_ptest() {
-e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/tes=
t/*.awk
=20
sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests
+
+ # These tests require an unloaded host as otherwise timing sensitive te=
sts can fail
+ # https://bugzilla.yoctoproject.org/show_bug.cgi?id=3D14371
+ rm -f ${D}${PTEST_PATH}/test/time.*
+ rm -f ${D}${PTEST_PATH}/test/timeout.*
}
=20
RDEPENDS:${PN}-ptest +=3D "make"
--=20
2.25.1


[PATCH v2 2/2] openssl: upgrade to 3.0.1

Ross Burton <ross@...>
 

Major changes in 3.0.1:

* Fixed invalid handling of X509_verify_cert() internal errors in libss=
l
([CVE-2021-4044])
* Allow fetching an operation from the provider that owns an unexportab=
le key
as a fallback if that is still allowed by the property query.

Drop patches which were backported.

Add sed to openssl-ptest as the tests use 'sed -u', which isn't supported
by busybox.

Ensure that we package the dummy async engine, needed by the test suite.

Signed-off-by: Ross Burton <ross.burton@...>
---
...-EVP_PKEY_CTX_get_rsa_pss_saltlen-no.patch | 108 ------------------
.../openssl/openssl/armv8-32bit.patch | 29 -----
.../{openssl_3.0.0.bb =3D> openssl_3.0.1.bb} | 20 ++--
3 files changed, 9 insertions(+), 148 deletions(-)
delete mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-EV=
P_PKEY_CTX_get_rsa_pss_saltlen-no.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/armv8-32bit=
.patch
rename meta/recipes-connectivity/openssl/{openssl_3.0.0.bb =3D> openssl_=
3.0.1.bb} (93%)

diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Fix-EVP_PKEY_=
CTX_get_rsa_pss_saltlen-no.patch b/meta/recipes-connectivity/openssl/open=
ssl/0001-Fix-EVP_PKEY_CTX_get_rsa_pss_saltlen-no.patch
deleted file mode 100644
index b85a3ad7d22..00000000000
--- a/meta/recipes-connectivity/openssl/openssl/0001-Fix-EVP_PKEY_CTX_get=
_rsa_pss_saltlen-no.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Fix EVP_PKEY_CTX_get_rsa_pss_saltlen, and also disable the tests in non-=
default
-context (required when backporting, not needed with 3.0.1).
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@...>
-
-From 6b5c02f6173e5fd46a3685e676fcb5eee9ac43ea Mon Sep 17 00:00:00 2001
-From: Tom Cosgrove <tom.cosgrove@...>
-Date: Thu, 25 Nov 2021 15:49:26 +0000
-Subject: [PATCH] Fix EVP_PKEY_CTX_get_rsa_pss_saltlen() not returning a =
value
-
-When an integer value was specified, it was not being passed back via
-the orig_p2 weirdness.
-
-Regression test included.
-
-Reviewed-by: Tomas Mraz <tomas@...>
-Reviewed-by: Paul Dale <pauli@...>
-(Merged from https://github.com/openssl/openssl/pull/17136)
----
- crypto/evp/ctrl_params_translate.c | 12 +++++++-----
- test/evp_extra_test.c | 30 ++++++++++++++++++++++++++++++
- 2 files changed, 37 insertions(+), 5 deletions(-)
-
-diff --git a/crypto/evp/ctrl_params_translate.c b/crypto/evp/ctrl_params=
_translate.c
-index 88945e13e6..6638209a8d 100644
---- a/crypto/evp/ctrl_params_translate.c
-+++ b/crypto/evp/ctrl_params_translate.c
-@@ -1379,21 +1379,23 @@ static int fix_rsa_pss_saltlen(enum state state,
- if ((ctx->action_type =3D=3D SET && state =3D=3D PRE_PARAMS_TO_CTRL=
)
- || (ctx->action_type =3D=3D GET && state =3D=3D POST_CTRL_TO_PA=
RAMS)) {
- size_t i;
-+ int val;
-=20
- for (i =3D 0; i < OSSL_NELEM(str_value_map); i++) {
- if (strcmp(ctx->p2, str_value_map[i].ptr) =3D=3D 0)
- break;
- }
-- if (i =3D=3D OSSL_NELEM(str_value_map)) {
-- ctx->p1 =3D atoi(ctx->p2);
-- } else if (state =3D=3D POST_CTRL_TO_PARAMS) {
-+
-+ val =3D i =3D=3D OSSL_NELEM(str_value_map) ? atoi(ctx->p2)
-+ : (int)str_value_map[i].id=
;
-+ if (state =3D=3D POST_CTRL_TO_PARAMS) {
- /*
- * EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN weirdness explained fu=
rther
- * up
- */
-- *(int *)ctx->orig_p2 =3D str_value_map[i].id;
-+ *(int *)ctx->orig_p2 =3D val;
- } else {
-- ctx->p1 =3D (int)str_value_map[i].id;
-+ ctx->p1 =3D val;
- }
- ctx->p2 =3D NULL;
- }
-diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
-index 83f8902d24..9ad37a2bce 100644
---- a/test/evp_extra_test.c
-+++ b/test/evp_extra_test.c
-@@ -3049,6 +3049,35 @@ static int test_EVP_rsa_pss_with_keygen_bits(void=
)
- return ret;
- }
-=20
-+static int test_EVP_rsa_pss_set_saltlen(void)
-+{
-+ int ret =3D 0;
-+ EVP_PKEY *pkey =3D NULL;
-+ EVP_PKEY_CTX *pkey_ctx =3D NULL;
-+ EVP_MD *sha256 =3D NULL;
-+ EVP_MD_CTX *sha256_ctx =3D NULL;
-+ int saltlen =3D 9999; /* buggy EVP_PKEY_CTX_get_rsa_pss_saltlen() d=
idn't update this */
-+ const int test_value =3D 32;
-+
-+ if (nullprov !=3D NULL)
-+ return TEST_skip("Test does not support a non-default library c=
ontext");
-+
-+ ret =3D TEST_ptr(pkey =3D load_example_rsa_key())
-+ && TEST_ptr(sha256 =3D EVP_MD_fetch(testctx, "sha256", NULL))
-+ && TEST_ptr(sha256_ctx =3D EVP_MD_CTX_new())
-+ && TEST_true(EVP_DigestSignInit(sha256_ctx, &pkey_ctx, sha256, =
NULL, pkey))
-+ && TEST_true(EVP_PKEY_CTX_set_rsa_padding(pkey_ctx, RSA_PKCS1_P=
SS_PADDING))
-+ && TEST_true(EVP_PKEY_CTX_set_rsa_pss_saltlen(pkey_ctx, test_va=
lue))
-+ && TEST_true(EVP_PKEY_CTX_get_rsa_pss_saltlen(pkey_ctx, &saltle=
n))
-+ && TEST_int_eq(saltlen, test_value);
-+
-+ EVP_MD_CTX_free(sha256_ctx);
-+ EVP_PKEY_free(pkey);
-+ EVP_MD_free(sha256);
-+
-+ return ret;
-+}
-+
- static int success =3D 1;
- static void md_names(const char *name, void *vctx)
- {
-@@ -3966,6 +3995,7 @@ int setup_tests(void)
- ADD_ALL_TESTS(test_evp_iv_des, 6);
- #endif
- ADD_TEST(test_EVP_rsa_pss_with_keygen_bits);
-+ ADD_TEST(test_EVP_rsa_pss_set_saltlen);
- #ifndef OPENSSL_NO_EC
- ADD_ALL_TESTS(test_ecpub, OSSL_NELEM(ecpub_nids));
- #endif
---=20
-2.25.1
-
diff --git a/meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch =
b/meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch
deleted file mode 100644
index 1935651be05..00000000000
--- a/meta/recipes-connectivity/openssl/openssl/armv8-32bit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/1695=
1]
-Signed-off-by: Ross Burton <ross.burton@...>
-
-From 5118e96a3dbedde2523e7726fa34af30923a9add Mon Sep 17 00:00:00 2001
-From: Tom Cosgrove <tom.cosgrove@...>
-Date: Tue, 2 Nov 2021 15:26:21 +0000
-Subject: [PATCH] Fix builds on Armv8 systems without AArch64
-
-This fixes "undefined reference to `aes_gcm_dec_128_kernel' in function
-`armv8_aes_gcm_decrypt'" and similar
-
-Fixes #16949
----
- include/crypto/aes_platform.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform=
.h
-index 015c3bd4ab91..e95ad5aa5de6 100644
---- a/include/crypto/aes_platform.h
-+++ b/include/crypto/aes_platform.h
-@@ -100,7 +100,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsig=
ned char *out, size_t len,
- # define AES_PMULL_CAPABLE ((OPENSSL_armcap_P & ARMV8_PMULL) && (OPE=
NSSL_armcap_P & ARMV8_AES))
- # define AES_GCM_ENC_BYTES 512
- # define AES_GCM_DEC_BYTES 512
--# if __ARM_MAX_ARCH__>=3D8
-+# if __ARM_MAX_ARCH__>=3D8 && defined(__aarch64__)
- # define AES_gcm_encrypt armv8_aes_gcm_encrypt
- # define AES_gcm_decrypt armv8_aes_gcm_decrypt
- # define AES_GCM_ASM(gctx) ((gctx)->ctr=3D=3Daes_v8_ctr32_encrypt_b=
locks && \
diff --git a/meta/recipes-connectivity/openssl/openssl_3.0.0.bb b/meta/re=
cipes-connectivity/openssl/openssl_3.0.1.bb
similarity index 93%
rename from meta/recipes-connectivity/openssl/openssl_3.0.0.bb
rename to meta/recipes-connectivity/openssl/openssl_3.0.1.bb
index da73ed6bc33..162435480c4 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.0.0.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.0.1.bb
@@ -12,15 +12,13 @@ SRC_URI =3D "http://www.openssl.org/source/openssl-${=
PV}.tar.gz \
file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from=
-co.patch \
file://afalg.patch \
file://0001-Configure-do-not-tweak-mips-cflags.patch \
- file://armv8-32bit.patch \
- file://0001-Fix-EVP_PKEY_CTX_get_rsa_pss_saltlen-no.patch \
"
=20
SRC_URI:append:class-nativesdk =3D " \
file://environment.d-openssl.sh \
"
=20
-SRC_URI[sha256sum] =3D "59eedfcb46c25214c9bd37ed6078297b4df01d012267fe9e=
9eee31f61bc70536"
+SRC_URI[sha256sum] =3D "c311ad853353bce796edad01a862c50a8a587f62e7e2100e=
f465ab53ec9b06d1"
=20
inherit lib_package multilib_header multilib_script ptest perlnative
MULTILIB_SCRIPTS =3D "${PN}-bin:${bindir}/c_rehash"
@@ -194,21 +192,21 @@ do_install_ptest () {
install -m755 ${B}/apps/CA.pl ${D}${PTEST_PATH}/apps
=20
install -d ${D}${PTEST_PATH}/engines
- install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines
+ install -m755 ${B}/engines/dasync.so ${D}${PTEST_PATH}/engines
install -m755 ${B}/engines/loader_attic.so ${D}${PTEST_PATH}/engines
+ install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines
=20
install -d ${D}${PTEST_PATH}/providers
install -m755 ${B}/providers/legacy.so ${D}${PTEST_PATH}/providers
=20
- install -d ${D}${PTEST_PATH}/Configurations
- cp -rf ${S}/Configurations/* ${D}${PTEST_PATH}/Configurations/
+ install -d ${D}${PTEST_PATH}/Configurations
+ cp -rf ${S}/Configurations/* ${D}${PTEST_PATH}/Configurations/
=20
- # seems to be needed with perl 5.32.1
- install -d ${D}${PTEST_PATH}/util/perl/recipes
- cp ${D}${PTEST_PATH}/test/recipes/tconversion.pl ${D}${PTEST_PAT=
H}/util/perl/recipes/
+ # seems to be needed with perl 5.32.1
+ install -d ${D}${PTEST_PATH}/util/perl/recipes
+ cp ${D}${PTEST_PATH}/test/recipes/tconversion.pl ${D}${PTEST_PATH}/util=
/perl/recipes/
=20
sed 's|${S}|${PTEST_PATH}|g' -i ${D}${PTEST_PATH}/util/wrap.pl
-
}
=20
# Add the openssl.cnf file to the openssl-conf package. Make the libcryp=
to
@@ -234,7 +232,7 @@ CONFFILES:openssl-conf =3D "${sysconfdir}/ssl/openssl=
.cnf"
=20
RRECOMMENDS:libcrypto +=3D "openssl-conf"
RDEPENDS:${PN}-misc =3D "perl"
-RDEPENDS:${PN}-ptest +=3D "openssl-bin perl perl-modules bash"
+RDEPENDS:${PN}-ptest +=3D "openssl-bin perl perl-modules bash sed"
=20
RDEPENDS:${PN}-bin +=3D "openssl-conf"
=20
--=20
2.25.1

11221 - 11240 of 171126