Re: [OE-core] [PATCH] perf: Make built-in libtraceevent plugins cohabit with external libtraceevent
On Thu, May 25, 2023 at 10:09 PM Max Krummenacher wrote:
>
>
>
> On Friday, May 26, 2023, Khem Raj wrote:
> >
> >
> > On Thu, May 25, 2023 at 7:44 PM Max Krummenacher
> > wrote:
> >>
> >> Hi Khem
> >>
> >> On Friday, May 26, 2023, Khem Raj wrote:
> >> > This will package the plugins built by perf into kernel specific dir
> >> > under libdir, so it does not conflict with plugins from newly added
> >> > libtraceevent recipe
> >> >
> >> > Fixes
> >> > do_sdk_depends: The file /usr/lib/traceevent/plugins/plugin_cfg80211.so
> >> > is installed by both perf and libtraceevent, aborting
> >>
> >> Starting with kernel version 6.4 libtraceevent is removed from the kernel
> >> sources and perf depends of an externally provided libtraceevent unless
> >> explicitely opted out.
> >>
> >> perf.bb with this patch will fail when built with a 6.4 kernel.
> >
> > Why will it fail ?
>
> The file which sed works on, ${S}/tools/lib/traceevent/plugins/Makefile, no
> longer exists.
>
Right, sent a v2 to address that
> >>
> >> I guess as an interim solution building perf on 6.4 without traceevent
> >> would fix the SDK issue you see with older kernels.
> >> I could then try out how to build perf with an external libtraceevent also
> >> for older kernels (LIBTRACEEVENT_DYNAMIC) so that it would work for all
> >> kernel/perf versions.
> >>
> >> Regards
> >> Max
> >> >
> >> > Signed-off-by: Khem Raj
> >> > Cc: Max Krummenacher
> >> > ---
> >> > meta/recipes-kernel/perf/perf.bb | 4 +++-
> >> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >> >
> >> > diff --git a/meta/recipes-kernel/perf/perf.bb
> >> > b/meta/recipes-kernel/perf/perf.bb
> >> > index 67b01a7f65a..d31f59f460b 100644
> >> > --- a/meta/recipes-kernel/perf/perf.bb
> >> > +++ b/meta/recipes-kernel/perf/perf.bb
> >> > @@ -137,6 +137,8 @@ PERF_EXTRA_LDFLAGS:mipsarchn64el = "-m elf64ltsmip"
> >> > do_compile() {
> >> > # Linux kernel build system is expected to do the right thing
> >> > unset CFLAGS
> >> > + sed -i -e
> >> > 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
> >> > ${S}/tools/lib/traceevent/plugins/Makefile
> >> > + sed -i -e
> >> > 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
> >> > ${S}/tools/perf/Makefile.config
> >> > oe_runmake all
> >> > }
> >> >
> >> > @@ -364,7 +366,7 @@ RSUGGESTS_SCRIPTING =
> >> > "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}
> >> > RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
> >> >
> >> > FILES_SOLIBSDEV = ""
> >> > -FILES:${PN} += "${libexecdir}/perf-core
> >> > ${exec_prefix}/libexec/perf-core ${libdir}/traceevent
> >> > ${libdir}/libperf-jvmti.so"
> >> > +FILES:${PN} += "${libexecdir}/perf-core
> >> > ${exec_prefix}/libexec/perf-core ${libdir}/traceevent*
> >> > ${libdir}/libperf-jvmti.so"
> >> > FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
> >> > FILES:${PN}-tests = "${libdir}/perf/perf-core/tests
> >> > ${libexecdir}/perf-core/tests"
> >> > FILES:${PN}-python = " \
> >> > --
> >> > 2.40.1
> >> >
> >> >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181760):
https://lists.openembedded.org/g/openembedded-core/message/181760
Mute This Topic: https://lists.openembedded.org/mt/99142359/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] perf: Make built-in libtraceevent plugins cohabit with external libtraceevent
This will package the plugins built by perf into kernel specific dir
under libdir, so it does not conflict with plugins from newly added
libtraceevent recipe
Fixes
do_sdk_depends: The file /usr/lib/traceevent/plugins/plugin_cfg80211.so is
installed by both perf and libtraceevent, aborting
Signed-off-by: Khem Raj
Cc: Max Krummenacher
---
v2: Check if files exist before sed'ing them
meta/recipes-kernel/perf/perf.bb | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 67b01a7f65a..2d803381bb4 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -137,6 +137,10 @@ PERF_EXTRA_LDFLAGS:mipsarchn64el = "-m elf64ltsmip"
do_compile() {
# Linux kernel build system is expected to do the right thing
unset CFLAGS
+test -e ${S}/tools/lib/traceevent/plugins/Makefile && \
+sed -i -e
's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
${S}/tools/lib/traceevent/plugins/Makefile
+ test -e ${S}/tools/perf/Makefile.config && \
+sed -i -e
's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
${S}/tools/perf/Makefile.config
oe_runmake all
}
@@ -364,7 +368,7 @@ RSUGGESTS_SCRIPTING =
"${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}
RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
FILES_SOLIBSDEV = ""
-FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core
${libdir}/traceevent ${libdir}/libperf-jvmti.so"
+FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core
${libdir}/traceevent* ${libdir}/libperf-jvmti.so"
FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
FILES:${PN}-tests = "${libdir}/perf/perf-core/tests
${libexecdir}/perf-core/tests"
FILES:${PN}-python = " \
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181759):
https://lists.openembedded.org/g/openembedded-core/message/181759
Mute This Topic: https://lists.openembedded.org/mt/99144937/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] perf: Make built-in libtraceevent plugins cohabit with external libtraceevent
On Friday, May 26, 2023, Khem Raj wrote:
>
>
> On Thu, May 25, 2023 at 7:44 PM Max Krummenacher
wrote:
>>
>> Hi Khem
>>
>> On Friday, May 26, 2023, Khem Raj wrote:
>> > This will package the plugins built by perf into kernel specific dir
>> > under libdir, so it does not conflict with plugins from newly added
>> > libtraceevent recipe
>> >
>> > Fixes
>> > do_sdk_depends: The file
/usr/lib/traceevent/plugins/plugin_cfg80211.so is installed by both perf
and libtraceevent, aborting
>>
>> Starting with kernel version 6.4 libtraceevent is removed from the
kernel sources and perf depends of an externally provided libtraceevent
unless explicitely opted out.
>>
>> perf.bb with this patch will fail when built with a 6.4 kernel.
>
> Why will it fail ?
The file which sed works on, ${S}/tools/lib/traceevent/plugins/Makefile, no
longer exists.
>>
>> I guess as an interim solution building perf on 6.4 without traceevent
would fix the SDK issue you see with older kernels.
>> I could then try out how to build perf with an external libtraceevent
also for older kernels (LIBTRACEEVENT_DYNAMIC) so that it would work for
all kernel/perf versions.
>>
>> Regards
>> Max
>> >
>> > Signed-off-by: Khem Raj
>> > Cc: Max Krummenacher
>> > ---
>> > meta/recipes-kernel/perf/perf.bb | 4 +++-
>> > 1 file changed, 3 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/meta/recipes-kernel/perf/perf.bb
b/meta/recipes-kernel/perf/perf.bb
>> > index 67b01a7f65a..d31f59f460b 100644
>> > --- a/meta/recipes-kernel/perf/perf.bb
>> > +++ b/meta/recipes-kernel/perf/perf.bb
>> > @@ -137,6 +137,8 @@ PERF_EXTRA_LDFLAGS:mipsarchn64el = "-m elf64ltsmip"
>> > do_compile() {
>> > # Linux kernel build system is expected to do the right thing
>> > unset CFLAGS
>> > + sed -i -e
's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
${S}/tools/lib/traceevent/plugins/Makefile
>> > + sed -i -e
's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
${S}/tools/perf/Makefile.config
>> > oe_runmake all
>> > }
>> >
>> > @@ -364,7 +366,7 @@ RSUGGESTS_SCRIPTING =
"${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}
>> > RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
>> >
>> > FILES_SOLIBSDEV = ""
>> > -FILES:${PN} += "${libexecdir}/perf-core
${exec_prefix}/libexec/perf-core ${libdir}/traceevent
${libdir}/libperf-jvmti.so"
>> > +FILES:${PN} += "${libexecdir}/perf-core
${exec_prefix}/libexec/perf-core ${libdir}/traceevent*
${libdir}/libperf-jvmti.so"
>> > FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
>> > FILES:${PN}-tests = "${libdir}/perf/perf-core/tests
${libexecdir}/perf-core/tests"
>> > FILES:${PN}-python = " \
>> > --
>> > 2.40.1
>> >
>> >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181758):
https://lists.openembedded.org/g/openembedded-core/message/181758
Mute This Topic: https://lists.openembedded.org/mt/99142359/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH v2] busybox: 1.36.0 -> 1.36.1
- regression on x86 is still in place
Signed-off-by: Andrej Valek
---
.../{busybox-inittab_1.36.0.bb => busybox-inittab_1.36.1.bb}| 0
.../busybox/{busybox_1.36.0.bb => busybox_1.36.1.bb}| 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/busybox/{busybox-inittab_1.36.0.bb =>
busybox-inittab_1.36.1.bb} (100%)
rename meta/recipes-core/busybox/{busybox_1.36.0.bb => busybox_1.36.1.bb} (96%)
diff --git a/meta/recipes-core/busybox/busybox-inittab_1.36.0.bb
b/meta/recipes-core/busybox/busybox-inittab_1.36.1.bb
similarity index 100%
rename from meta/recipes-core/busybox/busybox-inittab_1.36.0.bb
rename to meta/recipes-core/busybox/busybox-inittab_1.36.1.bb
diff --git a/meta/recipes-core/busybox/busybox_1.36.0.bb
b/meta/recipes-core/busybox/busybox_1.36.1.bb
similarity index 96%
rename from meta/recipes-core/busybox/busybox_1.36.0.bb
rename to meta/recipes-core/busybox/busybox_1.36.1.bb
index 8014a5c7bf..968dce65e4 100644
--- a/meta/recipes-core/busybox/busybox_1.36.0.bb
+++ b/meta/recipes-core/busybox/busybox_1.36.1.bb
@@ -53,4 +53,4 @@ SRC_URI =
"https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
SRC_URI:append:libc-musl = " file://musl.cfg "
# TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
SRC_URI:append:x86 = " file://sha_accel.cfg"
-SRC_URI[tarball.sha256sum] =
"542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5"
+SRC_URI[tarball.sha256sum] =
"b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314"
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181757):
https://lists.openembedded.org/g/openembedded-core/message/181757
Mute This Topic: https://lists.openembedded.org/mt/99144514/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell][PATCH] go: Security fix CVE-2023-24540
From: Vijay Anusuri
Upstream-Status: Backport
[https://github.com/golang/go/commit/ce7bd33345416e6d8cac901792060591cafc2797]
Signed-off-by: Vijay Anusuri
---
meta/recipes-devtools/go/go-1.14.inc | 1 +
.../go/go-1.14/CVE-2023-24540.patch | 90 +++
2 files changed, 91 insertions(+)
create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2023-24540.patch
diff --git a/meta/recipes-devtools/go/go-1.14.inc
b/meta/recipes-devtools/go/go-1.14.inc
index f734fe1ac8..43590278c8 100644
--- a/meta/recipes-devtools/go/go-1.14.inc
+++ b/meta/recipes-devtools/go/go-1.14.inc
@@ -61,6 +61,7 @@ SRC_URI += "\
file://CVE-2023-24538-1.patch \
file://CVE-2023-24538-2.patch \
file://CVE-2023-24538-3.patch \
+file://CVE-2023-24540.patch \
"
SRC_URI_append_libc-musl = "
file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2023-24540.patch
b/meta/recipes-devtools/go/go-1.14/CVE-2023-24540.patch
new file mode 100644
index 00..799a0dfcda
--- /dev/null
+++ b/meta/recipes-devtools/go/go-1.14/CVE-2023-24540.patch
@@ -0,0 +1,90 @@
+From ce7bd33345416e6d8cac901792060591cafc2797 Mon Sep 17 00:00:00 2001
+From: Roland Shoemaker
+Date: Tue, 11 Apr 2023 16:27:43 +0100
+Subject: [PATCH] [release-branch.go1.19] html/template: handle all JS
+ whitespace characters
+
+Rather than just a small set. Character class as defined by \s [0].
+
+Thanks to Juho Nurminen of Mattermost for reporting this.
+
+For #59721
+Fixes #59813
+Fixes CVE-2023-24540
+
+[0]
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes
+
+Change-Id: I56d4fa1ef08125b417106ee7dbfb5b0923b901ba
+Reviewed-on:
https://team-review.git.corp.google.com/c/golang/go-private/+/1821459
+Reviewed-by: Julie Qiu
+Run-TryBot: Roland Shoemaker
+Reviewed-by: Damien Neil
+Reviewed-on:
https://team-review.git.corp.google.com/c/golang/go-private/+/1851497
+Run-TryBot: Damien Neil
+Reviewed-by: Roland Shoemaker
+Reviewed-on: https://go-review.googlesource.com/c/go/+/491355
+Reviewed-by: Dmitri Shuralyov
+Reviewed-by: Carlos Amedee
+TryBot-Bypass: Carlos Amedee
+Run-TryBot: Carlos Amedee
+
+Upstream-Status: Backport
[https://github.com/golang/go/commit/ce7bd33345416e6d8cac901792060591cafc2797]
+CVE: CVE-2023-24540
+Signed-off-by: Vijay Anusuri
+---
+ src/html/template/js.go | 8 +++-
+ src/html/template/js_test.go | 11 +++
+ 2 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/src/html/template/js.go b/src/html/template/js.go
+index fe7054efe5cd8..4e05c1455723f 100644
+--- a/src/html/template/js.go
b/src/html/template/js.go
+@@ -13,6 +13,11 @@ import (
+ "unicode/utf8"
+ )
+
++// jsWhitespace contains all of the JS whitespace characters, as defined
++// by the \s character class.
++// See
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions/Character_classes.
++const jsWhitespace =
"\f\n\r\t\v\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000\ufeff"
++
+ // nextJSCtx returns the context that determines whether a slash after the
+ // given run of tokens starts a regular expression instead of a division
+ // operator: / or /=.
+@@ -26,7 +31,8 @@ import (
+ // JavaScript 2.0 lexical grammar and requires one token of lookbehind:
+ // https://www.mozilla.org/js/language/js20-2000-07/rationale/syntax.html
+ func nextJSCtx(s []byte, preceding jsCtx) jsCtx {
+- s = bytes.TrimRight(s, "\t\n\f\r \u2028\u2029")
++ // Trim all JS whitespace characters
++ s = bytes.TrimRight(s, jsWhitespace)
+ if len(s) == 0 {
+ return preceding
+ }
+diff --git a/src/html/template/js_test.go b/src/html/template/js_test.go
+index e07c695f7a77d..e52180cc113b5 100644
+--- a/src/html/template/js_test.go
b/src/html/template/js_test.go
+@@ -81,14 +81,17 @@ func TestNextJsCtx(t *testing.T) {
+ {jsCtxDivOp, "0"},
+ // Dots that are part of a number are div preceders.
+ {jsCtxDivOp, "0."},
++ // Some JS interpreters treat NBSP as a normal space, so
++ // we must too in order to properly escape things.
++ {jsCtxRegexp, "=\u00A0"},
+ }
+
+ for _, test := range tests {
+- if nextJSCtx([]byte(test.s), jsCtxRegexp) != test.jsCtx {
+- t.Errorf("want %s got %q", test.jsCtx, test.s)
++ if ctx := nextJSCtx([]byte(test.s), jsCtxRegexp); ctx !=
test.jsCtx {
++ t.Errorf("%q: want %s got %s", test.s, test.jsCtx, ctx)
+ }
+- if nextJSCtx([]byte(test.s), jsCtxDivOp) != test.jsCtx {
+- t.Errorf("want %s got %q", test.jsCtx, test.s)
++ if ctx := nextJSCtx([]byte(test.s), jsCtxDivOp); ctx !=
test.jsCtx {
++ t.Errorf("%q: want %s got %s",
Re: [OE-core] [PATCH] perf: Make built-in libtraceevent plugins cohabit with external libtraceevent
On Thu, May 25, 2023 at 7:44 PM Max Krummenacher
wrote:
> Hi Khem
>
> On Friday, May 26, 2023, Khem Raj wrote:
> > This will package the plugins built by perf into kernel specific dir
> > under libdir, so it does not conflict with plugins from newly added
> > libtraceevent recipe
> >
> > Fixes
> > do_sdk_depends: The file /usr/lib/traceevent/plugins/plugin_cfg80211.so
> is installed by both perf and libtraceevent, aborting
>
> Starting with kernel version 6.4 libtraceevent is removed from the kernel
> sources and perf depends of an externally provided libtraceevent unless
> explicitely opted out.
>
> perf.bb with this patch will fail when built with a 6.4 kernel.
>
Why will it fail ?
> I guess as an interim solution building perf on 6.4 without traceevent
> would fix the SDK issue you see with older kernels.
> I could then try out how to build perf with an external libtraceevent also
> for older kernels (LIBTRACEEVENT_DYNAMIC) so that it would work for all
> kernel/perf versions.
>
> Regards
> Max
> >
> > Signed-off-by: Khem Raj
> > Cc: Max Krummenacher
> > ---
> > meta/recipes-kernel/perf/perf.bb | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-kernel/perf/perf.bb
> b/meta/recipes-kernel/perf/perf.bb
> > index 67b01a7f65a..d31f59f460b 100644
> > --- a/meta/recipes-kernel/perf/perf.bb
> > +++ b/meta/recipes-kernel/perf/perf.bb
> > @@ -137,6 +137,8 @@ PERF_EXTRA_LDFLAGS:mipsarchn64el = "-m elf64ltsmip"
> > do_compile() {
> > # Linux kernel build system is expected to do the right thing
> > unset CFLAGS
> > + sed -i -e
> 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
> ${S}/tools/lib/traceevent/plugins/Makefile
> > + sed -i -e
> 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
> ${S}/tools/perf/Makefile.config
> > oe_runmake all
> > }
> >
> > @@ -364,7 +366,7 @@ RSUGGESTS_SCRIPTING =
> "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}
> > RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
> >
> > FILES_SOLIBSDEV = ""
> > -FILES:${PN} += "${libexecdir}/perf-core
> ${exec_prefix}/libexec/perf-core ${libdir}/traceevent
> ${libdir}/libperf-jvmti.so"
> > +FILES:${PN} += "${libexecdir}/perf-core
> ${exec_prefix}/libexec/perf-core ${libdir}/traceevent*
> ${libdir}/libperf-jvmti.so"
> > FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
> > FILES:${PN}-tests = "${libdir}/perf/perf-core/tests
> ${libexecdir}/perf-core/tests"
> > FILES:${PN}-python = " \
> > --
> > 2.40.1
> >
> >
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181755):
https://lists.openembedded.org/g/openembedded-core/message/181755
Mute This Topic: https://lists.openembedded.org/mt/99142359/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] perf: Make built-in libtraceevent plugins cohabit with external libtraceevent
Hi Khem
On Friday, May 26, 2023, Khem Raj wrote:
> This will package the plugins built by perf into kernel specific dir
> under libdir, so it does not conflict with plugins from newly added
> libtraceevent recipe
>
> Fixes
> do_sdk_depends: The file /usr/lib/traceevent/plugins/plugin_cfg80211.so
is installed by both perf and libtraceevent, aborting
Starting with kernel version 6.4 libtraceevent is removed from the kernel
sources and perf depends of an externally provided libtraceevent unless
explicitely opted out.
perf.bb with this patch will fail when built with a 6.4 kernel.
I guess as an interim solution building perf on 6.4 without traceevent
would fix the SDK issue you see with older kernels.
I could then try out how to build perf with an external libtraceevent also
for older kernels (LIBTRACEEVENT_DYNAMIC) so that it would work for all
kernel/perf versions.
Regards
Max
>
> Signed-off-by: Khem Raj
> Cc: Max Krummenacher
> ---
> meta/recipes-kernel/perf/perf.bb | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/
perf.bb
> index 67b01a7f65a..d31f59f460b 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -137,6 +137,8 @@ PERF_EXTRA_LDFLAGS:mipsarchn64el = "-m elf64ltsmip"
> do_compile() {
> # Linux kernel build system is expected to do the right thing
> unset CFLAGS
> + sed -i -e
's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
${S}/tools/lib/traceevent/plugins/Makefile
> + sed -i -e
's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
${S}/tools/perf/Makefile.config
> oe_runmake all
> }
>
> @@ -364,7 +366,7 @@ RSUGGESTS_SCRIPTING =
"${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}
> RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
>
> FILES_SOLIBSDEV = ""
> -FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core
${libdir}/traceevent ${libdir}/libperf-jvmti.so"
> +FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core
${libdir}/traceevent* ${libdir}/libperf-jvmti.so"
> FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
> FILES:${PN}-tests = "${libdir}/perf/perf-core/tests
${libexecdir}/perf-core/tests"
> FILES:${PN}-python = " \
> --
> 2.40.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181754):
https://lists.openembedded.org/g/openembedded-core/message/181754
Mute This Topic: https://lists.openembedded.org/mt/99142359/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 16/21] dhcpcd: use git instead of tarballs
From: Alexander Kanavin
As announced here:
https://roy.marples.name/downloads/dhcpcd/
Signed-off-by: Alexander Kanavin
Signed-off-by: Luca Ceresoli
Signed-off-by: Richard Purdie
(cherry picked from commit 6e317eaab45da2dea70d1485fdae93cfeea0db1d)
Signed-off-by: Steve Sakoman
---
meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
index 579fa95df7..21b2eebbd8 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
@@ -9,9 +9,7 @@ HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/;
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d148485768fe85b9f1072b186a7e9b4d"
-UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/;
-
-SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
+SRC_URI =
"git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=dhcpcd-9 \
file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \
file://0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch \
@@ -22,7 +20,8 @@ SRC_URI =
"https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \
"
-SRC_URI[sha256sum] =
"819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c"
+SRCREV = "3c458fc7fa4146029a1e4f9e98cd7e7adf03081a"
+S = "${WORKDIR}/git"
inherit pkgconfig autotools-brokensep systemd useradd
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181748):
https://lists.openembedded.org/g/openembedded-core/message/181748
Mute This Topic: https://lists.openembedded.org/mt/99143107/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 19/21] piglit: Add PACKAGECONFIG for glx and opencl
From: Tom Hochstein
- Allow GLX tests to be disabled for systems that don't support it.
- Allow OpenCL tests to be enabled.
Signed-off-by: Tom Hochstein
Signed-off-by: Luca Ceresoli
Signed-off-by: Richard Purdie
Signed-off-by: Steve Sakoman
---
...roper-WAYLAND_INCLUDE_DIRS-variable.patch} | 0
...-shader.c-do-not-hardcode-build-pat.patch} | 0
...n-t-enable-GLX-if-tests-are-disabled.patch | 32 +++
meta/recipes-graphics/piglit/piglit_git.bb| 11 ---
4 files changed, 39 insertions(+), 4 deletions(-)
rename
meta/recipes-graphics/piglit/piglit/{0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
=> 0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch} (100%)
rename
meta/recipes-graphics/piglit/piglit/{0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
=> 0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch} (100%)
create mode 100644
meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch
diff --git
a/meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
b/meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
similarity index 100%
rename from
meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
rename to
meta/recipes-graphics/piglit/piglit/0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
diff --git
a/meta/recipes-graphics/piglit/piglit/0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
b/meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
similarity index 100%
rename from
meta/recipes-graphics/piglit/piglit/0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
rename to
meta/recipes-graphics/piglit/piglit/0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
diff --git
a/meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch
b/meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch
new file mode 100644
index 00..ef6fda0f4e
--- /dev/null
+++
b/meta/recipes-graphics/piglit/piglit/0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch
@@ -0,0 +1,32 @@
+From 13ff43fe760ac343b33d8e8c84b89886aac07116 Mon Sep 17 00:00:00 2001
+From: Tom Hochstein
+Date: Fri, 3 Jun 2022 10:44:29 -0500
+Subject: [PATCH] cmake: Don't enable GLX if tests are disabled
+
+Allow building for systems that don't support GLX.
+
+Upstream-Status: Submitted
[https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/720]
+Signed-off-by: Tom Hochstein
+---
+ CMakeLists.txt | 5 +
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e1aeb5ddf..85e171aba 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -134,10 +134,7 @@ if(PIGLIT_BUILD_CL_TESTS)
+ endif(PIGLIT_BUILD_CL_TESTS)
+
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+- if(X11_FOUND AND OPENGL_gl_LIBRARY)
+- # Assume the system has GLX. In the future, systems may exist
+- # with libGL and libX11 but no GLX, but that world hasn't
+- # arrived yet.
++ if(X11_FOUND AND OPENGL_gl_LIBRARY AND PIGLIT_BUILD_GLX_TESTS)
+ set(PIGLIT_HAS_GLX True)
+ add_definitions(-DPIGLIT_HAS_GLX)
+ endif()
+--
+2.17.1
+
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
b/meta/recipes-graphics/piglit/piglit_git.bb
index 3ae7a14e46..5b7a206247 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
SRC_URI =
"git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=main \
file://0001-cmake-install-bash-completions-in-the-right-place.patch
\
- file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
file://0001-Add-a-missing-include-for-htobe32-definition.patch \
-
file://0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \
- "
+ file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
+
file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \
+ file://0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch"
+
UPSTREAM_CHECK_COMMITS = "1"
SRCREV = "2f80c7cc9c02d37574dc8ba3140b7dd8eb3cbf82"
@@ -36,8 +37,10 @@ REQUIRED_DISTRO_FEATURES += "opengl"
export TEMP = "${B}/temp/"
do_compile[dirs] =+ "${B}/temp/"
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx',
'', d)}"
PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
+PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF"
+PACKAGECONFIG[opencl] =
[OE-core][kirkstone 20/21] piglit: Fix build time dependency
From: Zoltan Boszormenyi
Replace explicit opencl-icd-loader with virtual/opencl-icd.
Signed-off-by: Zoltán Böszörményi
Signed-off-by: Alexandre Belloni
Signed-off-by: Steve Sakoman
---
meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
b/meta/recipes-graphics/piglit/piglit_git.bb
index 5b7a206247..a3c9c5e2e0 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -40,7 +40,7 @@ do_compile[dirs] =+ "${B}/temp/"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx',
'', d)}"
PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF"
-PACKAGECONFIG[opencl] =
"-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,opencl-icd-loader"
+PACKAGECONFIG[opencl] =
"-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/opencl-icd"
PACKAGECONFIG[x11] =
"-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS},
${X11_RDEPS}"
PACKAGECONFIG[vulkan] =
"-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181752):
https://lists.openembedded.org/g/openembedded-core/message/181752
Mute This Topic: https://lists.openembedded.org/mt/99143118/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 14/21] quilt: Fix merge.test race condition
From: Khem Raj
This is consistently seen with musl and grep from busybox
Therefore backport a patch from upstream to fix it
Signed-off-by: Khem Raj
Signed-off-by: Luca Ceresoli
Signed-off-by: Richard Purdie
(cherry picked from commit 511bcd965af658e6bb0c61d9f2adb1af75af773b)
Signed-off-by: Steve Sakoman
---
meta/recipes-devtools/quilt/quilt.inc | 1 +
...t-Fix-a-race-condition-in-merge.test.patch | 48 +++
2 files changed, 49 insertions(+)
create mode 100644
meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch
diff --git a/meta/recipes-devtools/quilt/quilt.inc
b/meta/recipes-devtools/quilt/quilt.inc
index fce81016d8..72deb24915 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -14,6 +14,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
file://0001-tests-Allow-different-output-from-mv.patch \
file://fix-grep-3.8.patch \
file://faildiff-order.patch \
+file://0001-test-Fix-a-race-condition-in-merge.test.patch \
"
SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch"
diff --git
a/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch
b/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch
new file mode 100644
index 00..01d4c8befc
--- /dev/null
+++
b/meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch
@@ -0,0 +1,48 @@
+From c1ce964f3e9312100a60f03c1e1fdd601e1911f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+
+Date: Tue, 28 Feb 2023 18:45:15 +0100
+Subject: [PATCH] test: Fix a race condition in merge.test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Just like commit 4dfe7f9, (test: Fix a race condition, 2023-01-20),
+this fix a test race when stdout and stderr in any order.
+
+Upstream-Status: Backport
[https://git.savannah.nongnu.org/cgit/quilt.git/commit/?id=c1ce964f3e9312100a60f03c1e1fdd601e1911f2]
+Signed-off-by: Đoàn Trần Công Danh
+Signed-off-by: Jean Delvare
+---
+ test/merge.test | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/test/merge.test b/test/merge.test
+index c64b33d..2e67d4f 100644
+--- a/test/merge.test
b/test/merge.test
+@@ -39,8 +39,9 @@ Test the patch merging functionality of `quilt diff'.
+ > Applying patch %{P}c.diff
+ > Now at patch %{P}c.diff
+
+- $ quilt diff -P b.diff | grep -v "^\\(---\\|+++\\)"
++ $ quilt diff -P b.diff >/dev/null
+ > Warning: more recent patches modify files in patch %{P}b.diff
++ $ quilt diff -P b.diff 2>/dev/null | grep -v "^\\(---\\|+++\\)"
+ >~ Index: [^/]+/abc\.txt
+ > ===
+ > @@ -1,3 +1,3 @@
+@@ -49,8 +50,9 @@ Test the patch merging functionality of `quilt diff'.
+ > +b+
+ > c
+
+- $ quilt diff --combine a.diff -P b.diff | grep -v "^\\(---\\|+++\\)"
++ $ quilt diff --combine a.diff -P b.diff >/dev/null
+ > Warning: more recent patches modify files in patch %{P}b.diff
++ $ quilt diff --combine a.diff -P b.diff 2>/dev/null | grep -v
"^\\(---\\|+++\\)"
+ >~ Index: [^/]+/abc\.txt
+ > ===
+ > @@ -1,3 +1,3 @@
+--
+2.40.0
+
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181746):
https://lists.openembedded.org/g/openembedded-core/message/181746
Mute This Topic: https://lists.openembedded.org/mt/99143104/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 17/21] license.bbclass: Include LICENSE in the output when it fails to parse
From: Peter Kjellerstedt
Signed-off-by: Peter Kjellerstedt
Signed-off-by: Alexandre Belloni
Signed-off-by: Richard Purdie
(cherry picked from commit 1a5197760da3890cc80ac7da8d589766612d9051)
Signed-off-by: Steve Sakoman
---
meta/classes/license.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 4ebfc4fb92..b92838c030 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -223,7 +223,7 @@ def find_license_files(d):
bb.fatal('%s: %s' % (d.getVar('PF'), exc))
except SyntaxError:
oe.qa.handle_error("license-syntax",
-"%s: Failed to parse it's LICENSE field." % (d.getVar('PF')), d)
+"%s: Failed to parse LICENSE: %s" % (d.getVar('PF'),
d.getVar('LICENSE')), d)
# Add files from LIC_FILES_CHKSUM to list of license files
lic_chksum_paths = defaultdict(OrderedDict)
for path, data in sorted(lic_chksums.items()):
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181749):
https://lists.openembedded.org/g/openembedded-core/message/181749
Mute This Topic: https://lists.openembedded.org/mt/99143108/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 15/21] package_manager/ipk: fix config path generation in _create_custom_config()
From: Enrico Jörns
"sysconfdir" contains "/" by definition and thus using os.path.join()
leads to self.target_rootfs being always ignored (and thus attempting to
generate paths in host's /etc).
Use oe.path.join() instead which was made for this purpose.
Signed-off-by: Enrico Jorns
Signed-off-by: Luca Ceresoli
Signed-off-by: Richard Purdie
(cherry picked from commit 8414c504138f6de663f5130c6b4a6ede5605d88b)
Signed-off-by: Steve Sakoman
---
meta/lib/oe/package_manager/ipk/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oe/package_manager/ipk/__init__.py
b/meta/lib/oe/package_manager/ipk/__init__.py
index 9f60f3abcc..fd61340087 100644
--- a/meta/lib/oe/package_manager/ipk/__init__.py
+++ b/meta/lib/oe/package_manager/ipk/__init__.py
@@ -245,7 +245,7 @@ class OpkgPM(OpkgDpkgPM):
"""
if (self.d.getVar('FEED_DEPLOYDIR_BASE_URI') or "") != "":
for arch in self.pkg_archs.split():
-cfg_file_name = os.path.join(self.target_rootfs,
+cfg_file_name = oe.path.join(self.target_rootfs,
self.d.getVar("sysconfdir"),
"opkg",
"local-%s-feed.conf" % arch)
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181747):
https://lists.openembedded.org/g/openembedded-core/message/181747
Mute This Topic: https://lists.openembedded.org/mt/99143105/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 10/21] p11-kit: add native to BBCLASSEXTEND
From: Jan Luebbe
This recipe is needed to build softhsm (in meta-oe) in with p11-kit
support, which is useful when multiple PKCS#11 modules need to be used.
Signed-off-by: Jan Luebbe
Signed-off-by: Richard Purdie
(cherry picked from commit 4942a42d5a071b283fe49047dcb4fee2c96422e8)
Signed-off-by: Steve Sakoman
---
meta/recipes-support/p11-kit/p11-kit_0.24.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.24.1.bb
b/meta/recipes-support/p11-kit/p11-kit_0.24.1.bb
index 59cbb67961..72b446204a 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.24.1.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.24.1.bb
@@ -29,4 +29,4 @@ FILES:${PN} += " \
# PN contains p11-kit-proxy.so, a symlink to a loadable module
INSANE_SKIP:${PN} = "dev-so"
-BBCLASSEXTEND = "nativesdk"
+BBCLASSEXTEND = "native nativesdk"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181742):
https://lists.openembedded.org/g/openembedded-core/message/181742
Mute This Topic: https://lists.openembedded.org/mt/99143099/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 21/21] piglit: Add missing glslang dependencies
From: Tom Hochstein
The vulkan configuration requires glslangValidator for build and
runtime.
Fixes configure error:
```
| CMake Error at CMakeLists.txt:191 (message):
| glslangValidator required by vulkan tests not found
```
Fixes runtime error:
```
name: vulkan@shaders@fs-large-local-array
result: fail
returncode: 1
out:
err: glslangValidator: No such file or directory
glslangValidator failed
```
Signed-off-by: Tom Hochstein
Signed-off-by: Alexandre Belloni
Signed-off-by: Steve Sakoman
---
meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
b/meta/recipes-graphics/piglit/piglit_git.bb
index a3c9c5e2e0..78a5d6248a 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -42,7 +42,7 @@ PACKAGECONFIG[freeglut] =
"-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF"
PACKAGECONFIG[opencl] =
"-DPIGLIT_BUILD_CL_TESTS=ON,-DPIGLIT_BUILD_CL_TESTS=OFF,virtual/opencl-icd"
PACKAGECONFIG[x11] =
"-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS},
${X11_RDEPS}"
-PACKAGECONFIG[vulkan] =
"-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader"
+PACKAGECONFIG[vulkan] =
"-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,glslang-native
vulkan-loader,glslang"
export PIGLIT_BUILD_DIR = "../../../../git"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181753):
https://lists.openembedded.org/g/openembedded-core/message/181753
Mute This Topic: https://lists.openembedded.org/mt/99143119/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 09/21] avahi: fix D-Bus introspection
From: Eero Aaltonen
Install and package the D-Bus introspection files.
Signed-off-by: Eero Aaltonen
Signed-off-by: Alexandre Belloni
(cherry picked from commit b8183ad25af3bcf23f04dd649b6ef665569fac8c)
Signed-off-by: Eero Aaltonen
Signed-off-by: Steve Sakoman
---
meta/recipes-connectivity/avahi/avahi_0.8.bb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb
b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index 9bb5e5861e..b5c966c102 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -83,7 +83,6 @@ RRECOMMENDS:${PN}:append:libc-glibc = " libnss-mdns"
do_install() {
autotools_do_install
rm -rf ${D}/run
- rm -rf ${D}${datadir}/dbus-1/interfaces
test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty
${D}${datadir}/dbus-1
rm -rf ${D}${libdir}/avahi
@@ -135,7 +134,7 @@ FILES:avahi-daemon = "${sbindir}/avahi-daemon \
${sysconfdir}/avahi/services \
${sysconfdir}/dbus-1 \
${sysconfdir}/init.d/avahi-daemon \
- ${datadir}/avahi/introspection/*.introspect \
+ ${datadir}/dbus-1/interfaces \
${datadir}/avahi/avahi-service.dtd \
${datadir}/avahi/service-types \
${datadir}/dbus-1/system-services"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181741):
https://lists.openembedded.org/g/openembedded-core/message/181741
Mute This Topic: https://lists.openembedded.org/mt/99143098/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 12/21] maintainers.inc: Fix email address typo
From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit 2a86ca028980b501e386f6bb8293a094fd77f97b) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4778b1e5e6..207d889acd 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -280,7 +280,7 @@ RECIPE_MAINTAINER:pn-intltool = "Alexander Kanavin " RECIPE_MAINTAINER:pn-iproute2 = "Changhyeok Bae " RECIPE_MAINTAINER:pn-iptables = "Changhyeok Bae " RECIPE_MAINTAINER:pn-iputils = "Changhyeok Bae " -RECIPE_MAINTAINER:pn-iso-codes = "Wang Mingyu " +RECIPE_MAINTAINER:pn-iso-codes = "Wang Mingyu " RECIPE_MAINTAINER:pn-itstool = "Andreas Müller " RECIPE_MAINTAINER:pn-iw = "Changhyeok Bae " RECIPE_MAINTAINER:pn-libjpeg-turbo = "Anuj Mittal " -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181744): https://lists.openembedded.org/g/openembedded-core/message/181744 Mute This Topic: https://lists.openembedded.org/mt/99143101/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 13/21] maintainers.inc: Move repo to unassigned
From: Richard Purdie Signed-off-by: Richard Purdie (cherry picked from commit a51a069bad78c578122ae1a5b500f715246d413d) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/maintainers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 207d889acd..19bc29708c 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -700,7 +700,7 @@ RECIPE_MAINTAINER:pn-quilt-native = "Robert Yang " RECIPE_MAINTAINER:pn-quota = "Anuj Mittal " RECIPE_MAINTAINER:pn-re2c = "Khem Raj " RECIPE_MAINTAINER:pn-readline = "Hongxu Jia " -RECIPE_MAINTAINER:pn-repo = "Jasper Orschulko " +RECIPE_MAINTAINER:pn-repo = "Unassigned " RECIPE_MAINTAINER:pn-resolvconf = "Chen Qi " RECIPE_MAINTAINER:pn-rgb = "Unassigned " RECIPE_MAINTAINER:pn-rpcbind = "Hongxu Jia " -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181745): https://lists.openembedded.org/g/openembedded-core/message/181745 Mute This Topic: https://lists.openembedded.org/mt/99143103/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 11/21] systemd-systemctl: fix instance template WantedBy symlink construction
From: Martin Siegumfeldt
Fix issue of the below instance template systemd service dependency
[Install]
WantedBy=svc-wants@%i.service
creating the symlink (instance "a" example)
/etc/systemd/system/svc-wants@%i.service.wants/svc-wanted-by@a.service
which should be
/etc/systemd/system/svc-wants@a.service.wants/svc-wanted-by@a.service
as implemented by this change.
The functionality appears regressed just after "thud" baseline when the
logic was refactored from shell script into python (commit
925e30cb104ece7bfa48b78144e758a46dc9ec3f)
(From OE-Core rev: 308397f0bb3d6f3d4e9ec2c6a10823184049c9b5)
Signed-off-by: Martin Siegumfeldt
Signed-off-by: Alexandre Belloni
Signed-off-by: Richard Purdie
Signed-off-by: Steve Sakoman
(cherry picked from commit 372b29c8ad270d4d430c26a4e614976c7029afaf)
Signed-off-by: Steve Sakoman
---
.../systemd/systemd-systemctl/systemctl | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl
b/meta/recipes-core/systemd/systemd-systemctl/systemctl
index 6d19666d82..1c87beadad 100755
--- a/meta/recipes-core/systemd/systemd-systemctl/systemctl
+++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl
@@ -184,12 +184,19 @@ class SystemdUnit():
raise SystemdUnitNotFoundError(self.root, unit)
-def _process_deps(self, config, service, location, prop, dirstem):
+def _process_deps(self, config, service, location, prop, dirstem,
instance):
systemdir = self.root / SYSCONFDIR / "systemd" / "system"
target = ROOT / location.relative_to(self.root)
try:
for dependent in config.get('Install', prop):
+# determine whether or not dependent is a template with an
actual
+# instance (i.e. a '@%i')
+dependent_is_template =
re.match(r"[^@]+@(?P[^\.]*)\.", dependent)
+if dependent_is_template:
+# if so, replace with the actual instance to achieve
+# svc-wants@a.service.wants/svc-wanted-by@a.service
+dependent =
re.sub(dependent_is_template.group('instance'), instance, dependent, 1)
wants = systemdir / "{}.{}".format(dependent, dirstem) /
service
add_link(wants, target)
@@ -229,8 +236,8 @@ class SystemdUnit():
else:
service = self.unit
-self._process_deps(config, service, path, 'WantedBy', 'wants')
-self._process_deps(config, service, path, 'RequiredBy', 'requires')
+self._process_deps(config, service, path, 'WantedBy', 'wants',
instance)
+self._process_deps(config, service, path, 'RequiredBy', 'requires',
instance)
try:
for also in config.get('Install', 'Also'):
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181743):
https://lists.openembedded.org/g/openembedded-core/message/181743
Mute This Topic: https://lists.openembedded.org/mt/99143100/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 07/21] llvm: backport a fix for build with gcc-13
From: Martin Jansa
* needed for llvm-native on hosts with gcc-13
Signed-off-by: Martin Jansa
Signed-off-by: Steve Sakoman
---
...-missing-cstdint-header-to-Signals.h.patch | 31 +++
meta/recipes-devtools/llvm/llvm_git.bb| 1 +
2 files changed, 32 insertions(+)
create mode 100644
meta/recipes-devtools/llvm/llvm/0001-Support-Add-missing-cstdint-header-to-Signals.h.patch
diff --git
a/meta/recipes-devtools/llvm/llvm/0001-Support-Add-missing-cstdint-header-to-Signals.h.patch
b/meta/recipes-devtools/llvm/llvm/0001-Support-Add-missing-cstdint-header-to-Signals.h.patch
new file mode 100644
index 00..fdb6307ab5
--- /dev/null
+++
b/meta/recipes-devtools/llvm/llvm/0001-Support-Add-missing-cstdint-header-to-Signals.h.patch
@@ -0,0 +1,31 @@
+From a94bf34221fc4519bd8ec72560c2d363ffe2de4c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich
+Date: Mon, 23 May 2022 08:03:23 +0100
+Subject: [PATCH] [Support] Add missing header to Signals.h
+
+Without the change llvm build fails on this week's gcc-13 snapshot as:
+
+[ 0%] Building CXX object
lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o
+In file included from llvm/lib/Support/Signals.cpp:14:
+llvm/include/llvm/Support/Signals.h:119:8: error: variable or field
'CleanupOnSignal' declared void
+ 119 | void CleanupOnSignal(uintptr_t Context);
+ |^~~
+
+Upstream-Status: Backport [llvmorg-15.0.0
ff1681ddb303223973653f7f5f3f3435b48a1983]
+Signed-off-by: Martin Jansa
+---
+ llvm/include/llvm/Support/Signals.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/llvm/include/llvm/Support/Signals.h
b/llvm/include/llvm/Support/Signals.h
+index 44f5a750ff5c..937e0572d4a7 100644
+--- a/llvm/include/llvm/Support/Signals.h
b/llvm/include/llvm/Support/Signals.h
+@@ -14,6 +14,7 @@
+ #ifndef LLVM_SUPPORT_SIGNALS_H
+ #define LLVM_SUPPORT_SIGNALS_H
+
++#include
+ #include
+
+ namespace llvm {
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb
b/meta/recipes-devtools/llvm/llvm_git.bb
index 9400bf0821..cedbfb138e 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -32,6 +32,7 @@ SRC_URI =
"git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=http
file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2
\
file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2
\
+
file://0001-Support-Add-missing-cstdint-header-to-Signals.h.patch;striplevel=2 \
"
UPSTREAM_CHECK_GITTAGREGEX = "llvmorg-(?P\d+(\.\d+)+)"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181739):
https://lists.openembedded.org/g/openembedded-core/message/181739
Mute This Topic: https://lists.openembedded.org/mt/99143096/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 08/21] nghttp2: Deleted the entries for -client and -server, and removed a dependency on them from the main package.
From: leimaohui
By default there is nothing in nghttp2-client and nghttp2-server ,nghttp2-client
and nghttp2-server aren't created. So there are dependences error if install
main package.
Problem: conflicting requests
- nothing provides nghttp2-client >= 1.52.0 needed by
nghttp2-1.52.0-r0.core2_64
- nothing provides nghttp2-server >= 1.52.0 needed by
nghttp2-1.52.0-r0.core2_64
Upstream-Status: Backport [OE-core d2cbe060955c598bd81923ecd554fbe82c17af99]
Signed-off-by: Lei Maohui
Signed-off-by: Alexandre Belloni
Signed-off-by: Steve Sakoman
---
meta/recipes-support/nghttp2/nghttp2_1.47.0.bb | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb
b/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb
index becacd4502..90d3286ac6 100644
--- a/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb
+++ b/meta/recipes-support/nghttp2/nghttp2_1.47.0.bb
@@ -23,17 +23,15 @@ EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=OFF
-DENABLE_HPACK_TOOLS=OFF
#
EXTRA_OECMAKE += "-DENABLE_PYTHON_BINDINGS=OFF"
-PACKAGES =+ "lib${BPN} ${PN}-client ${PN}-proxy ${PN}-server"
+PACKAGES =+ "lib${BPN} ${PN}-proxy "
-RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server
(>= ${PV})"
+RDEPENDS:${PN} = "${PN}-proxy (>= ${PV})"
RDEPENDS:${PN}:class-native = ""
RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell"
ALLOW_EMPTY:${PN} = "1"
FILES:${PN} = ""
FILES:lib${BPN} = "${libdir}/*${SOLIBS}"
-FILES:${PN}-client = "${bindir}/h2load ${bindir}/nghttp"
FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response"
-FILES:${PN}-server = "${bindir}/nghttpd"
BBCLASSEXTEND = "native nativesdk"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181740):
https://lists.openembedded.org/g/openembedded-core/message/181740
Mute This Topic: https://lists.openembedded.org/mt/99143097/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 00/21] Patch review
Please review this set of patches for kirkstone and have comments back by
end of day Monday.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5349
The following changes since commit d2713785f9cd2d58731df877bc8b7bcc71b6c8e6:
build-appliance-image: Update to kirkstone head revision (2023-05-12 04:05:43
-1000)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/kirkstone-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/kirkstone-nut
Alexander Kanavin (1):
dhcpcd: use git instead of tarballs
Archana Polampalli (1):
git: ignore CVE-2023-25815
Eero Aaltonen (1):
avahi: fix D-Bus introspection
Enrico Jörns (1):
package_manager/ipk: fix config path generation in
_create_custom_config()
Jan Luebbe (1):
p11-kit: add native to BBCLASSEXTEND
Khem Raj (2):
gcc-runtime: Use static dummy libstdc++
quilt: Fix merge.test race condition
Marek Vasut (1):
cpio: Fix wrong CRC with ASCII CRC for large files
Martin Jansa (1):
llvm: backport a fix for build with gcc-13
Martin Siegumfeldt (1):
systemd-systemctl: fix instance template WantedBy symlink construction
Ming Liu (1):
weston: add xwayland to DEPENDS for PACKAGECONFIG xwayland
Pablo Saavedra (1):
gstreamer1.0: upgrade 1.20.5 -> 1.20.6
Peter Kjellerstedt (1):
license.bbclass: Include LICENSE in the output when it fails to parse
Richard Purdie (2):
maintainers.inc: Fix email address typo
maintainers.inc: Move repo to unassigned
Sakib Sajal (1):
go: fix CVE-2023-24540
Tom Hochstein (2):
piglit: Add PACKAGECONFIG for glx and opencl
piglit: Add missing glslang dependencies
Upgrade Helper (1):
waffle: upgrade 1.7.0 -> 1.7.2
Zoltan Boszormenyi (1):
piglit: Fix build time dependency
leimaohui (1):
nghttp2: Deleted the entries for -client and -server, and removed a
dependency on them from the main package.
meta/classes/license.bbclass | 2 +-
meta/conf/distro/include/maintainers.inc | 4 +-
meta/lib/oe/package_manager/ipk/__init__.py | 2 +-
meta/recipes-connectivity/avahi/avahi_0.8.bb | 3 +-
.../dhcpcd/dhcpcd_9.4.1.bb| 7 +-
.../systemd/systemd-systemctl/systemctl | 13 +-
meta/recipes-devtools/gcc/gcc-runtime.inc | 3 +-
meta/recipes-devtools/git/git_2.35.7.bb | 2 +
meta/recipes-devtools/go/go-1.17.13.inc | 1 +
.../go/go-1.19/CVE-2023-24540.patch | 93 ++
...-missing-cstdint-header-to-Signals.h.patch | 31 ++
meta/recipes-devtools/llvm/llvm_git.bb| 1 +
meta/recipes-devtools/quilt/quilt.inc | 1 +
...t-Fix-a-race-condition-in-merge.test.patch | 48 +++
...g-CRC-with-ASCII-CRC-for-large-files.patch | 39 +++
meta/recipes-extended/cpio/cpio_2.13.bb | 1 +
...roper-WAYLAND_INCLUDE_DIRS-variable.patch} | 0
...-shader.c-do-not-hardcode-build-pat.patch} | 0
...n-t-enable-GLX-if-tests-are-disabled.patch | 32 ++
meta/recipes-graphics/piglit/piglit_git.bb| 13 +-
...build-request-native-wayland-scanner.patch | 9 +-
...-make-core-protocol-into-the-library.patch | 23 +-
.../{waffle_1.7.0.bb => waffle_1.7.2.bb} | 8 +-
.../recipes-graphics/wayland/weston_10.0.2.bb | 2 +-
...tools_1.20.5.bb => gst-devtools_1.20.6.bb} | 2 +-
...1.20.5.bb => gstreamer1.0-libav_1.20.6.bb} | 2 +-
...x_1.20.5.bb => gstreamer1.0-omx_1.20.6.bb} | 2 +-
bb => gstreamer1.0-plugins-bad_1.20.6.bb} | 2 +-
...bb => gstreamer1.0-plugins-base_1.20.6.bb} | 2 +-
...bb => gstreamer1.0-plugins-good_1.20.6.bb} | 2 +-
...bb => gstreamer1.0-plugins-ugly_1.20.6.bb} | 2 +-
20.5.bb => gstreamer1.0-python_1.20.6.bb} | 2 +-
bb => gstreamer1.0-rtsp-server_1.20.6.bb} | 2 +-
...1.20.5.bb => gstreamer1.0-vaapi_1.20.6.bb} | 2 +-
...005-bin-Fix-race-conditions-in-tests.patch | 300 --
...er1.0_1.20.5.bb => gstreamer1.0_1.20.6.bb} | 3 +-
.../recipes-support/nghttp2/nghttp2_1.47.0.bb | 6 +-
.../recipes-support/p11-kit/p11-kit_0.24.1.bb | 2 +-
38 files changed, 305 insertions(+), 364 deletions(-)
create mode 100644 meta/recipes-devtools/go/go-1.19/CVE-2023-24540.patch
create mode 100644
meta/recipes-devtools/llvm/llvm/0001-Support-Add-missing-cstdint-header-to-Signals.h.patch
create mode 100644
meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch
create mode 100644
meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch
rename
meta/recipes-graphics/piglit/piglit/{0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
=> 0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch} (100%)
rename
meta/recipes-graphics/piglit/piglit/{0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch
=> 0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch} (100%)
create mode 100644
[OE-core][kirkstone 02/21] go: fix CVE-2023-24540
From: Sakib Sajal
References:
https://nvd.nist.gov/vuln/detail/CVE-2023-24540
Upstream patch:
https://github.com/golang/go/commit/ce7bd33345416e6d8cac901792060591cafc2797
(go 1.19.9)
Signed-off-by: Sakib Sajal
Signed-off-by: Steve Sakoman
---
meta/recipes-devtools/go/go-1.17.13.inc | 1 +
.../go/go-1.19/CVE-2023-24540.patch | 93 +++
2 files changed, 94 insertions(+)
create mode 100644 meta/recipes-devtools/go/go-1.19/CVE-2023-24540.patch
diff --git a/meta/recipes-devtools/go/go-1.17.13.inc
b/meta/recipes-devtools/go/go-1.17.13.inc
index d7cb47ebf4..e5e9d841c4 100644
--- a/meta/recipes-devtools/go/go-1.17.13.inc
+++ b/meta/recipes-devtools/go/go-1.17.13.inc
@@ -30,6 +30,7 @@ SRC_URI += "\
file://CVE-2023-24537.patch \
file://CVE-2023-24534.patch \
file://CVE-2023-24538.patch \
+file://CVE-2023-24540.patch \
"
SRC_URI[main.sha256sum] =
"a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd"
diff --git a/meta/recipes-devtools/go/go-1.19/CVE-2023-24540.patch
b/meta/recipes-devtools/go/go-1.19/CVE-2023-24540.patch
new file mode 100644
index 00..7e6e871e38
--- /dev/null
+++ b/meta/recipes-devtools/go/go-1.19/CVE-2023-24540.patch
@@ -0,0 +1,93 @@
+From 2305cdb2aa5ac8e9960bd64e548a119c7dd87530 Mon Sep 17 00:00:00 2001
+From: Roland Shoemaker
+Date: Tue, 11 Apr 2023 16:27:43 +0100
+Subject: [PATCH] html/template: handle all JS whitespace characters
+
+Rather than just a small set. Character class as defined by \s [0].
+
+Thanks to Juho Nurminen of Mattermost for reporting this.
+
+For #59721
+Fixes #59813
+Fixes CVE-2023-24540
+
+[0]
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes
+
+Change-Id: I56d4fa1ef08125b417106ee7dbfb5b0923b901ba
+Reviewed-on:
https://team-review.git.corp.google.com/c/golang/go-private/+/1821459
+Reviewed-by: Julie Qiu
+Run-TryBot: Roland Shoemaker
+Reviewed-by: Damien Neil
+Reviewed-on:
https://team-review.git.corp.google.com/c/golang/go-private/+/1851497
+Run-TryBot: Damien Neil
+Reviewed-by: Roland Shoemaker
+Reviewed-on: https://go-review.googlesource.com/c/go/+/491355
+Reviewed-by: Dmitri Shuralyov
+Reviewed-by: Carlos Amedee
+TryBot-Bypass: Carlos Amedee
+Run-TryBot: Carlos Amedee
+
+CVE: CVE-2023-24540
+Upstream-Status: Backport
[https://github.com/golang/go/commit/ce7bd33345416e6d8cac901792060591cafc2797]
+
+Signed-off-by: Sakib Sajal
+---
+ src/html/template/js.go | 8 +++-
+ src/html/template/js_test.go | 11 +++
+ 2 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/src/html/template/js.go b/src/html/template/js.go
+index b888eaf..35994f0 100644
+--- a/src/html/template/js.go
b/src/html/template/js.go
+@@ -13,6 +13,11 @@ import (
+ "unicode/utf8"
+ )
+
++// jsWhitespace contains all of the JS whitespace characters, as defined
++// by the \s character class.
++// See
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions/Character_classes.
++const jsWhitespace =
"\f\n\r\t\v\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000\ufeff"
++
+ // nextJSCtx returns the context that determines whether a slash after the
+ // given run of tokens starts a regular expression instead of a division
+ // operator: / or /=.
+@@ -26,7 +31,8 @@ import (
+ // JavaScript 2.0 lexical grammar and requires one token of lookbehind:
+ // https://www.mozilla.org/js/language/js20-2000-07/rationale/syntax.html
+ func nextJSCtx(s []byte, preceding jsCtx) jsCtx {
+- s = bytes.TrimRight(s, "\t\n\f\r \u2028\u2029")
++ // Trim all JS whitespace characters
++ s = bytes.TrimRight(s, jsWhitespace)
+ if len(s) == 0 {
+ return preceding
+ }
+diff --git a/src/html/template/js_test.go b/src/html/template/js_test.go
+index d7ee47b..8f5d76d 100644
+--- a/src/html/template/js_test.go
b/src/html/template/js_test.go
+@@ -81,14 +81,17 @@ func TestNextJsCtx(t *testing.T) {
+ {jsCtxDivOp, "0"},
+ // Dots that are part of a number are div preceders.
+ {jsCtxDivOp, "0."},
++ // Some JS interpreters treat NBSP as a normal space, so
++ // we must too in order to properly escape things.
++ {jsCtxRegexp, "=\u00A0"},
+ }
+
+ for _, test := range tests {
+- if nextJSCtx([]byte(test.s), jsCtxRegexp) != test.jsCtx {
+- t.Errorf("want %s got %q", test.jsCtx, test.s)
++ if ctx := nextJSCtx([]byte(test.s), jsCtxRegexp); ctx !=
test.jsCtx {
++ t.Errorf("%q: want %s got %s", test.s, test.jsCtx, ctx)
+ }
+- if nextJSCtx([]byte(test.s), jsCtxDivOp) != test.jsCtx {
+- t.Errorf("want %s got %q", test.jsCtx, test.s)
++ if ctx := nextJSCtx([]byte(test.s), jsCtxDivOp); ctx !=
test.jsCtx {
++
[OE-core][kirkstone 03/21] gstreamer1.0: upgrade 1.20.5 -> 1.20.6
From: Pablo Saavedra
Changelog:
===
audio: channel-mix: allow up to 64 channels instead of up to 63 channels
AOM AV1 encoder timestamp handling improvements
AV1 video codec caps handling improvements in aom plugin, isomp4 and matroska
muxers/demuxers.
avvidenc: fix bitrate control and timestamps off FFmpeg-based video encoders
h264parse: fix missing timestamps on outputs when splitting a frame
rtspsrc: more workarounds for servers with broken control uri handling
playbin3: fix issue with UDP streams, making sure there's enough buffering
qmlglsrc: Fix deadlock when stopping and some other fixes
qtmux: fix default timescale unit for N/1001 framerates
v4l2h264dec: Fix Raspberry Pi4 will not play video in application
vtdec: Fix non-deterministic frame output after seeks
wasapi2src: Fix loopback capture on Windows 10 Anniversary Update
macOS, iOS: Fix Xcode 14 ABI breakage with older Xcode
cerbero: Fix some regressions for CentOS in the 1.20 branch
cerbero: Fix setuptools site.py breakage in Python 3.11
Fix gst-libav build against FFmpeg from git
gobject-introspection annotation fixes for bindings
Miscellaneous bug fixes, memory leak fixes, and other stability and reliability
improvements
Performance improvements
Signed-off-by: Steve Sakoman
---
...tools_1.20.5.bb => gst-devtools_1.20.6.bb} | 2 +-
...1.20.5.bb => gstreamer1.0-libav_1.20.6.bb} | 2 +-
...x_1.20.5.bb => gstreamer1.0-omx_1.20.6.bb} | 2 +-
bb => gstreamer1.0-plugins-bad_1.20.6.bb} | 2 +-
...bb => gstreamer1.0-plugins-base_1.20.6.bb} | 2 +-
...bb => gstreamer1.0-plugins-good_1.20.6.bb} | 2 +-
...bb => gstreamer1.0-plugins-ugly_1.20.6.bb} | 2 +-
20.5.bb => gstreamer1.0-python_1.20.6.bb} | 2 +-
bb => gstreamer1.0-rtsp-server_1.20.6.bb} | 2 +-
...1.20.5.bb => gstreamer1.0-vaapi_1.20.6.bb} | 2 +-
...005-bin-Fix-race-conditions-in-tests.patch | 300 --
...er1.0_1.20.5.bb => gstreamer1.0_1.20.6.bb} | 3 +-
12 files changed, 11 insertions(+), 312 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gst-devtools_1.20.5.bb =>
gst-devtools_1.20.6.bb} (95%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.20.5.bb =>
gstreamer1.0-libav_1.20.6.bb} (91%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.20.5.bb =>
gstreamer1.0-omx_1.20.6.bb} (95%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.20.5.bb
=> gstreamer1.0-plugins-bad_1.20.6.bb} (98%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.20.5.bb
=> gstreamer1.0-plugins-base_1.20.6.bb} (97%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.20.5.bb
=> gstreamer1.0-plugins-good_1.20.6.bb} (97%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.20.5.bb
=> gstreamer1.0-plugins-ugly_1.20.6.bb} (94%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.20.5.bb =>
gstreamer1.0-python_1.20.6.bb} (91%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.20.5.bb
=> gstreamer1.0-rtsp-server_1.20.6.bb} (90%)
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.20.5.bb =>
gstreamer1.0-vaapi_1.20.6.bb} (95%)
delete mode 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0/0005-bin-Fix-race-conditions-in-tests.patch
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.20.5.bb =>
gstreamer1.0_1.20.6.bb} (95%)
diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.5.bb
b/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.6.bb
similarity index 95%
rename from meta/recipes-multimedia/gstreamer/gst-devtools_1.20.5.bb
rename to meta/recipes-multimedia/gstreamer/gst-devtools_1.20.6.bb
index 9db31c18e4..2eee50e6d8 100644
--- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.20.6.bb
@@ -12,7 +12,7 @@ SRC_URI =
"https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}
file://0001-connect-has-a-different-signature-on-musl.patch \
"
-SRC_URI[sha256sum] =
"5684436121b8bae07fd00b74395f95e44b5f26323dce4fa045fa665676807bba"
+SRC_URI[sha256sum] =
"2c64037c823fb88751a47dacf3d4752a52b7951190d6e05fc44855e912e81d71"
DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0
gstreamer1.0-plugins-base"
RRECOMMENDS:${PN} = "git"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.5.bb
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.6.bb
similarity index 91%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.5.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.6.bb
index e5925c6510..c54913e8a1 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.6.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
"
SRC_URI =
[OE-core][kirkstone 01/21] git: ignore CVE-2023-25815
From: Archana Polampalli This is specific to Git-for-Windows. Signed-off-by: Archana Polampalli Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/git_2.35.7.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/git/git_2.35.7.bb b/meta/recipes-devtools/git/git_2.35.7.bb index 99d3d70683..9e7b0a8cff 100644 --- a/meta/recipes-devtools/git/git_2.35.7.bb +++ b/meta/recipes-devtools/git/git_2.35.7.bb @@ -37,6 +37,8 @@ CVE_CHECK_IGNORE += "CVE-2022-24975" CVE_CHECK_IGNORE += "CVE-2022-41953" # specific to Git for Windows CVE_CHECK_IGNORE += "CVE-2023-22743" +# This is specific to Git-for-Windows +CVE_CHECK_IGNORE += "CVE-2023-25815" PACKAGECONFIG ??= "expat curl" PACKAGECONFIG[cvsserver] = "" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181733): https://lists.openembedded.org/g/openembedded-core/message/181733 Mute This Topic: https://lists.openembedded.org/mt/99143090/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 18/21] weston: add xwayland to DEPENDS for PACKAGECONFIG xwayland
From: Ming Liu Otherwise xwayland.pc would not be present in sysroot, this leads to some xwayland configs missing like have_listenfd, have_glamor. Signed-off-by: Ming Liu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 7f1932cb5a408320a5b542e20ba2807718349e8f) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/wayland/weston_10.0.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston_10.0.2.bb b/meta/recipes-graphics/wayland/weston_10.0.2.bb index f81a33fd1e..e09f94d9bb 100644 --- a/meta/recipes-graphics/wayland/weston_10.0.2.bb +++ b/meta/recipes-graphics/wayland/weston_10.0.2.bb @@ -74,7 +74,7 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" # Weston with systemd-login support PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" # Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,xwayland" # colord CMS support PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord" # Clients support -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181750): https://lists.openembedded.org/g/openembedded-core/message/181750 Mute This Topic: https://lists.openembedded.org/mt/99143109/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 05/21] cpio: Fix wrong CRC with ASCII CRC for large files
From: Marek Vasut
Due to signedness, the checksum is not computed when filesize is bigger
a 2GB. Pick a fix for this problem from CPIO ML, where the fix has been
posted for 5 years. Since CPIO upstream is effectively unresponsive and
any and all attempts to communicate with the maintainer and get the fix
applied upstream failed, add the fix here instead.
(From OE-Core rev: bfff138af4bdd356ac66571e6ad91c1a5599b935)
Signed-off-by: Marek Vasut
Signed-off-by: Richard Purdie
Signed-off-by: Steve Sakoman
---
...g-CRC-with-ASCII-CRC-for-large-files.patch | 39 +++
meta/recipes-extended/cpio/cpio_2.13.bb | 1 +
2 files changed, 40 insertions(+)
create mode 100644
meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch
diff --git
a/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch
b/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch
new file mode 100644
index 00..4b96e4316c
--- /dev/null
+++
b/meta/recipes-extended/cpio/cpio-2.13/0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch
@@ -0,0 +1,39 @@
+From 77ff5f1be394eb2c786df561ff37dde7f982ec76 Mon Sep 17 00:00:00 2001
+From: Stefano Babic
+Date: Fri, 28 Jul 2017 13:20:52 +0200
+Subject: [PATCH] Wrong CRC with ASCII CRC for large files
+
+Due to signedness, the checksum is not computed when filesize is bigger
+a 2GB.
+
+Upstream-Status: Submitted
[https://lists.gnu.org/archive/html/bug-cpio/2017-07/msg4.html]
+Signed-off-by: Stefano Babic
+---
+ src/copyout.c | 8
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/copyout.c b/src/copyout.c
+index 1f0987a..727aeca 100644
+--- a/src/copyout.c
b/src/copyout.c
+@@ -34,13 +34,13 @@
+compute and return a checksum for them. */
+
+ static uint32_t
+-read_for_checksum (int in_file_des, int file_size, char *file_name)
++read_for_checksum (int in_file_des, unsigned int file_size, char *file_name)
+ {
+ uint32_t crc;
+ char buf[BUFSIZ];
+- int bytes_left;
+- int bytes_read;
+- int i;
++ unsigned int bytes_left;
++ unsigned int bytes_read;
++ unsigned int i;
+
+ crc = 0;
+
+--
+2.7.4
+
diff --git a/meta/recipes-extended/cpio/cpio_2.13.bb
b/meta/recipes-extended/cpio/cpio_2.13.bb
index e72a114de9..dd3541096f 100644
--- a/meta/recipes-extended/cpio/cpio_2.13.bb
+++ b/meta/recipes-extended/cpio/cpio_2.13.bb
@@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
file://0002-src-global.c-Remove-superfluous-declaration-of-progr.patch \
file://CVE-2021-38185.patch \
+ file://0001-Wrong-CRC-with-ASCII-CRC-for-large-files.patch \
"
SRC_URI[md5sum] = "389c5452d667c23b5eceb206f5000810"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181737):
https://lists.openembedded.org/g/openembedded-core/message/181737
Mute This Topic: https://lists.openembedded.org/mt/99143094/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 06/21] gcc-runtime: Use static dummy libstdc++
From: Khem Raj
some standalone targets e.g. riscv64-elf disable shared linking for
baremetal ELF ABI in ld, therefore lets make it a static library
(From OE-Core rev: 3c6219dfcbcbde314648ba8cc54a90b32ea1c952)
Signed-off-by: Khem Raj
Signed-off-by: Richard Purdie
Signed-off-by: Steve Sakoman
---
meta/recipes-devtools/gcc/gcc-runtime.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc
b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 8074bf1025..d019b0790b 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -68,7 +68,8 @@ do_configure () {
# libstdc++ isn't built yet so CXX would error not able to find it
which breaks stdc++'s configure
# tests. Create a dummy empty lib for the purposes of configure.
mkdir -p ${WORKDIR}/dummylib
- ${CC} -x c /dev/null -nostartfiles -shared -o
${WORKDIR}/dummylib/libstdc++.so
+ ${CC} -x c /dev/null -c -o ${WORKDIR}/dummylib/dummylib.o
+ ${AR} rcs ${WORKDIR}/dummylib/libstdc++.a ${WORKDIR}/dummylib/dummylib.o
for d in libgcc ${RUNTIMETARGET}; do
echo "Configuring $d"
rm -rf ${B}/${TARGET_SYS}/$d/
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181738):
https://lists.openembedded.org/g/openembedded-core/message/181738
Mute This Topic: https://lists.openembedded.org/mt/99143095/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][kirkstone 04/21] waffle: upgrade 1.7.0 -> 1.7.2
From: Upgrade Helper
The Waffle bugfix release 1.7.1 is now available.
What is new in this release:
- cmake: pass deps' cflags to the build
- gbm: fix crash when platform lacks modifier support
- gitlab-ci: stabilise CI runs under X
- gitlab-ci: add more warnings, make all warnings fatal
- gitlab-ci: update to bullseye
- meson: add override_* support, when using waffle as submodule
- meson: skip installing bash completion when custom prefix is used
- meson: silence deprecation warnings
- meson: generate cmake files only on Windows
- meson: find wayland.xml from wayland-scanner.pc
- misc: zsh completion
- misc: fix dozens of compiler warnings
- misc: update website references
- wayland: fix build against wayland 1.20
The Waffle bugfix release 1.7.2 is now available.
What is new in this release:
- all: use format(gnu_printf), enable in mingw
- meson: don't run TLS checks on mingw
- wgl: remove unused dummy wgl_error.[ch]
Upstream now only generates CMake files on Windows, so remove all
references to CMake.
A zsh completion is now installed, remove this for now as we don't really
use zsh.
Signed-off-by: Ross Burton
Signed-off-by: Richard Purdie
(cherry picked from commit 94cf6ef11bba381ab6f65b03ed1ed14022438151)
Signed-off-by: Steve Sakoman
(cherry picked from commit e4ebfb5c7892488fc834d9837e9a5a4c28eb676f)
Signed-off-by: Steve Sakoman
---
...build-request-native-wayland-scanner.patch | 9
...-make-core-protocol-into-the-library.patch | 23 ---
.../{waffle_1.7.0.bb => waffle_1.7.2.bb} | 8 +++
3 files changed, 13 insertions(+), 27 deletions(-)
rename meta/recipes-graphics/waffle/{waffle_1.7.0.bb => waffle_1.7.2.bb} (92%)
diff --git
a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch
b/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch
index 1b62db92e9..4b3a0e7c4a 100644
---
a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch
+++
b/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch
@@ -1,4 +1,4 @@
-From 2195cec1e5bc66128d72049c11ff381ca4516a4b Mon Sep 17 00:00:00 2001
+From 0961787d2bf0d359a3ead89e9cec642818b32dea Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Tue, 5 Jul 2022 11:51:39 +0200
Subject: [PATCH] meson.build: request native wayland-scanner
@@ -8,15 +8,16 @@ try to use a cross-binary, and fail.
Upstream-Status: Submitted
[https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110]
Signed-off-by: Alexander Kanavin
+
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index 0bb6128..0b6da1f 100644
+index ca6a212..3177bde 100644
--- a/meson.build
+++ b/meson.build
-@@ -108,7 +108,7 @@ else
+@@ -110,7 +110,7 @@ else
'wayland-egl', version : '>= 9.1', required : get_option('wayland'),
)
dep_wayland_scanner = dependency(
@@ -24,4 +25,4 @@ index 0bb6128..0b6da1f 100644
+'wayland-scanner', version : '>= 1.15', required : get_option('wayland'),
native: true,
)
if dep_wayland_scanner.found()
- prog_wayland_scanner =
find_program(dep_wayland_scanner.get_pkgconfig_variable('wayland_scanner'))
+ prog_wayland_scanner =
find_program(dep_wayland_scanner.get_variable(pkgconfig: 'wayland_scanner'))
diff --git
a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
index 24b2de5d9c..60e6318f7a 100644
---
a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
+++
b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
@@ -1,4 +1,4 @@
-From 7610ec4b572d3a54d30fca6798f0c406f3fd8a46 Mon Sep 17 00:00:00 2001
+From 71f9399d6cea1e2e885a98b98d82eb628832a86e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Tue, 26 Oct 2021 08:52:17 +0200
Subject: [PATCH] waffle: do not make core protocol into the library
@@ -9,28 +9,13 @@ wayland.xml from the host.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin
+
---
- meson.build| 4
src/waffle/meson.build | 7 ---
- 2 files changed, 11 deletions(-)
+ 1 file changed, 7 deletions(-)
-diff --git a/meson.build b/meson.build
-index ffc02ff..0bb6128 100644
a/meson.build
-+++ b/meson.build
-@@ -104,10 +104,6 @@ else
- dep_wayland_client = dependency(
- 'wayland-client', version : '>= 1.10', required : get_option('wayland'),
- )
-- if dep_wayland_client.found()
--wayland_core_xml =
join_paths(dep_wayland_client.get_pkgconfig_variable('pkgdatadir'),
--'wayland.xml')
-- endif
- dep_wayland_egl = dependency(
- 'wayland-egl', version : '>= 9.1', required : get_option('wayland'),
- )
diff --git
[OE-core] [PATCH] perf: Make built-in libtraceevent plugins cohabit with external libtraceevent
This will package the plugins built by perf into kernel specific dir
under libdir, so it does not conflict with plugins from newly added
libtraceevent recipe
Fixes
do_sdk_depends: The file /usr/lib/traceevent/plugins/plugin_cfg80211.so is
installed by both perf and libtraceevent, aborting
Signed-off-by: Khem Raj
Cc: Max Krummenacher
---
meta/recipes-kernel/perf/perf.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 67b01a7f65a..d31f59f460b 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -137,6 +137,8 @@ PERF_EXTRA_LDFLAGS:mipsarchn64el = "-m elf64ltsmip"
do_compile() {
# Linux kernel build system is expected to do the right thing
unset CFLAGS
+ sed -i -e
's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
${S}/tools/lib/traceevent/plugins/Makefile
+ sed -i -e
's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g'
${S}/tools/perf/Makefile.config
oe_runmake all
}
@@ -364,7 +366,7 @@ RSUGGESTS_SCRIPTING =
"${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}
RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
FILES_SOLIBSDEV = ""
-FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core
${libdir}/traceevent ${libdir}/libperf-jvmti.so"
+FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core
${libdir}/traceevent* ${libdir}/libperf-jvmti.so"
FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
FILES:${PN}-tests = "${libdir}/perf/perf-core/tests
${libexecdir}/perf-core/tests"
FILES:${PN}-python = " \
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181731):
https://lists.openembedded.org/g/openembedded-core/message/181731
Mute This Topic: https://lists.openembedded.org/mt/99142359/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [qa-build-notification] QA notification for completed autobuilder build (yocto-4.2.1)
Hi All, QA for yocto-4.2.1.rc1 is completed. This is the full report for this release: https://git.yoctoproject.org/cgit/cgit.cgi/yocto-testresults-contrib/tree/?h=intel-yocto-testresults === Summary No high milestone defects. No new issue found. Thanks, Jing Hui > -Original Message- > From: qa-build-notificat...@lists.yoctoproject.org notificat...@lists.yoctoproject.org> On Behalf Of Pokybuild User > Sent: Saturday, May 20, 2023 7:22 AM > To: yo...@lists.yoctoproject.org > Cc: qa-build-notificat...@lists.yoctoproject.org > Subject: [qa-build-notification] QA notification for completed autobuilder > build (yocto-4.2.1) > > > A build flagged for QA (yocto-4.2.1) was completed on the autobuilder and > is available at: > > > https://autobuilder.yocto.io/pub/releases/yocto-4.2.1 > > > Build hash information: > > bitbake: d97d62e2cbe4bae17f0886f3b4759e8f9ba6d38c > meta-agl: 09135164a21a216c6e3e75d7decce896b92962f0 > meta-arm: 68509775774d9cf304e2b422927f2a9636525155 > meta-aws: 98efcdaf375df31c53d0f8d28240a079dae7b4d9 > meta-intel: a0ea4e5d395579e70f1057f1f1222c8a2b55bd96 > meta-mingw: cc9fd0a988dc1041035a6a6cafb2d1237ef38d8e > meta-openembedded: 54b177f4acb3048d21a68f180fc183d0fdf47a94 > meta-virtualization: 1e338cbfd80dc34f90f13f92fba2e810f6858ed6 > oecore: 20cd64812d286c920bd766145ab1cd968e72667e > poky: c5c69f78fc7ce4ba361363c14352e4264ce7813f > > > > This is an automated message from the Yocto Project Autobuilder > Git: git://git.yoctoproject.org/yocto-autobuilder2 > Email: richard.pur...@linuxfoundation.org > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181730): https://lists.openembedded.org/g/openembedded-core/message/181730 Mute This Topic: https://lists.openembedded.org/mt/99065803/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] linux-yocto: Drop 5.15 support
On Thu, May 25, 2023 at 8:29 AM Richard Purdie
wrote:
>
> 5.15 doesn't work with gcc 13 and we'll be replacing 5.15 with a new kernel
> version later in the release cycle. Drop 5.15 now so we can move forward
> with gcc 13 and we'll add a new kernel version later.
>
Fine with me.
I'll continue sending -stable updates for 5.15 for the released branches.
linux-yocto-dev is currently testing the 6.4-rc series, so depending
on where the kernel release cycles land, we'll be 6.4 or 6.5 for the
"new" kernel in the release.
Bruce
> Signed-off-by: Richard Purdie
> ---
> .../linux/linux-yocto-rt_5.15.bb | 45
> .../linux/linux-yocto-tiny_5.15.bb| 30
> meta/recipes-kernel/linux/linux-yocto_5.15.bb | 70 ---
> 3 files changed, 145 deletions(-)
> delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> delete mode 100644 meta/recipes-kernel/linux/linux-yocto_5.15.bb
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> deleted file mode 100644
> index 475fe34066d..000
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -KBRANCH ?= "v5.15/standard/preempt-rt/base"
> -
> -require recipes-kernel/linux/linux-yocto.inc
> -
> -# Skip processing of this recipe if it is not explicitly specified as the
> -# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
> -# to build multiple virtual/kernel providers, e.g. as dependency of
> -# core-image-rt-sdk, core-image-rt.
> -python () {
> -if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and
> d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
> -raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to
> linux-yocto-rt to enable it")
> -}
> -
> -SRCREV_machine ?= "8e0611e36c848a07f9cdd778903c9e51bb90b319"
> -SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312"
> -
> -SRC_URI =
> "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https
> \
> -
> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA};protocol=https"
> -
> -LINUX_VERSION ?= "5.15.108"
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> -
> -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
> -DEPENDS += "openssl-native util-linux-native"
> -
> -PV = "${LINUX_VERSION}+git${SRCPV}"
> -
> -KMETA = "kernel-meta"
> -KCONF_BSP_AUDIT_LEVEL = "1"
> -
> -LINUX_KERNEL_TYPE = "preempt-rt"
> -
> -COMPATIBLE_MACHINE =
> "^(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)$"
> -
> -KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
> -
> -# Functionality flags
> -KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc
> features/taskstats/taskstats.scc"
> -KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
> -KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc
> features/drm-bochs/drm-bochs.scc"
> -KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
> -KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
> -KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "
> features/scsi/scsi-debug.scc", "", d)}"
> -KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "
> features/gpio/mockup.scc", "", d)}"
> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> deleted file mode 100644
> index 365d01db781..000
> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -KBRANCH ?= "v5.15/standard/tiny/base"
> -
> -LINUX_KERNEL_TYPE = "tiny"
> -KCONFIG_MODE = "--allnoconfig"
> -
> -require recipes-kernel/linux/linux-yocto.inc
> -
> -LINUX_VERSION ?= "5.15.108"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> -
> -DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
> -DEPENDS += "openssl-native util-linux-native"
> -
> -KMETA = "kernel-meta"
> -KCONF_BSP_AUDIT_LEVEL = "2"
> -
> -SRCREV_machine ?= "3d762b85647844790979dd1e17a762003aaa7476"
> -SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312"
> -
> -PV = "${LINUX_VERSION}+git${SRCPV}"
> -
> -SRC_URI =
> "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https
> \
> -
> git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA};protocol=https"
> -
> -COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm64|qemuarm|qemuarmv5)$"
> -
> -# Functionality flags
> -KERNEL_FEATURES = ""
> -
> -KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
> diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
> b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
> deleted file
Re: [OE-core] [PATCH 5/8] Remove usage of /var/volatile/tmp
On Thu, 2023-05-25 at 23:29 +0100, Richard Purdie via lists.openembedded.org wrote: > On Tue, 2023-05-23 at 11:04 +0200, Alexander Kanavin wrote: > > Nothing depends on this patch and it can be dropped for testing or > > merging. I pulled it in because otherwise glib update to 2.76 would > > start failing its ptest, but I see that glib update landed in master > > but this patch did not. Not sure how that happened, are ptests passing > > as of current master? > > Interestingly it looks like switching to gcc 13 triggers the glib ptest > warnings. Not sure why, it is probably the last issue we have with core > before merging gcc 13 though. We can fix the tests with: diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest index c476d67310d..831bc3b91f1 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest @@ -6,5 +6,5 @@ if id -u glib2-test; then fi useradd glib2-test cd /tmp -su glib2-test -c 'gnome-desktop-testing-runner glib' +su glib2-test -c 'G_TEST_TMPDIR=`readlink -f /tmp` gnome-desktop-testing-runner glib' userdel glib2-test Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181728): https://lists.openembedded.org/g/openembedded-core/message/181728 Mute This Topic: https://lists.openembedded.org/mt/99069809/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 5/8] Remove usage of /var/volatile/tmp
On Tue, 2023-05-23 at 11:04 +0200, Alexander Kanavin wrote: > Nothing depends on this patch and it can be dropped for testing or > merging. I pulled it in because otherwise glib update to 2.76 would > start failing its ptest, but I see that glib update landed in master > but this patch did not. Not sure how that happened, are ptests passing > as of current master? Interestingly it looks like switching to gcc 13 triggers the glib ptest warnings. Not sure why, it is probably the last issue we have with core before merging gcc 13 though. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181727): https://lists.openembedded.org/g/openembedded-core/message/181727 Mute This Topic: https://lists.openembedded.org/mt/99069809/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Parsing failure due to recent patch
I am seeing a parsing error with the meta-ti layer due to this recent
change:
https://git.openembedded.org/openembedded-core/commit/?id=93a09a05d6dde3542587735df0aa2371e79a3bb7
We have the following lines in our files:
KERNEL_LOCALVERSION =
"-g${@d.getVar('SRCPV',True).replace('AUTOINC+','')[:10]}"
UBOOT_LOCALVERSION =
"-g${@d.getVar('SRCPV',True).replace('AUTOINC+','')[:10]}"
And when that patch is in place we now get this error:
ERROR: ExpansionError during parsing
/scratch/builds/arago-master-wip/build/sources/meta-ti/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
Traceback (most recent call last):
File
"/scratch/builds/arago-master-wip/build/sources/bitbake/lib/bb/data_smart.py",
line 460, in DataSmart.expandWithRefs(s='${@bb.fetch2.get_srcrev(d)}',
varname='SRCPV'):
try:
>s =
__expand_python_regexp__.sub(varparse.python_sub, s)
except SyntaxError as e:
File
"/scratch/builds/arago-master-wip/build/sources/bitbake/lib/bb/data_smart.py",
line 150, in VariableParse.python_sub(match=27), match='${@bb.fetch2.get_srcrev(d)}'>):
self.contains[k].update(parser.contains[k])
>value = utils.better_eval(codeobj,
DataContext(self.d), {'d' : self.d})
return str(value)
File
"/scratch/builds/arago-master-wip/build/sources/bitbake/lib/bb/utils.py",
line 434, in better_eval(source= at 0x7f4978634c90,
file "Var ", line 1>, locals={'d': object at 0x7f49787dc970>}, extraglobals={'d': object at 0x7f49787dc970>}):
ctx[g] = extraglobals[g]
>return eval(source, ctx, locals)
File "Var ", line 1, in
File
"/scratch/builds/arago-master-wip/build/sources/bitbake/lib/bb/fetch2/__init__.py",
line 784, in get_srcrev(d=0x7f49787dc970>, method_name='sortable_revision'):
if not scms:
>raise FetchError("SRCREV was used yet no valid SCM was
found in SRC_URI")
bb.data_smart.ExpansionError: Failure expanding variable SRCPV,
expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception
FetchError: Fetcher failure: SRCREV was used yet no valid SCM was found
in SRC_URI
The variable dependency chain for the failure is: SRCPV ->
UBOOT_LOCALVERSION -> do_compile
ERROR: Parsing halted due to errors, see error messages above
Any reference to SRCPV in those variables fails due to SRC_URI being
cleared by the patch.
--
Ryan Eatmonreat...@ti.com
-
Texas Instruments, Inc. - LCPD - MGTS
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181726):
https://lists.openembedded.org/g/openembedded-core/message/181726
Mute This Topic: https://lists.openembedded.org/mt/99139791/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] lttng-tools: Disable test which breaks with gcc 13
Rather than show warnings, disable a test which breaks with gcc 13 until it
can be fixed. Waiting on an account upstream to report but they are aware now.
Signed-off-by: Richard Purdie
---
meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb
b/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb
index 58c0378d66f..d3494449c85 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb
@@ -181,6 +181,9 @@ do_install_ptest () {
;;
esac
done
+
+# Test is broken with gcc 13, disable
+sed -e 's#"x86"#"x86disabled"#' -e 's#NUM_TESTS=11#NUM_TESTS=12#' -i
${D}${PTEST_PATH}/tests/regression/kernel/test_callstack
}
INHIBIT_PACKAGE_STRIP_FILES = "\
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181725):
https://lists.openembedded.org/g/openembedded-core/message/181725
Mute This Topic: https://lists.openembedded.org/mt/99139777/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] classes: Add new packagefeed class.
I see your point. Please drop this patch set from consideration. Taking a step back, my intention was to make it so that a "packagefeed" was a simple buildable target the way an image or packagegroup is. That is, I'd like it to be possible to just "bitbake packagefeed" and get all the packages and indexes. I think the non-deterministic problem exists today too since someone could run "bitbake packagegroup package-index" and nothing is stopping them from doing that other than noticing it doesn't work. I can see a couple of potential options: 1. Come up with a way to ensure that the do_package_index task is only run once per bitbake invocation after all other packaging tasks. As far as I can tell, there's not a way to enforce this with my current design. It also doesn't address the problem of packages already in the deploy directories. 2. Add more scaffolding to create a packagefeed class with potentially its own deploy directory and which only includes index files for its dependencies. That seems like a lot more effort than my change but might address the concerns more completely. Any feedback or thoughts on those ideas? Thanks, Charlie On Thu, May 25, 2023 at 11:11 AM, Alexander Kanavin wrote: > > It would not be the same thing done twice. It is not clear how the > rpm/dep/opkg-specific tooling would behave if there's two or more > instances of it indexing the files at the same time, or one starts > earlier than the other, and the later ones see incomplete index files > or half-deployed packages etc. It's well possible such situations are > not handled well, and you still need to somehow ensure the indexing > indeed runs once, and only after everything else. How would you ensure > that? I worry this change opens the door to misuse, and cryptic, hard > to reproduce or diagnose errors. > > The output would also be non-deterministic: it would contain > everything from the packagegroup and an unknown amount of additional > packages, depending on what else happened to be in deploy directory at > the time. > > Alex > > On Thu, 25 May 2023 at 17:55, Charlie Johnston > wrote: > >> >> Yes, having two recipes that inherit this running at the same time would >> potentially write the same index files. I'm not sure that's actually a >> problem other than the same thing being done twice. >> As long as at least one of the package index steps runs after all packages >> have been written, the index files will be up-to-date. Since I've made the >> task recursively depend on the tasks that create packages, I think it's >> fine. >> >> That being said, if there's a way to both add it to recipes and ensure >> that the task only runs once per bitbake command I would be open to moving >> towards that. Is there anything like that? >> >> Thanks, >> Charlie >> >> On Thu, May 25, 2023 at 03:47 AM, Alexander Kanavin wrote: >> >> What happens if several recipes inherit this class, and are processed >> at the same time? Won't they step on each other, writing the same >> index files into the deploy directory? I think package-index recipe is >> deliberately standalone for that reason: you have to build it in a >> separate step. >> >> Alex >> >> On Wed, 24 May 2023 at 23:55, Charlie Johnston >> wrote: >> >> >> Added a new packagefeed class that contains both a >> packagegroup and the package index builds. This allows a >> one-line bitbake for a packagegroup that defines a feed >> without explicitly needing to run the package-index recipe. >> >> Signed-off-by: Charlie Johnston >> --- >> meta/classes/packagefeed.bbclass | 5 + >> 1 file changed, 5 insertions(+) >> create mode 100644 meta/classes/packagefeed.bbclass >> >> diff --git a/meta/classes/packagefeed.bbclass >> b/meta/classes/packagefeed.bbclass >> new file mode 100644 >> index 00..b83ac54f21 >> --- /dev/null >> +++ b/meta/classes/packagefeed.bbclass >> @@ -0,0 +1,5 @@ >> +# >> +# Special case of packagegroup that includes package index builds. >> +# >> + >> +inherit packagegroup package_index >> -- >> 2.30.2 >> >> >> >> >> >> > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181724): https://lists.openembedded.org/g/openembedded-core/message/181724 Mute This Topic: https://lists.openembedded.org/mt/9911/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] fix hard-coded .so file extension
On 25 May 2023, at 14:22, Etienne Cordonnier via lists.openembedded.org
wrote:
>
> From: Etienne Cordonnier
>
> E.g. Darwin uses .dylib instead.
>
> Signed-off-by: Etienne Cordonnier
> ---
> meta/recipes-core/libxcrypt/libxcrypt.inc | 8
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc
> b/meta/recipes-core/libxcrypt/libxcrypt.inc
> index 61b0381076..7b484d86bc 100644
> --- a/meta/recipes-core/libxcrypt/libxcrypt.inc
> +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
> @@ -17,10 +17,10 @@ SRC_URI += "file://fix_cflags_handling.patch"
>
> PROVIDES = "virtual/crypt"
>
> -FILES:${PN} = "${libdir}/libcrypt*.so.* \
> - ${libdir}/libcrypt-*.so \
> - ${libdir}/libowcrypt*.so.* \
> - ${libdir}/libowcrypt-*.so \
> +FILES:${PN} = "${libdir}/libcrypt*${SOLIBS} \
> + ${libdir}/libcrypt-*${SOLIBSDEV} \
> + ${libdir}/libowcrypt*${SOLIBS} \
> + ${libdir}/libowcrypt-*${SOLIBSDEV} \
> “
Is this actually right though? The current packaging is:
libxcrypt:
/usr/lib/libcrypt.so.2
/usr/lib/libcrypt.so.2.0.0
libxcrypt-dev:
/usr/include/crypt.h
/usr/lib/libcrypt.so
/usr/lib/pkgconfig/libcrypt.pc
/usr/lib/pkgconfig/libxcrypt.pc
Which is what I’d expect. I suspect removing this FILES statement would result
in the same packaging and work on Darwin too.
Ross
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181723):
https://lists.openembedded.org/g/openembedded-core/message/181723
Mute This Topic: https://lists.openembedded.org/mt/99131713/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][Patch v4 1/4] libtraceevent: import from meta-openembedded
On Thu, May 25, 2023 at 12:14 AM Max Krummenacher wrote:
>
> Hi Khem
>
> On Thursday, May 25, 2023, Khem Raj wrote:
> > Hi Max
> >
> > I am seeing
> >
> > The file /usr/lib/traceevent/plugins/plugin_cfg80211.so is installed
> > by both perf and libtraceevent, aborting
> >
> > When building sdk with both libtraceevent and perf added to image.
>
>
> I didn't test anything SDK with this patchset. Sorry.
>
> I'm currently on vacation and not able to do real OE work.
>
> I guess the quickest way out would be to remove in perf.bb libtraceevent from
> the enabled packageconfigs.
>
> I expect perf from kernels before 6.4 to work as before the patchset and perf
> at 6.4 to not fail to build, albeit without traceevent support.
>
> Does this sound like a plan?
I think it might make sense to package them in
/usr/lib/${BPN}/plugins/
That makes space for both.
> Max
> >
> > On Thu, May 11, 2023 at 4:22 PM Max Krummenacher
> > wrote:
> >>
> >> From: Max Krummenacher
> >>
> >> Import from meta-openembedded at commit d250a0dc0 ("libtraceevent:
> >> upgrade 1.7.1 -> 1.7.2").
> >> Starting with kernel 6.4 libtraceevent is a dependency of perf. While
> >> one can still build perf without it by opting out one would loose its
> >> functionality compared with building perf from kernels before 6.4
> >>
> >> Signed-off-by: Max Krummenacher
> >> ---
> >> meta/conf/distro/include/maintainers.inc | 1 +
> >> ...not-preserve-ownership-in-cp-command.patch | 40 +++
> >> .../libtraceevent/libtraceevent_1.7.2.bb | 25
> >> 3 files changed, 66 insertions(+)
> >> create mode 100644
> >> meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
> >> create mode 100644
> >> meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb
> >>
> >> diff --git a/meta/conf/distro/include/maintainers.inc
> >> b/meta/conf/distro/include/maintainers.inc
> >> index ec7ea90d16..3071671850 100644
> >> --- a/meta/conf/distro/include/maintainers.inc
> >> +++ b/meta/conf/distro/include/maintainers.inc
> >> @@ -402,6 +402,7 @@ RECIPE_MAINTAINER:pn-libtirpc = "Anuj Mittal
> >> "
> >> RECIPE_MAINTAINER:pn-libtool = "Robert Yang "
> >> RECIPE_MAINTAINER:pn-libtool-cross = "Robert Yang
> >> "
> >> RECIPE_MAINTAINER:pn-libtool-native = "Robert Yang
> >> "
> >> +RECIPE_MAINTAINER:pn-libtraceevent = "Bruce Ashfield
> >> "
> >> RECIPE_MAINTAINER:pn-libtry-tiny-perl = "Tim Orling
> >> "
> >> RECIPE_MAINTAINER:pn-libucontext = "Khem Raj "
> >> RECIPE_MAINTAINER:pn-libunistring = "Anuj Mittal "
> >> diff --git
> >> a/meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
> >>
> >> b/meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
> >> new file mode 100644
> >> index 00..5e88048817
> >> --- /dev/null
> >> +++
> >> b/meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
> >> @@ -0,0 +1,40 @@
> >> +From ed0a31000305d937abe47c44d705b5b52bb36f79 Mon Sep 17 00:00:00 2001
> >> +From: Khem Raj
> >> +Date: Thu, 22 Dec 2022 18:32:17 -0800
> >> +Subject: [PATCH] makefile: Do not preserve ownership in cp command
> >> +
> >> +Fixes
> >> +
> >> +ERROR: libtraceevent-1.7.0-r0 do_package_qa: QA Issue: libtraceevent:
> >> /usr/lib/libtraceevent.a is owned by uid 1000, which is the same as the
> >> user running bitbake. This may be due to host contamination
> >> [host-user-contaminated]
> >> +
> >> +Upstream-Status: Pending
> >> +Signed-off-by: Khem Raj
> >> +---
> >> + Makefile | 4 ++--
> >> + 1 file changed, 2 insertions(+), 2 deletions(-)
> >> +
> >> +diff --git a/Makefile b/Makefile
> >> +index 965ff47..0e782cb 100644
> >> +--- a/Makefile
> >> b/Makefile
> >> +@@ -287,7 +287,7 @@ $(BUILD_PREFIX): force
> >> + $(Q)$(call build_prefix,$(prefix))
> >> +
> >> + define do_make_pkgconfig_file
> >> +- cp -f ${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE};\
> >> ++ install -m 0644 ${PKG_CONFIG_SOURCE_FILE}.template
> >> ${PKG_CONFIG_FILE}; \
> >> + sed -i "s|INSTALL_PREFIX|${1}|g" ${PKG_CONFIG_FILE};\
> >> + sed -i "s|LIB_VERSION|${EVENT_PARSE_VERSION}|g"
> >> ${PKG_CONFIG_FILE}; \
> >> + sed -i "s|LIB_DIR|${libdir_relative}|g" ${PKG_CONFIG_FILE}; \
> >> +@@ -335,7 +335,7 @@ install: install_libs install_plugins
> >> +
> >> + install_libs: libs install_headers install_pkgconfig
> >> + $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)); \
> >> +- cp -fpR $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ)
> >> ++ cp --no-preserve=ownership --recursive $(LIB_INSTALL)
> >> $(DESTDIR)$(libdir_SQ)
> >> + $(Q)$(call install_ld_config)
> >> +
> >> + install_pkgconfig: $(PKG_CONFIG_FILE)
> >> +--
> >> +2.39.0
> >> +
> >> diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.2.bb
> >>
[OE-core] rust reproducibility - QA warnings in Yocto
Hello Richard, On the latest rust-1.69.0 sources by adding the '--remap-path-prefix' command (as in attached remap-path.patch file) the generated binaries from different path are identical. So, I've taken the same solution and applied on Yocto but it introduced many more binary differences with a lot of QA Warnings (attached in Warnings.txt). Do you have any hint on why this difference in Yocto environment and any pointers to fix... Thanks, Sundeep K. remap-path.patch Description: remap-path.patch rust-bb.patch Description: rust-bb.patch WARNING: rust-1.69.0-r0 do_package_qa: QA Issue: File /usr/lib/rustlib/x86_64-poky-linux-gnu/lib/.debug/libstd-f87b8130ceb76c8f.so in package rust-dbg contains reference to TMPDIR File /usr/lib/rustlib/x86_64-poky-linux-gnu/lib/.debug/libtest-f170723db3df43ca.so in package rust-dbg contains reference to TMPDIR File /usr/lib/.debug/librustc_macros-f86291dc1fbdaa54.so in package rust-dbg contains reference to TMPDIR File /usr/lib/.debug/libstd-f87b8130ceb76c8f.so in package rust-dbg contains reference to TMPDIR File /usr/lib/.debug/libderive_more-d77c907cca18b532.so in package rust-dbg contains reference to TMPDIR File /usr/lib/.debug/libtest-f170723db3df43ca.so in package rust-dbg contains reference to TMPDIR File /usr/lib/.debug/libserde_derive-ca5d504a7ae8f1e8.so in package rust-dbg contains reference to TMPDIR [buildpaths] WARNING: rust-1.69.0-r0 do_package_qa: QA Issue: File /usr/bin/rustfmt in package rust-tools-rustfmt contains reference to TMPDIR [buildpaths] WARNING: rust-1.69.0-r0 do_package_qa: QA Issue: File /usr/bin/cargo-clippy in package rust-tools-clippy contains reference to TMPDIR File /usr/bin/clippy-driver in package rust-tools-clippy contains reference to TMPDIR [buildpaths] WARNING: rust-1.69.0-r0 do_package_qa: QA Issue: File /usr/bin/cargo-fmt in package rust contains reference to TMPDIR File /usr/bin/rustdoc in package rust contains reference to TMPDIR File /usr/libexec/rust-analyzer-proc-macro-srv in package rust contains reference to TMPDIR File /usr/lib/librustc_driver-8a0d5425d57fca06.so in package rust contains reference to TMPDIR File /usr/lib/libzerofrom_derive-06e8c5ecfbb9c94a.so in package rust contains reference to TMPDIR File /usr/lib/librustc_macros-f86291dc1fbdaa54.so in package rust contains reference to TMPDIR File /usr/lib/libunic_langid_macros_impl-5b2237a479de72ae.so in package rust contains reference to TMPDIR File /usr/lib/libicu_provider_macros-96bfc1f9dacc37e5.so in package rust contains reference to TMPDIR File /usr/lib/libzerovec_derive-1d602abffb2f1b37.so in package rust contains reference to TMPDIR File /usr/lib/libcstr-e792e95645fa0214.so in package rust contains reference to TMPDIR File /usr/lib/libchalk_derive-88262002a513877f.so in package rust contains reference to TMPDIR File /usr/lib/libstd-f87b8130ceb76c8f.so in package rust contains reference to TMPDIR File /usr/lib/libdisplaydoc-0ea2e1d67387a6f4.so in package rust contains reference to TMPDIR File /usr/lib/libthiserror_impl-f0c551f85c33aff1.so in package rust contains reference to TMPDIR File /usr/lib/libproc_macro_hack-350a8692c28d971d.so in package rust contains reference to TMPDIR File /usr/lib/libderive_more-d77c907cca18b532.so in package rust contains reference to TMPDIR File /usr/lib/libtest-f170723db3df43ca.so in package rust contains reference to TMPDIR File /usr/lib/libyoke_derive-748abcfe36901b00.so in package rust contains reference to TMPDIR File /usr/lib/libserde_derive-ca5d504a7ae8f1e8.so in package rust contains reference to TMPDIR File /usr/lib/libtracing_attributes-8dd673f56f0cb565.so in package rust contains reference to TMPDIR File /usr/lib/rustlib/x86_64-poky-linux-gnu/lib/libcfg_if-0cc580b157fedf68.rlib in package rust contains reference to TMPDIR File /usr/lib/rustlib/x86_64-poky-linux-gnu/lib/libprofiler_builtins-f58c3ad46ae05f6c.rlib in package rust contains reference to TMPDIR File /usr/lib/rustlib/x86_64-poky-linux-gnu/lib/libcompiler_builtins-606ef814824aca7c.rlib in package rust contains reference to TMPDIR File /usr/lib/rustlib/x86_64-poky-linux-gnu/lib/liblibc-e62c3055e362bc74.rlib in package rust contains reference to TMPDIR File /usr/lib/rustlib/x86_64-poky-linux-gnu/lib/librustc_std_workspace_std-ef8c7b35b3f3512b.rlib in package rust contains reference to TMPDIR 3419,199% -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181721): https://lists.openembedded.org/g/openembedded-core/message/181721 Mute This Topic: https://lists.openembedded.org/mt/99133326/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe:
Re: [OE-core][PATCH] busybox: 1.36.0 -> 1.36.1
Hello,
On the autobuilders, this causes:
WARNING: busybox-1.36.1-r0 do_package_qa: QA Issue: busybox: ELF binary
/bin/busybox.nosuid has relocations in .text [textrel]
https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/7460/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/103/builds/6057/steps/11/logs/stdio
On 25/05/2023 10:43:28+0200, Andrej Valek via lists.openembedded.org wrote:
> - regresion has been fixed, re-enable SHA*HWACCEL on x86
> - 8d198665a0d09c3f22f3a12234809f46b1c2b04a
>
> Signed-off-by: Andrej Valek
> ---
> .../{busybox-inittab_1.36.0.bb => busybox-inittab_1.36.1.bb} | 0
> meta/recipes-core/busybox/busybox/sha_accel.cfg | 2 --
> .../busybox/{busybox_1.36.0.bb => busybox_1.36.1.bb} | 4 +---
> 3 files changed, 1 insertion(+), 5 deletions(-)
> rename meta/recipes-core/busybox/{busybox-inittab_1.36.0.bb =>
> busybox-inittab_1.36.1.bb} (100%)
> delete mode 100644 meta/recipes-core/busybox/busybox/sha_accel.cfg
> rename meta/recipes-core/busybox/{busybox_1.36.0.bb => busybox_1.36.1.bb}
> (91%)
>
> diff --git a/meta/recipes-core/busybox/busybox-inittab_1.36.0.bb
> b/meta/recipes-core/busybox/busybox-inittab_1.36.1.bb
> similarity index 100%
> rename from meta/recipes-core/busybox/busybox-inittab_1.36.0.bb
> rename to meta/recipes-core/busybox/busybox-inittab_1.36.1.bb
> diff --git a/meta/recipes-core/busybox/busybox/sha_accel.cfg
> b/meta/recipes-core/busybox/busybox/sha_accel.cfg
> deleted file mode 100644
> index 8900305a11..00
> --- a/meta/recipes-core/busybox/busybox/sha_accel.cfg
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -# CONFIG_SHA256_HWACCEL is not set
> -# CONFIG_SHA1_HWACCEL is not set
> diff --git a/meta/recipes-core/busybox/busybox_1.36.0.bb
> b/meta/recipes-core/busybox/busybox_1.36.1.bb
> similarity index 91%
> rename from meta/recipes-core/busybox/busybox_1.36.0.bb
> rename to meta/recipes-core/busybox/busybox_1.36.1.bb
> index 8014a5c7bf..b34d60cded 100644
> --- a/meta/recipes-core/busybox/busybox_1.36.0.bb
> +++ b/meta/recipes-core/busybox/busybox_1.36.1.bb
> @@ -51,6 +51,4 @@ SRC_URI =
> "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
>
> file://0002-nslookup-sanitize-all-printed-strings-with-printable.patch \
> "
> SRC_URI:append:libc-musl = " file://musl.cfg "
> -# TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
> -SRC_URI:append:x86 = " file://sha_accel.cfg"
> -SRC_URI[tarball.sha256sum] =
> "542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5"
> +SRC_URI[tarball.sha256sum] =
> "b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314"
> --
> 2.40.1
>
>
>
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181720):
https://lists.openembedded.org/g/openembedded-core/message/181720
Mute This Topic: https://lists.openembedded.org/mt/99126049/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] classes: Add new packagefeed class.
It would not be the same thing done twice. It is not clear how the rpm/dep/opkg-specific tooling would behave if there's two or more instances of it indexing the files at the same time, or one starts earlier than the other, and the later ones see incomplete index files or half-deployed packages etc. It's well possible such situations are not handled well, and you still need to somehow ensure the indexing indeed runs once, and only after everything else. How would you ensure that? I worry this change opens the door to misuse, and cryptic, hard to reproduce or diagnose errors. The output would also be non-deterministic: it would contain everything from the packagegroup and an unknown amount of additional packages, depending on what else happened to be in deploy directory at the time. Alex On Thu, 25 May 2023 at 17:55, Charlie Johnston wrote: > > Yes, having two recipes that inherit this running at the same time would > potentially write the same index files. I'm not sure that's actually a > problem other than the same thing being done twice. > As long as at least one of the package index steps runs after all packages > have been written, the index files will be up-to-date. Since I've made the > task recursively depend on the tasks that create packages, I think it's fine. > > That being said, if there's a way to both add it to recipes and ensure that > the task only runs once per bitbake command I would be open to moving towards > that. Is there anything like that? > > Thanks, > Charlie > > On Thu, May 25, 2023 at 03:47 AM, Alexander Kanavin wrote: > > What happens if several recipes inherit this class, and are processed > at the same time? Won't they step on each other, writing the same > index files into the deploy directory? I think package-index recipe is > deliberately standalone for that reason: you have to build it in a > separate step. > > Alex > > On Wed, 24 May 2023 at 23:55, Charlie Johnston > wrote: > > > Added a new packagefeed class that contains both a > packagegroup and the package index builds. This allows a > one-line bitbake for a packagegroup that defines a feed > without explicitly needing to run the package-index recipe. > > Signed-off-by: Charlie Johnston > --- > meta/classes/packagefeed.bbclass | 5 + > 1 file changed, 5 insertions(+) > create mode 100644 meta/classes/packagefeed.bbclass > > diff --git a/meta/classes/packagefeed.bbclass > b/meta/classes/packagefeed.bbclass > new file mode 100644 > index 00..b83ac54f21 > --- /dev/null > +++ b/meta/classes/packagefeed.bbclass > @@ -0,0 +1,5 @@ > +# > +# Special case of packagegroup that includes package index builds. > +# > + > +inherit packagegroup package_index > -- > 2.30.2 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181719): https://lists.openembedded.org/g/openembedded-core/message/181719 Mute This Topic: https://lists.openembedded.org/mt/9911/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 3/3] qemurunner: add boot logs to do_testimage task logs in real time
Hi Richard,
Could you accept this with some conditional flag in testimage.bbclass maybe?
I really feel the need for this when debugging issues with boot sequence.
Cheers,
-Mikko
On Wed, May 10, 2023 at 03:59:35PM +0300, Mikko Rapeli wrote:
> Complex boot sequences take a lot of time to reach serial console login.
> In our case boot involves multiple bootloaders like u-boot and grub,
> then hypervisors like xen, then initramfs images which do things like
> validating secure boot and encrypting the main rootfs. All these happen
> before main rootfs serial console login prompt is reached and thus many
> things can go wrong, including race conditions, hangs and deadlocks, and
> thus logging the details is important for development.
>
> This change adds the qemu serial console logs to do_testimage task logs while
> they are being read out. The logs are not added to bitbake output. This
> enables debugging and tracing the do_testimage via task log file while the
> boot
> and tests are running.
>
> Signed-off-by: Mikko Rapeli
> ---
> meta/lib/oeqa/utils/qemurunner.py | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/lib/oeqa/utils/qemurunner.py
> b/meta/lib/oeqa/utils/qemurunner.py
> index c06268f5bc..7f520d47c3 100644
> --- a/meta/lib/oeqa/utils/qemurunner.py
> +++ b/meta/lib/oeqa/utils/qemurunner.py
> @@ -480,6 +480,7 @@ class QemuRunner:
> self.logger.error('Invalid file type: %s\n%s' %
> (file))
> read = b''
>
> +self.logger.debug2('Partial boot log:\n%s' %
> (read.decode('utf-8', errors='ignore')))
> data = data + read
> if data:
> bootlog += data
> --
> 2.34.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181718):
https://lists.openembedded.org/g/openembedded-core/message/181718
Mute This Topic: https://lists.openembedded.org/mt/98805041/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/2] package-index: Convert package-index into a bbclass.
Thanks for the feedback. Are there concerns on this specific patch you have
other than the commit message?
Thanks,
Charlie
On Wed, May 24, 2023 at 06:26 PM, Richard Purdie wrote:
>
> On Wed, 2023-05-24 at 16:55 -0500, Charlie Johnston wrote:
>
>> Currently, package-index is a bit strange because it's a
>> bitbake recipe that implements a task.
>
> That isn't strange at all, it is perfectly fine for a recipe to add a
> task.
>
>
>> That task is
>> already used elsewhere and could be leveraged further
>> for BUILD_IMAGES_FROM_FEEDS.
>>
>> This change moves the logic for do_package_index into its
>> own bbclass and has package-index.bb inherit from there.
>
> The description here does not match what this patch actually does. The
> patch changes the behaviour of the code considerably and this isn't
> even mentioned.
>
>
>>
>> Signed-off-by: Charlie Johnston
>> ---
>> meta/classes/package_index.bbclass | 21 +
>> meta/recipes-core/meta/package-index.bb | 10 +-
>> 2 files changed, 22 insertions(+), 9 deletions(-)
>> create mode 100644 meta/classes/package_index.bbclass
>>
>> diff --git a/meta/classes/package_index.bbclass
>> b/meta/classes/package_index.bbclass
>> new file mode 100644
>> index 00..fdd10f6dd0
>> --- /dev/null
>> +++ b/meta/classes/package_index.bbclass
>> @@ -0,0 +1,21 @@
>> +#
>> +# Creates package indices for the IMAGE_PKGTYPE
>> +#
>> +
>> +do_package_index[nostamp] = "1"
>> +do_package_index[depends] += "${PACKAGEINDEXDEPS}"
>> +do_package_index[recrdeptask] += 'do_package_write_deb'
>> +do_package_index[recrdeptask] += 'do_package_write_ipk'
>> +do_package_index[recrdeptask] += 'do_package_write_rpm'
>
> Adding recrdeptask isn't mentioned in the commit message. "package-
> index" deliberately just indexes what is in the packages directory with
> no dependencies. This is therefore a significant change in behaviour.
>
>
>> +
>> +python do_package_index() {
>> + from oe.rootfs import generate_index_files
>> + generate_index_files(d)
>> +}
>> +
>> +# Package indexes are required for the dummy SDK architectures
>> +# to support scenarios where SDK images are built from feeds.
>> +PACKAGE_ARCHS:append:task-package-index = " sdk-provides-dummy-target"
>> +SDK_PACKAGE_ARCHS:append:task-package-index = "
>> sdk-provides-dummy-${SDKPKGSUFFIX}"
>
> This is also a change in behaviour, again unmentioned.
>
> Cheers,
>
> Richard
>
>
>> +
>> +addtask do_package_index before do_build
>> diff --git a/meta/recipes-core/meta/package-index.bb
>> b/meta/recipes-core/meta/package-index.bb
>> index 98c5bcb372..3fc18865b7 100644
>> --- a/meta/recipes-core/meta/package-index.bb
>> +++ b/meta/recipes-core/meta/package-index.bb
>> @@ -4,7 +4,7 @@ LICENSE = "MIT"
>> INHIBIT_DEFAULT_DEPS = "1"
>> PACKAGES = ""
>>
>> -inherit nopackages
>> +inherit nopackages package_index
>>
>> deltask do_fetch
>> deltask do_unpack
>> @@ -15,12 +15,4 @@ deltask do_install
>> deltask do_populate_lic
>> deltask do_populate_sysroot
>>
>> -do_package_index[nostamp] = "1"
>> -do_package_index[depends] += "${PACKAGEINDEXDEPS}"
>> -
>> -python do_package_index() {
>> - from oe.rootfs import generate_index_files
>> - generate_index_files(d)
>> -}
>> -addtask do_package_index before do_build
>> EXCLUDE_FROM_WORLD = "1"
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181717):
https://lists.openembedded.org/g/openembedded-core/message/181717
Mute This Topic: https://lists.openembedded.org/mt/99118887/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] classes: Add new packagefeed class.
I did not plan to add more currently. I liked this as it makes it clear the intention of a specific packagegroup to represent a feed. I don't mind dropping the class and just having our "packagefeed" packagegroups add the extra inherit. For my own knowledge, what makes a class worthwhile? Is there an expectation that a bbclass has a certain amount of functionality to it? Thanks, Charlie On Thu, May 25, 2023 at 05:52 AM, Richard Purdie wrote: > > On Wed, 2023-05-24 at 16:55 -0500, Charlie Johnston wrote: > >> Added a new packagefeed class that contains both a >> packagegroup and the package index builds. This allows a >> one-line bitbake for a packagegroup that defines a feed >> without explicitly needing to run the package-index recipe. >> >> Signed-off-by: Charlie Johnston >> --- >> meta/classes/packagefeed.bbclass | 5 + >> 1 file changed, 5 insertions(+) >> create mode 100644 meta/classes/packagefeed.bbclass >> >> diff --git a/meta/classes/packagefeed.bbclass >> b/meta/classes/packagefeed.bbclass >> new file mode 100644 >> index 00..b83ac54f21 >> --- /dev/null >> +++ b/meta/classes/packagefeed.bbclass >> @@ -0,0 +1,5 @@ >> +# >> +# Special case of packagegroup that includes package index builds. >> +# >> + >> +inherit packagegroup package_index > > A new class with two inherits in it doesn't really seem worthwhile to > me? Was there more you planned to add here? > > Cheers, > > Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181716): https://lists.openembedded.org/g/openembedded-core/message/181716 Mute This Topic: https://lists.openembedded.org/mt/9911/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 2/2] classes: Add new packagefeed class.
Yes, having two recipes that inherit this running at the same time would potentially write the same index files. I'm not sure that's actually a problem other than the same thing being done twice. As long as at least one of the package index steps runs after all packages have been written, the index files will be up-to-date. Since I've made the task recursively depend on the tasks that create packages, I think it's fine. That being said, if there's a way to both add it to recipes and ensure that the task only runs once per bitbake command I would be open to moving towards that. Is there anything like that? Thanks, Charlie On Thu, May 25, 2023 at 03:47 AM, Alexander Kanavin wrote: > > What happens if several recipes inherit this class, and are processed > at the same time? Won't they step on each other, writing the same > index files into the deploy directory? I think package-index recipe is > deliberately standalone for that reason: you have to build it in a > separate step. > > Alex > > On Wed, 24 May 2023 at 23:55, Charlie Johnston > wrote: > >> >> Added a new packagefeed class that contains both a >> packagegroup and the package index builds. This allows a >> one-line bitbake for a packagegroup that defines a feed >> without explicitly needing to run the package-index recipe. >> >> Signed-off-by: Charlie Johnston >> --- >> meta/classes/packagefeed.bbclass | 5 + >> 1 file changed, 5 insertions(+) >> create mode 100644 meta/classes/packagefeed.bbclass >> >> diff --git a/meta/classes/packagefeed.bbclass >> b/meta/classes/packagefeed.bbclass >> new file mode 100644 >> index 00..b83ac54f21 >> --- /dev/null >> +++ b/meta/classes/packagefeed.bbclass >> @@ -0,0 +1,5 @@ >> +# >> +# Special case of packagegroup that includes package index builds. >> +# >> + >> +inherit packagegroup package_index >> -- >> 2.30.2 >> >> >> >> > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#181715): https://lists.openembedded.org/g/openembedded-core/message/181715 Mute This Topic: https://lists.openembedded.org/mt/9911/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] psplash: enable fullscreen and disable startup-msg
From: Michael Opdenacker
by setting PACKAGECONFIG entries
- fullscreen wasn't set by default but caused
issues displaying the image (image translated upwards,
white stripe at the bottom)
- startup-msg was set by default but didn't seem
to work, showing a white stripe in the lower half
of the display.
- progress-bar was already enabled, but it can
now be disabled through PACKAGECONFIG.
Signed-off-by: Michael Opdenacker
Suggested-by: Alexander Kanavin
CC: Tim Orling
CC: Khem Raj
---
meta/recipes-core/psplash/psplash_git.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/psplash/psplash_git.bb
b/meta/recipes-core/psplash/psplash_git.bb
index aecbd2ce46..e590eb978f 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -65,9 +65,12 @@ S = "${WORKDIR}/git"
inherit autotools pkgconfig update-rc.d update-alternatives systemd
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}
progress-bar fullscreen"
PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
+PACKAGECONFIG[fullscreen] = "--enable-img-fullscreen"
+PACKAGECONFIG[startup-msg] = ",--disable-startup-msg"
+PACKAGECONFIG[progress-bar] = ",--disable-progress-bar"
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181714):
https://lists.openembedded.org/g/openembedded-core/message/181714
Mute This Topic: https://lists.openembedded.org/mt/99131878/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [mickledore][PATCH] go: update 1.20.1 -> 1.20.4
I'm getting the following warning during autobuilder testing: WARNING: go-1.20.4-r0 do_package_qa: QA Issue: go: ELF binary /usr/lib/go/bin/go has relocations in .text https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/7164/steps/12/logs/stdio Steve On Tue, May 23, 2023 at 5:11 PM Sakib Sajal via lists.openembedded.org wrote: > > Update go to latest 1.20.x release. > > Removed patches contained in new version: > - 0010-cmd-compile-re-compile-instantiated-generic-methods-.patch > - CVE-2023-24532.patch > - CVE-2023-24537.patch > > go.git$ git log --oneline go1.20.1..go1.20.4 > 324c3ace2d (tag: go1.20.4) [release-branch.go1.20] go1.20.4 > 337dd75343 [release-branch.go1.20] html/template: emit filterFailsafe for > empty unquoted attr value > 4a28cad666 [release-branch.go1.20] html/template: handle all JS whitespace > characters > 090590fdcc [release-branch.go1.20] html/template: disallow angle brackets in > CSS values > 25b4f40625 [release-branch.go1.20] Revert "net/http: FileServer method check > + minimal OPTIONS implementation" > 484535e67b cmd/compile/internal/importer,go/internal/gcimporter: use the 'go' > command from build.Default.GOROOT in lookupGorootExport > 813a811d33 [release-branch.go1.20] crypto/tls: fix PSK binder calculation > ee42d468f5 [release-branch.go1.20] cmd/compile: fix reproducible build of > aliased generic types > 446493f5b8 [release-branch.go1.20] cmd/compile: remove broken LEA > "optimization" > 0684cecad5 [release-branch.go1.20] cmd/compile: use correct type for > byteswaps on multi-byte stores > ecf7e00db8 [release-branch.go1.20] syscall: restore original NOFILE rlimit in > child process > 1dbbac7d79 [release-branch.go1.20] cmd/compile: fix ir.StaticValue for ORANGE > 99001c460e [release-branch.go1.20] cmd/compile: don't set range expr > key/value type if already set > dcc9bdf380 [release-branch.go1.20] crypto/subtle: don't cast to *uintptr when > word size is 0 > 5c7c20e262 [release-branch.go1.20] html/template,mime/multipart: document new > GODEBUG settings > 7c47a6b157 (tag: go1.20.3) [release-branch.go1.20] go1.20.3 > 20374d1d75 [release-branch.go1.20] html/template: disallow actions in JS > template literals > e7c4b07ecf [release-branch.go1.20] go/scanner: reject large line and column > numbers in //line directives > bf8c7c575c [release-branch.go1.20] mime/multipart: limit parsed mime message > sizes > ec18f62df5 [release-branch.go1.20] net/textproto, mime/multipart: improve > accounting of non-file data > ea6b5a64dd [release-branch.go1.20] mime/multipart: avoid excessive copy > buffer allocations in ReadForm > 3991f6c41c [release-branch.go1.20] net/textproto: avoid overpredicting the > number of MIME header keys > 9a164d1c41 [release-branch.go1.20] cmd/internal/obj/ppc64: fix incorrect base > reg causing segv > 8dce4ca8df [release-branch.go1.20] cmd/compile: don't assume pointer of a > slice is non-nil > 94c02a3cc4 [release-branch.go1.20] cmd/compile: re-compile instantiated > generic methods in linkshared mode > 65fa8a6931 [release-branch.go1.20] time: fix timezone lookup logic for > non-DST zones > b52a6963bf [release-branch.go1.20] cmd/link/internal/arm: fix off-by-1 in > trampoline reachability computation > 3ff6dbdf5b [release-branch.go1.20] cmd/go,cmd/link: prefer external linking > when strange cgo flags seen > fa42da156a [release-branch.go1.20] cmd/link: use label symbols for Duff's > devices on darwin/arm64 > 5c7cc468a8 [release-branch.go1.20] Revert "cmd/compile: enable address > folding for global symbols of shared library" > b852f39511 [release-branch.go1.20] cmd/go: avoid running slow tests on > non-longtest builders > 4df95d5145 [release-branch.go1.20] internal/testpty: fix error handling > aee9a19c55 (tag: go1.20.2) [release-branch.go1.20] go1.20.2 > 26eeaec89c [release-branch.go1.20] cmd/compile: relax overly strict assertion > 9629fa1874 [release-branch.go1.20] crypto/x509: fix broken tests > 3243f93747 [release-branch.go1.20] crypto/x509: fix system root tests + > darwin intermediate handling > d2d0ee2049 [release-branch.go1.20] syscall: fix invalid unsafe.Pointer > conversion on Windows > 230765a11a [release-branch.go1.20] net: delete TestTCPSelfConnect > bdd86bda09 [release-branch.go1.20] crypto/x509: fix ParsePKCS8PrivateKey > comment > aef8a8cd42 [release-branch.go1.20] syscall: Faccessat: check for > CAP_DAC_OVERRIDE on Linux > ef793801f8 [release-branch.go1.20] crypto/internal/bigmod: flag amd64 > assembly as noescape > aaace6dda7 [release-branch.go1.20] crypto/ecdh: explicitly reject mismatched > curves in ECDH > 0f4483cfdc [release-branch.go1.20] cmd/compile/internal/noder: correct > positions for synthetic closures > 1362737f50 [release-branch.go1.20] cmd/link: better fix for arm32 trampgen > problem with duff routines > 602eeaab38 [release-branch.go1.20] crypto/internal/nistec: reduce P-256 scalar > ac556f35a2 [release-branch.go1.20] cmd/internal/cov: fix misuse of >
[OE-core] [PATCH] fix hard-coded .so file extension
From: Etienne Cordonnier
E.g. Darwin uses .dylib instead.
Signed-off-by: Etienne Cordonnier
---
meta/recipes-core/libxcrypt/libxcrypt.inc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc
b/meta/recipes-core/libxcrypt/libxcrypt.inc
index 61b0381076..7b484d86bc 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt.inc
+++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
@@ -17,10 +17,10 @@ SRC_URI += "file://fix_cflags_handling.patch"
PROVIDES = "virtual/crypt"
-FILES:${PN} = "${libdir}/libcrypt*.so.* \
- ${libdir}/libcrypt-*.so \
- ${libdir}/libowcrypt*.so.* \
- ${libdir}/libowcrypt-*.so \
+FILES:${PN} = "${libdir}/libcrypt*${SOLIBS} \
+ ${libdir}/libcrypt-*${SOLIBSDEV} \
+ ${libdir}/libowcrypt*${SOLIBS} \
+ ${libdir}/libowcrypt-*${SOLIBSDEV} \
"
S = "${WORKDIR}/git"
--
2.36.1.vfs.0.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181712):
https://lists.openembedded.org/g/openembedded-core/message/181712
Mute This Topic: https://lists.openembedded.org/mt/99131713/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] linux-yocto: Drop 5.15 support
5.15 doesn't work with gcc 13 and we'll be replacing 5.15 with a new kernel
version later in the release cycle. Drop 5.15 now so we can move forward
with gcc 13 and we'll add a new kernel version later.
Signed-off-by: Richard Purdie
---
.../linux/linux-yocto-rt_5.15.bb | 45
.../linux/linux-yocto-tiny_5.15.bb| 30
meta/recipes-kernel/linux/linux-yocto_5.15.bb | 70 ---
3 files changed, 145 deletions(-)
delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
delete mode 100644 meta/recipes-kernel/linux/linux-yocto_5.15.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
deleted file mode 100644
index 475fe34066d..000
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-KBRANCH ?= "v5.15/standard/preempt-rt/base"
-
-require recipes-kernel/linux/linux-yocto.inc
-
-# Skip processing of this recipe if it is not explicitly specified as the
-# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
-# to build multiple virtual/kernel providers, e.g. as dependency of
-# core-image-rt-sdk, core-image-rt.
-python () {
-if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and
d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
-raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to
linux-yocto-rt to enable it")
-}
-
-SRCREV_machine ?= "8e0611e36c848a07f9cdd778903c9e51bb90b319"
-SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312"
-
-SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https
\
-
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA};protocol=https"
-
-LINUX_VERSION ?= "5.15.108"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
-DEPENDS += "openssl-native util-linux-native"
-
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-KMETA = "kernel-meta"
-KCONF_BSP_AUDIT_LEVEL = "1"
-
-LINUX_KERNEL_TYPE = "preempt-rt"
-
-COMPATIBLE_MACHINE =
"^(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)$"
-
-KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
-
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc
features/taskstats/taskstats.scc"
-KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc
features/drm-bochs/drm-bochs.scc"
-KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "
features/scsi/scsi-debug.scc", "", d)}"
-KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "
features/gpio/mockup.scc", "", d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
deleted file mode 100644
index 365d01db781..000
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-KBRANCH ?= "v5.15/standard/tiny/base"
-
-LINUX_KERNEL_TYPE = "tiny"
-KCONFIG_MODE = "--allnoconfig"
-
-require recipes-kernel/linux/linux-yocto.inc
-
-LINUX_VERSION ?= "5.15.108"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
-DEPENDS += "openssl-native util-linux-native"
-
-KMETA = "kernel-meta"
-KCONF_BSP_AUDIT_LEVEL = "2"
-
-SRCREV_machine ?= "3d762b85647844790979dd1e17a762003aaa7476"
-SRCREV_meta ?= "e4b95ec17228274acb38bf10061448224df3a312"
-
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https
\
-
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA};protocol=https"
-
-COMPATIBLE_MACHINE = "^(qemux86|qemux86-64|qemuarm64|qemuarm|qemuarmv5)$"
-
-# Functionality flags
-KERNEL_FEATURES = ""
-
-KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
deleted file mode 100644
index 54c8e126449..000
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ /dev/null
@@ -1,70 +0,0 @@
-KBRANCH ?= "v5.15/standard/base"
-
-require recipes-kernel/linux/linux-yocto.inc
-
-# board specific branches
-KBRANCH:qemuarm ?= "v5.15/standard/arm-versatile-926ejs"
-KBRANCH:qemuarm64 ?= "v5.15/standard/qemuarm64"
-KBRANCH:qemumips ?= "v5.15/standard/mti-malta32"
-KBRANCH:qemuppc ?= "v5.15/standard/qemuppc"
-KBRANCH:qemuriscv64 ?= "v5.15/standard/base"
-KBRANCH:qemuriscv32 ?= "v5.15/standard/base"
-KBRANCH:qemux86 ?=
