Re: [OE-core] [PATCH] gcc-runtime: do_check should execute before do_build
I see. I had forgotten that the autobuilders don't run do_check as part of the normal build. We have a customization in our distro layer to run do_check on normal builds. Internally, we use that as a hook to allow per-package test suites to fail our integration pipeline during our normal builds. Maybe there's a way we can prevent this conflict with rm_work from our own layer. Sorry for the confusion, Kyle On Fri, Jul 30, 2021, 5:06 PM Richard Purdie < richard.pur...@linuxfoundation.org> wrote: > On Fri, 2021-07-30 at 14:16 -0700, Christopher Larson wrote: > > This will result in a behavior change, making it so `bitbake > gcc-runtime` will > > run the check task. Are there implications to this? > > We definitely do not want to do that. This is used to run the testsuite > which > isn't part of a normal build. > > Cheers, > > Richard > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154292): https://lists.openembedded.org/g/openembedded-core/message/154292 Mute This Topic: https://lists.openembedded.org/mt/84557001/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] gcc-runtime: do_check should execute before do_build
On Fri, 2021-07-30 at 14:16 -0700, Christopher Larson wrote: > This will result in a behavior change, making it so `bitbake gcc-runtime` will > run the check task. Are there implications to this? We definitely do not want to do that. This is used to run the testsuite which isn't part of a normal build. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154291): https://lists.openembedded.org/g/openembedded-core/message/154291 Mute This Topic: https://lists.openembedded.org/mt/84557001/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] gcc-runtime: do_check should execute before do_build
This will result in a behavior change, making it so `bitbake gcc-runtime`
will run the check task. Are there implications to this?
On Fri, Jul 30, 2021 at 12:04 PM wrote:
> Otherwise, when rm_work is used, do_check may not execute before rm_work
> causing do_check failures if the workdir has been removed underneath it.
>
> Signed-off-by: Kyle Russell
> ---
> meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc
> b/meta/recipes-devtools/gcc/gcc-runtime.inc
> index 59d9a24686..607971adca 100644
> --- a/meta/recipes-devtools/gcc/gcc-runtime.inc
> +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
> @@ -314,5 +314,5 @@ do_check() {
>
> oe_runmake -i ${MAKE_CHECK_TARGETS}
> RUNTESTFLAGS="${MAKE_CHECK_RUNTESTFLAGS}"
> }
> -addtask check after do_compile do_populate_sysroot
> +addtask check after do_compile do_populate_sysroot before do_build
>
> --
> 2.25.1
>
>
>
>
>
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154290):
https://lists.openembedded.org/g/openembedded-core/message/154290
Mute This Topic: https://lists.openembedded.org/mt/84557001/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [hardknott][PATCH] go: fix CVE-2020-29509, CVE-2020-29511
Backport patch to fix CVE-2020-29509, CVE-2020-29511
Signed-off-by: Sakib Sajal
---
meta/recipes-devtools/go/go-1.16.5.inc| 1 +
...dle-leading-trailing-or-double-colon.patch | 123 ++
2 files changed, 124 insertions(+)
create mode 100644
meta/recipes-devtools/go/go-1.16/0001-encoding-xml-handle-leading-trailing-or-double-colon.patch
diff --git a/meta/recipes-devtools/go/go-1.16.5.inc
b/meta/recipes-devtools/go/go-1.16.5.inc
index bd928e44f8..b693315917 100644
--- a/meta/recipes-devtools/go/go-1.16.5.inc
+++ b/meta/recipes-devtools/go/go-1.16.5.inc
@@ -16,5 +16,6 @@ SRC_URI += "\
file://0007-cmd-go-make-GOROOT-precious-by-default.patch \
file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
file://0009-Revert-cmd-go-make-sure-CC-and-CXX-are-absolute.patch \
+file://0001-encoding-xml-handle-leading-trailing-or-double-colon.patch \
"
SRC_URI[main.sha256sum] =
"7bfa7e5908c7cc9e75da5ddf3066d7cbcf3fd9fa51945851325eebc17f50ba80"
diff --git
a/meta/recipes-devtools/go/go-1.16/0001-encoding-xml-handle-leading-trailing-or-double-colon.patch
b/meta/recipes-devtools/go/go-1.16/0001-encoding-xml-handle-leading-trailing-or-double-colon.patch
new file mode 100644
index 00..3c47157d1a
--- /dev/null
+++
b/meta/recipes-devtools/go/go-1.16/0001-encoding-xml-handle-leading-trailing-or-double-colon.patch
@@ -0,0 +1,123 @@
+From 4d014e723165f28b34458edb4aa9136e0fb4c702 Mon Sep 17 00:00:00 2001
+From: Filippo Valsorda
+Date: Tue, 27 Oct 2020 00:17:15 +0100
+Subject: [PATCH] encoding/xml: handle leading, trailing, or double colons in
+ names
+
+Before this change, <:name> would parse as , which could cause
+issues in applications that rely on the parse-encode cycle to
+round-trip. Similarly, would parse as expected but then
+have the attribute dropped when serializing because its name was empty.
+Finally, would parse and get serialized incorrectly. All these
+values are invalid XML, but to minimize the impact of this change, we
+parse them whole into Name.Local.
+
+This issue was reported by Juho Nurminen of Mattermost as it leads to
+round-trip mismatches. See #43168. It's not being fixed in a security
+release because round-trip stability is not a currently supported
+security property of encoding/xml, and we don't believe these fixes
+would be sufficient to reliably guarantee it in the future.
+
+Fixes CVE-2020-29509
+Fixes CVE-2020-29511
+Updates #43168
+
+Change-Id: I68321c4d867305046f664347192948a889af3c7f
+Reviewed-on: https://go-review.googlesource.com/c/go/+/277892
+Run-TryBot: Filippo Valsorda
+TryBot-Result: Go Bot
+Trust: Filippo Valsorda
+Reviewed-by: Katie Hockman
+
+CVE: CVE-2020-29509 CVE-2020-29511
+Upstream-Status: Backport [4d014e723165f28b34458edb4aa9136e0fb4c702]
+
+Signed-off-by: Sakib Sajal
+---
+ src/encoding/xml/xml.go | 5 ++--
+ src/encoding/xml/xml_test.go | 56
+ 2 files changed, 59 insertions(+), 2 deletions(-)
+
+diff --git a/src/encoding/xml/xml.go b/src/encoding/xml/xml.go
+index 384d6ad4b8..c902f1295a 100644
+--- a/src/encoding/xml/xml.go
b/src/encoding/xml/xml.go
+@@ -1156,8 +1156,9 @@ func (d *Decoder) nsname() (name Name, ok bool) {
+ if !ok {
+ return
+ }
+- i := strings.Index(s, ":")
+- if i < 0 {
++ if strings.Count(s, ":") > 1 {
++ name.Local = s
++ } else if i := strings.Index(s, ":"); i < 1 || i > len(s)-2 {
+ name.Local = s
+ } else {
+ name.Space = s[0:i]
+diff --git a/src/encoding/xml/xml_test.go b/src/encoding/xml/xml_test.go
+index 5a10f5309d..47d0c39167 100644
+--- a/src/encoding/xml/xml_test.go
b/src/encoding/xml/xml_test.go
+@@ -1003,3 +1003,59 @@ func TestTokenUnmarshaler(t *testing.T) {
+ d := NewTokenDecoder(tokReader{})
+ d.Decode({})
+ }
++
++func testRoundTrip(t *testing.T, input string) {
++ d := NewDecoder(strings.NewReader(input))
++ var tokens []Token
++ var buf bytes.Buffer
++ e := NewEncoder()
++ for {
++ tok, err := d.Token()
++ if err == io.EOF {
++ break
++ }
++ if err != nil {
++ t.Fatalf("invalid input: %v", err)
++ }
++ if err := e.EncodeToken(tok); err != nil {
++ t.Fatalf("failed to re-encode input: %v", err)
++ }
++ tokens = append(tokens, CopyToken(tok))
++ }
++ if err := e.Flush(); err != nil {
++ t.Fatal(err)
++ }
++
++ d = NewDecoder()
++ for {
++ tok, err := d.Token()
++ if err == io.EOF {
++ break
++ }
++ if err != nil {
++ t.Fatalf("failed to decode output: %v", err)
++ }
++ if len(tokens) == 0 {
++ t.Fatalf("unexpected token: %#v", tok)
++ }
++
[OE-core] [PATCH] gcc-runtime: do_check should execute before do_build
Otherwise, when rm_work is used, do_check may not execute before rm_work
causing do_check failures if the workdir has been removed underneath it.
Signed-off-by: Kyle Russell
---
meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc
b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 59d9a24686..607971adca 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -314,5 +314,5 @@ do_check() {
oe_runmake -i ${MAKE_CHECK_TARGETS}
RUNTESTFLAGS="${MAKE_CHECK_RUNTESTFLAGS}"
}
-addtask check after do_compile do_populate_sysroot
+addtask check after do_compile do_populate_sysroot before do_build
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154288):
https://lists.openembedded.org/g/openembedded-core/message/154288
Mute This Topic: https://lists.openembedded.org/mt/84557001/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] gcc: update 11.1 -> 11.2
Thanks Bero, this looks good, we also need to bump GCCVERSION in
meta/conf/distro/include/tcmode-default.inc
and RECIPE_MAINTAINER_pn-gcc-source-11.1.0 to
RECIPE_MAINTAINER_pn-gcc-source-11.2.0 in
meta/conf/distro/include/maintainers.inc
On 7/29/21 4:52 PM, Bernhard Rosenkränzer via lists.openembedded.org wrote:
Update gcc, drop patches that have been merged upstream
Signed-off-by: Bernhard Rosenkränzer
---
.../gcc/{gcc-11.1.inc => gcc-11.2.inc}| 12 +-
...ian_11.1.bb => gcc-cross-canadian_11.2.bb} | 0
.../{gcc-cross_11.1.bb => gcc-cross_11.2.bb} | 0
...-crosssdk_11.1.bb => gcc-crosssdk_11.2.bb} | 0
...cc-runtime_11.1.bb => gcc-runtime_11.2.bb} | 0
...itizers_11.1.bb => gcc-sanitizers_11.2.bb} | 0
...{gcc-source_11.1.bb => gcc-source_11.2.bb} | 0
...nstallation-of-python-hooks-PR-99453.patch | 57
...arc-Update-64bit-move-split-patterns.patch | 290 --
.../0039-arc-Fix-u-maddhisi-patterns.patch| 127
.../0040-arc-Update-doloop_end-patterns.patch | 105 ---
.../gcc/{gcc_11.1.bb => gcc_11.2.bb} | 0
...initial_11.1.bb => libgcc-initial_11.2.bb} | 0
.../gcc/{libgcc_11.1.bb => libgcc_11.2.bb}| 0
...ibgfortran_11.1.bb => libgfortran_11.2.bb} | 0
15 files changed, 3 insertions(+), 588 deletions(-)
rename meta/recipes-devtools/gcc/{gcc-11.1.inc => gcc-11.2.inc} (88%)
rename meta/recipes-devtools/gcc/{gcc-cross-canadian_11.1.bb =>
gcc-cross-canadian_11.2.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-cross_11.1.bb => gcc-cross_11.2.bb}
(100%)
rename meta/recipes-devtools/gcc/{gcc-crosssdk_11.1.bb =>
gcc-crosssdk_11.2.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-runtime_11.1.bb => gcc-runtime_11.2.bb}
(100%)
rename meta/recipes-devtools/gcc/{gcc-sanitizers_11.1.bb =>
gcc-sanitizers_11.2.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-source_11.1.bb => gcc-source_11.2.bb}
(100%)
delete mode 100644
meta/recipes-devtools/gcc/gcc/0001-libstdc-Fix-installation-of-python-hooks-PR-99453.patch
delete mode 100644
meta/recipes-devtools/gcc/gcc/0038-arc-Update-64bit-move-split-patterns.patch
delete mode 100644
meta/recipes-devtools/gcc/gcc/0039-arc-Fix-u-maddhisi-patterns.patch
delete mode 100644
meta/recipes-devtools/gcc/gcc/0040-arc-Update-doloop_end-patterns.patch
rename meta/recipes-devtools/gcc/{gcc_11.1.bb => gcc_11.2.bb} (100%)
rename meta/recipes-devtools/gcc/{libgcc-initial_11.1.bb =>
libgcc-initial_11.2.bb} (100%)
rename meta/recipes-devtools/gcc/{libgcc_11.1.bb => libgcc_11.2.bb} (100%)
rename meta/recipes-devtools/gcc/{libgfortran_11.1.bb => libgfortran_11.2.bb}
(100%)
diff --git a/meta/recipes-devtools/gcc/gcc-11.1.inc
b/meta/recipes-devtools/gcc/gcc-11.2.inc
similarity index 88%
rename from meta/recipes-devtools/gcc/gcc-11.1.inc
rename to meta/recipes-devtools/gcc/gcc-11.2.inc
index c21242af58..31dbc072b8 100644
--- a/meta/recipes-devtools/gcc/gcc-11.1.inc
+++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
@@ -2,11 +2,11 @@ require gcc-common.inc
# Third digit in PV should be incremented after a minor release
-PV = "11.1.0"
+PV = "11.2.0"
# BINV should be incremented to a revision after a minor gcc release
-BINV = "11.1.1"
+BINV = "11.2.0"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:"
@@ -27,7 +27,6 @@ LIC_FILES_CHKSUM = "\
#BASEURI ?=
"https://github.com/gcc-mirror/gcc/archive/${RELEASE}.zip;downloadfilename=gcc-${PV}-${RELEASE}.zip;
BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz \
-
http://downloads.yoctoproject.org/mirror/sources/gcc-11.1.0-9ee61d2b51df012c659359873637cc2162ecccf3.patch;apply=yes;name=backports
\
"
SRC_URI = "\
${BASEURI} \
@@ -68,13 +67,8 @@ SRC_URI = "\
file://0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \
file://0036-mingw32-Enable-operation_not_supported.patch \
file://0037-libatomic-Do-not-enforce-march-on-aarch64.patch \
- file://0001-libstdc-Fix-installation-of-python-hooks-PR-99453.patch
\
- file://0038-arc-Update-64bit-move-split-patterns.patch \
- file://0039-arc-Fix-u-maddhisi-patterns.patch \
- file://0040-arc-Update-doloop_end-patterns.patch \
"
-SRC_URI[sha256sum] =
"4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf"
-SRC_URI[backports.sha256sum] =
"69274bebd6c069a13443d4af61070e854740a639ec4d66eedf3e80070363587b"
+SRC_URI[sha256sum] =
"d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b"
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_11.1.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_11.2.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross-canadian_11.1.bb
rename to meta/recipes-devtools/gcc/gcc-cross-canadian_11.2.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_11.1.bb
Re: [OE-core] SYSROOTS_EXCLUDEDEPS_SYSROOT changing more hashes than I expect
On Fri, 2021-07-30 at 09:04 -0700, Jate Sujjavanich wrote: > The ones in meta/conf/layer.conf are much more global. This one in > meta-java/conf/layer.conf certainly does not apply to perl and other > irrelevant recipes. > > SSTATE_EXCLUDEDEPS_SYSROOT += "\ > > openjdk-8-native->(ant-native|attr-native|coreutils-native|icedtea7-native|libxslt-native|make- > native|openssl-native|zip-native|unzip-native) \ > " > > Do you have a recommendation on how to apply this strictly within meta-java? > The only way I can think of is to move the EXCLUDEDEPS to the specific > recipe(s). > Are there any other good ways? Sorry, your original email said "SYSROOT_" and I read that as being one of the SYSROOT_* variables. I kind of filtered out the rest. SSTATE_* is a very different thing! I think we need to add: setscene_depvalid[vardepsexclude] = "SSTATE_EXCLUDEDEPS_SYSROOT" to sstate.bbclass. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154286): https://lists.openembedded.org/g/openembedded-core/message/154286 Mute This Topic: https://lists.openembedded.org/mt/84552044/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] SYSROOTS_EXCLUDEDEPS_SYSROOT changing more hashes than I expect
The ones in meta/conf/layer.conf are much more global. This one in meta-java/conf/layer.conf certainly does not apply to perl and other irrelevant recipes. SSTATE_EXCLUDEDEPS_SYSROOT += "\ openjdk-8-native->(ant-native|attr-native|coreutils-native|icedtea7-native|libxslt-native|make-native|openssl-native|zip-native|unzip-native) \ " Do you have a recommendation on how to apply this strictly within meta-java? The only way I can think of is to move the EXCLUDEDEPS to the specific recipe(s). Are there any other good ways? - Jate S. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154285): https://lists.openembedded.org/g/openembedded-core/message/154285 Mute This Topic: https://lists.openembedded.org/mt/84552044/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] sdk: Decouple default install path from built in path
Add SDKPATHINSTALL which is used as the default install location of the SDK
instead of SDKPATH. This means the default install path isn't encoded into
every SDK binary, meaning if a date is used there the entire SDK doesn't
have to rebuild. Most distros can switch to only customise SDKPATHINSTALL
meaning more sstate reuse too.
[YOCTO #14100]
Signed-off-by: Richard Purdie
---
meta/classes/populate_sdk_base.bbclass | 1 +
meta/conf/bitbake.conf | 4 +++-
meta/files/toolchain-shar-extract.sh | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk_base.bbclass
b/meta/classes/populate_sdk_base.bbclass
index 3c1eb454b3e..ccfe2232895 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -280,6 +280,7 @@ EOF
# substitute variables
sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \
-e 's#@SDKPATH@#${SDKPATH}#g' \
+ -e 's#@SDKPATHINSTALL@#${SDKPATHINSTALL}#g' \
-e 's#@SDKEXTPATH@#${SDKEXTPATH}#g' \
-e 's#@OLDEST_KERNEL@#${SDK_OLDEST_KERNEL}#g' \
-e
's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f2ceb26c042..1d5f5b7fcd7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -422,8 +422,10 @@ PKGDATA_DIR = "${TMPDIR}/pkgdata/${MACHINE}"
SDK_NAME_PREFIX ?= "oecore"
SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TUNE_PKGARCH}"
-SDKPATH = "/usr/local/${SDK_NAME_PREFIX}-${SDK_ARCH}"
+SDKPATH = "/usr/local/oe-sdk-hardcoded-buildpath"
SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
+# The path to default to installing the SDK to
+SDKPATHINSTALL = "/usr/local/${SDK_NAME_PREFIX}-${SDK_ARCH}"
##
# Kernel info.
diff --git a/meta/files/toolchain-shar-extract.sh
b/meta/files/toolchain-shar-extract.sh
index dd9342758b4..887c97a11e2 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -56,7 +56,7 @@ if ! xz -V > /dev/null 2>&1; then
exit 1
fi
-DEFAULT_INSTALL_DIR="@SDKPATH@"
+DEFAULT_INSTALL_DIR="@SDKPATHINSTALL@"
SUDO_EXEC=""
EXTRA_TAR_OPTIONS=""
target_sdk_dir=""
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154284):
https://lists.openembedded.org/g/openembedded-core/message/154284
Mute This Topic: https://lists.openembedded.org/mt/84553012/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] SYSROOTS_EXCLUDEDEPS_SYSROOT changing more hashes than I expect
On Fri, 2021-07-30 at 08:02 -0700, Jate Sujjavanich wrote: > I added meta-java to my bblayers.conf file, and the next build invalidated > much of my sstate cache. This included such recipes as perl, which I thought > would be unrelated to that layer. Through some digging, it appears that the > addition to SYSROOTS_EXCLUDEDEPS_SYSROOT in meta-java affects that recipe. > > I wonder if this variable should be added to something like > BB_HASHBASE_WHITELIST. > I'd think that the value in the exclusion should only affect the signature if > it matches the current recipe. Is something more needed in a hash calculation? It definitely should not be in BB_HASHBASE_WHITELIST. Changes in output should affect the hash and changing SYSROOTS_EXCLUDEDEPS_SYSROOT does potentially change the output. This is a bug in meta-java where it should only be setting this for it's own recipes and not every recipe in the system. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154283): https://lists.openembedded.org/g/openembedded-core/message/154283 Mute This Topic: https://lists.openembedded.org/mt/84552044/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] SYSROOTS_EXCLUDEDEPS_SYSROOT changing more hashes than I expect
I added meta-java to my bblayers.conf file, and the next build invalidated much of my sstate cache. This included such recipes as perl, which I thought would be unrelated to that layer. Through some digging, it appears that the addition to SYSROOTS_EXCLUDEDEPS_SYSROOT in meta-java affects that recipe. I wonder if this variable should be added to something like BB_HASHBASE_WHITELIST. I'd think that the value in the exclusion should only affect the signature if it matches the current recipe. Is something more needed in a hash calculation? - Jate S. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154282): https://lists.openembedded.org/g/openembedded-core/message/154282 Mute This Topic: https://lists.openembedded.org/mt/84552044/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 1/2] dropbear: Fix incorrect package override for postrm
This bug has been around for a long time (2011) but fix it to do
what was intended originally. The postrm is changed by classes but
those should append to existing entries.
Signed-off-by: Richard Purdie
---
meta/recipes-core/dropbear/dropbear.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/dropbear/dropbear.inc
b/meta/recipes-core/dropbear/dropbear.inc
index b5f3778abec..f2a490c4736 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -114,7 +114,7 @@ ALTERNATIVE:${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp
ssh', d)}"
ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti"
-pkg_postrm:append_${PN} () {
+pkg_postrm:${PN} () {
if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
fi
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154280):
https://lists.openembedded.org/g/openembedded-core/message/154280
Mute This Topic: https://lists.openembedded.org/mt/84551167/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 2/2] convert-overrides: Allow script to handle patch/diffs
It is handy to be able to have the script convert a single patch file
and it turns out to be straightforward to make it do this.
Signed-off-by: Richard Purdie
---
scripts/contrib/convert-overrides.py | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/scripts/contrib/convert-overrides.py
b/scripts/contrib/convert-overrides.py
index bfdf785719f..6505b18cf09 100755
--- a/scripts/contrib/convert-overrides.py
+++ b/scripts/contrib/convert-overrides.py
@@ -68,15 +68,15 @@ packagevars = packagevars + imagevars
vars_re = {}
for exp in vars:
-vars_re[exp] = (re.compile('((^|[\'"\s])[A-Za-z0-9_\-:${}]+)_' + exp),
r"\1:" + exp)
+vars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}]+)_' + exp),
r"\1:" + exp)
shortvars_re = {}
for exp in shortvars:
-shortvars_re[exp] = (re.compile('((^|[\'"\s])[A-Za-z0-9_\-:${}]+)_' + exp
+ '([\(\'"\s:])'), r"\1:" + exp + r"\3")
+shortvars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}]+)_' +
exp + '([\(\'"\s:])'), r"\1:" + exp + r"\3")
package_re = {}
for exp in packagevars:
-package_re[exp] = (re.compile('(^|[\'"\s]+)' + exp + '_' +
'([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2")
+package_re[exp] = (re.compile('(^|[\'"\s\-\+]+)' + exp + '_' +
'([$a-z"\'\s%\[<{\\\*].)'), r"\1" + exp + r":\2")
# Other substitutions to make
subs = {
@@ -123,6 +123,10 @@ def processfile(fn):
ourname = os.path.basename(sys.argv[0])
ourversion = "0.9.1"
+if os.path.isfile(sys.argv[1]):
+processfile(sys.argv[1])
+sys.exit(0)
+
for targetdir in sys.argv[1:]:
print("processing directory '%s'" % targetdir)
for root, dirs, files in os.walk(targetdir):
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154281):
https://lists.openembedded.org/g/openembedded-core/message/154281
Mute This Topic: https://lists.openembedded.org/mt/84551168/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 9/9] selftest: add core-image-weston to no-gpl3-no-meta-gpl2 image test
This demonstrates more of the tricks and techniques that can be used
to achieve gpl3-free images withough having to roll back to ancient
versions of various core items via meta-gpl2.
Signed-off-by: Alexander Kanavin
---
.../oeqa/selftest/cases/incompatible_lic.py | 28 +--
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
index 152da6332a..6944becb58 100644
--- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
+++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
@@ -122,14 +122,26 @@ INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0
LGPL-3.0"
""")
bitbake('core-image-minimal')
-def test_core_image_full_cmdline(self):
+def test_core_image_full_cmdline_weston(self):
self.write_config("""
-INHERIT += "testimage"\n
-INCOMPATIBLE_LICENSE_pn-core-image-full-cmdline = "GPL-3.0 LGPL-3.0"\n
-RDEPENDS_packagegroup-core-full-cmdline-utils_remove = "bash bc coreutils cpio
ed findutils gawk grep mc mc-fish mc-helpers mc-helpers-perl sed tar time"\n
-RDEPENDS_packagegroup-core-full-cmdline-dev-utils_remove = "diffutils m4 make
patch"\n
-RDEPENDS_packagegroup-core-full-cmdline-multiuser_remove = "gzip"\n
+INHERIT += "testimage"
+INCOMPATIBLE_LICENSE_pn-core-image-full-cmdline = "GPL-3.0 LGPL-3.0"
+INCOMPATIBLE_LICENSE_pn-core-image-weston = "GPL-3.0 LGPL-3.0"
+# Settings for full-cmdline
+RDEPENDS_packagegroup-core-full-cmdline-utils_remove = "bash bc coreutils cpio
ed findutils gawk grep mc mc-fish mc-helpers mc-helpers-perl sed tar time"
+RDEPENDS_packagegroup-core-full-cmdline-dev-utils_remove = "diffutils m4 make
patch"
+RDEPENDS_packagegroup-core-full-cmdline-multiuser_remove = "gzip"
+# Settings for weston
+# direct gpl3 dependencies
+RRECOMMENDS_packagegroup-base-vfat_remove = "dosfstools"
+PACKAGECONFIG_remove_pn-bluez5 = "readline"
+# dnf pulls in gpg which is gpl3; it also pulls in python3-rpm which pulls in
rpm-build which pulls in bash
+# so install rpm but not dnf
+IMAGE_FEATURES_remove_pn-core-image-weston = "package-management"
+CORE_IMAGE_EXTRA_INSTALL_pn-core-image-weston += "rpm"
+# matchbox-terminal depends on vte, which is gpl3
+CORE_IMAGE_BASE_INSTALL_remove_pn-core-image-weston = "matchbox-terminal"
""")
-bitbake('core-image-full-cmdline')
-bitbake('-c testimage core-image-full-cmdline')
+bitbake('core-image-full-cmdline core-image-weston')
+bitbake('-c testimage core-image-full-cmdline core-image-weston')
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154279):
https://lists.openembedded.org/g/openembedded-core/message/154279
Mute This Topic: https://lists.openembedded.org/mt/84548202/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 8/9] rpm: do not RRECOMMEND rpm-build
This avoids pulling in perl, python and (especially) bash;
rpm building functionality should be neither hard nor soft
dependency of rpm package management.
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/rpm/rpm_4.16.1.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb
b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb
index 95a6f5cf71..33834eca9f 100644
--- a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb
@@ -148,7 +148,7 @@ FILES_${PN}-dev += "${libdir}/rpm-plugins/*.la \
"
PACKAGE_BEFORE_PN += "${PN}-build ${PN}-sign ${PN}-archive"
-RRECOMMENDS_${PN} += "rpm-build rpm-sign rpm-archive"
+RRECOMMENDS_${PN} += "rpm-sign rpm-archive"
FILES_${PN}-build = "\
${bindir}/rpmbuild \
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154278):
https://lists.openembedded.org/g/openembedded-core/message/154278
Mute This Topic: https://lists.openembedded.org/mt/84548201/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 7/9] devtool: print a warning on upgrades if PREFERRED_VERSION is set
Signed-off-by: Alexander Kanavin
---
scripts/lib/devtool/upgrade.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index da1456a01a..65e19853dc 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -583,6 +583,9 @@ def upgrade(args, config, basepath, workspace):
logger.info('New recipe is %s' % rf)
if license_diff:
logger.info('License checksums have been updated in the new
recipe; please refer to it for the difference between the old and the new
license texts.')
+preferred_version = rd.getVar('PREFERRED_VERSION_%s' % rd.getVar('PN'))
+if preferred_version:
+logger.warning('Version is pinned to %s via PREFERRED_VERSION; it
may need adjustment to match the new version before any further steps are
taken' % preferred_version)
finally:
tinfoil.shutdown()
return 0
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154277):
https://lists.openembedded.org/g/openembedded-core/message/154277
Mute This Topic: https://lists.openembedded.org/mt/84548200/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 6/9] shadow: update 4.8.1 -> 4.9
Add a couple backports to fix builds.
Drop 0002-Allow-for-setting-password-in-clear-text.patch;
what it adds is horribly insecure and AB testing didn't reveal any
regressions or use cases for it.
Drop /etc/default/ tweaks as files are no longer installed there.
Drop manpage alternatives as manpages are no longer installed.
Signed-off-by: Alexander Kanavin
---
...01-Disable-use-of-syslog-for-sysroot.patch | 29 +-
...builds-with-respect-to-libsubid-incl.patch | 114 +++
.../0001-libsubid-link-to-PAM-libraries.patch | 31 ++
...w-for-setting-password-in-clear-text.patch | 301 --
...nexpected-open-failure-in-chroot-env.patch | 6 +-
meta/recipes-extended/shadow/shadow.inc | 21 +-
.../shadow/{shadow_4.8.1.bb => shadow_4.9.bb} | 0
7 files changed, 167 insertions(+), 335 deletions(-)
create mode 100644
meta/recipes-extended/shadow/files/0001-Fix-out-of-tree-builds-with-respect-to-libsubid-incl.patch
create mode 100644
meta/recipes-extended/shadow/files/0001-libsubid-link-to-PAM-libraries.patch
delete mode 100644
meta/recipes-extended/shadow/files/0002-Allow-for-setting-password-in-clear-text.patch
rename meta/recipes-extended/shadow/{shadow_4.8.1.bb => shadow_4.9.bb} (100%)
diff --git
a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
index ab317b9aa0..95728bcd3f 100644
---
a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
+++
b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
@@ -1,4 +1,4 @@
-From fa2d9453656641002802d8165e80adb9e6a729d2 Mon Sep 17 00:00:00 2001
+From 30a3906a0a21120fa6bbc918b6258ab9303fbeaa Mon Sep 17 00:00:00 2001
From: Scott Garman
Date: Thu, 14 Apr 2016 12:28:57 +0200
Subject: [PATCH] Disable use of syslog for sysroot
@@ -19,12 +19,12 @@ Signed-off-by: Chen Qi
src/groupmems.c | 3 +++
src/groupmod.c | 3 +++
src/useradd.c | 3 +++
- src/userdel.c | 3 +++
+ src/userdel.c | 4
src/usermod.c | 3 +++
- 7 files changed, 21 insertions(+)
+ 7 files changed, 22 insertions(+)
diff --git a/src/groupadd.c b/src/groupadd.c
-index 2dd8eec..e9c4bb7 100644
+index d7f68b1..5fe5f43 100644
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -34,6 +34,9 @@
@@ -38,7 +38,7 @@ index 2dd8eec..e9c4bb7 100644
#include
#include
diff --git a/src/groupdel.c b/src/groupdel.c
-index f941a84..5a70056 100644
+index 5c89312..2aefc5a 100644
--- a/src/groupdel.c
+++ b/src/groupdel.c
@@ -34,6 +34,9 @@
@@ -52,7 +52,7 @@ index f941a84..5a70056 100644
#include
#include
diff --git a/src/groupmems.c b/src/groupmems.c
-index fc91c8b..2842514 100644
+index 654a8f3..6b2026b 100644
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -32,6 +32,9 @@
@@ -66,7 +66,7 @@ index fc91c8b..2842514 100644
#include
#include
diff --git a/src/groupmod.c b/src/groupmod.c
-index 1dca5fc..bc14438 100644
+index acd6f35..a2c5247 100644
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -34,6 +34,9 @@
@@ -80,7 +80,7 @@ index 1dca5fc..bc14438 100644
#include
#include
diff --git a/src/useradd.c b/src/useradd.c
-index 4af0f7c..1b7bf06 100644
+index 127177e..b80e505 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -34,6 +34,9 @@
@@ -94,21 +94,22 @@ index 4af0f7c..1b7bf06 100644
#include
#include
diff --git a/src/userdel.c b/src/userdel.c
-index cc951e5..153e0be 100644
+index 79a7c89..c1e010a 100644
--- a/src/userdel.c
+++ b/src/userdel.c
-@@ -34,6 +34,9 @@
-
- #ident "$Id$"
+@@ -31,6 +31,10 @@
+ */
+ #include
++
+/* Disable use of syslog since we're running this command against a sysroot */
+#undef USE_SYSLOG
+
#include
+ #include
#include
- #include
diff --git a/src/usermod.c b/src/usermod.c
-index 05b9871..21c6da9 100644
+index 03bb9b9..e15fdd4 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -34,6 +34,9 @@
diff --git
a/meta/recipes-extended/shadow/files/0001-Fix-out-of-tree-builds-with-respect-to-libsubid-incl.patch
b/meta/recipes-extended/shadow/files/0001-Fix-out-of-tree-builds-with-respect-to-libsubid-incl.patch
new file mode 100644
index 00..c577be6505
--- /dev/null
+++
b/meta/recipes-extended/shadow/files/0001-Fix-out-of-tree-builds-with-respect-to-libsubid-incl.patch
@@ -0,0 +1,114 @@
+From eced8077b57946fe0b723e7c6c510e8f344ce89b Mon Sep 17 00:00:00 2001
+From: Serge Hallyn
+Date: Fri, 23 Jul 2021 17:51:13 -0500
+Subject: [PATCH] Fix out of tree builds with respect to libsubid includes
+
+There's a better way to do this, and I hope to clean that up,
+but this fixes out of tree builds for me right now.
+
+Closes #386
+
+Signed-off-by: Serge Hallyn
+Upstream-Status: Backport
[https://github.com/shadow-maint/shadow/commit/537b8cd90be7b47b45c45cfd27765ef85eb0ebf1]
+Signed-off-by: Alexander Kanavin
+---
+ lib/Makefile.am | 2 ++
+ libmisc/Makefile.am | 2 +-
+ libsubid/Makefile.am | 4 ++--
+ src/Makefile.am | 6 ++
+
[OE-core] [PATCH 5/9] freetype: update 2.10.4 -> 2.11.0
License-Update: formatting, changed location in source tree.
Signed-off-by: Alexander Kanavin
---
.../freetype/freetype/use-right-libtool.patch | 23 ---
...{freetype_2.10.4.bb => freetype_2.11.0.bb} | 4 ++--
2 files changed, 22 insertions(+), 5 deletions(-)
rename meta/recipes-graphics/freetype/{freetype_2.10.4.bb =>
freetype_2.11.0.bb} (91%)
diff --git a/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch
b/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch
index 3368f7ddd3..b389455f5d 100644
--- a/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch
+++ b/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch
@@ -1,3 +1,8 @@
+From 50499e4482d40cff2ef05905c658ba4380e7e6fc Mon Sep 17 00:00:00 2001
+From: Ross Burton
+Date: Thu, 7 Jan 2016 21:13:07 +
+Subject: [PATCH] freetype: enable out-of-tree builds, and use host zlib
+
Freetype think that it knows best about where libtool is, and explicitly the
libtool autoconf macros telling it where to find the libtool script. Of course
we prefix the script with the target triplet, so it's wrong. Fix this by
@@ -7,8 +12,20 @@ put libtool is used.
Upstream-Status: Pending
Signed-off-by: Ross Burton
freetype-2.6/builds/unix/unix-cc.in.orig 2016-01-07 19:21:45.244943479
+
-+++ freetype-2.6/builds/unix/unix-cc.in2016-01-07 19:21:50.213112131
+
-@@ -19,1 +18,1 @@
+---
+ builds/unix/unix-cc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
+index 89be450..72609d3 100644
+--- a/builds/unix/unix-cc.in
b/builds/unix/unix-cc.in
+@@ -16,7 +16,7 @@ CC := @CC@
+ COMPILER_SEP := $(SEP)
+ FT_LIBTOOL_DIR ?= $(PLATFORM_DIR)
+
-LIBTOOL := $(FT_LIBTOOL_DIR)/libtool
+LIBTOOL := $(FT_LIBTOOL_DIR)/@LIBTOOL@ --tag CC
+
+
+ # The object file extension (for standard and static libraries). This can be
diff --git a/meta/recipes-graphics/freetype/freetype_2.10.4.bb
b/meta/recipes-graphics/freetype/freetype_2.11.0.bb
similarity index 91%
rename from meta/recipes-graphics/freetype/freetype_2.10.4.bb
rename to meta/recipes-graphics/freetype/freetype_2.11.0.bb
index 8462cd3511..2893e21fec 100644
--- a/meta/recipes-graphics/freetype/freetype_2.10.4.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.11.0.bb
@@ -8,14 +8,14 @@ BUGTRACKER =
"https://savannah.nongnu.org/bugs/?group=freetype;
SECTION = "libs"
LICENSE = "FreeType | GPLv2+"
-LIC_FILES_CHKSUM =
"file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \
file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec"
SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz \
file://use-right-libtool.patch \
"
-SRC_URI[sha256sum] =
"86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784"
+SRC_URI[sha256sum] =
"8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7"
UPSTREAM_CHECK_REGEX = "freetype-(?P\d+(\.\d+)+)"
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154275):
https://lists.openembedded.org/g/openembedded-core/message/154275
Mute This Topic: https://lists.openembedded.org/mt/84548197/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 4/9] iputils: update 20210202 -> 20210722
Drop rdisc part from 0001-rarpd-rdisc-Drop-PrivateUsers.patch
as it's been fixed upstream; rarpd still isn't.
Signed-off-by: Alexander Kanavin
---
.../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 31 ---
...putils_20210202.bb => iputils_20210722.bb} | 2 +-
2 files changed, 7 insertions(+), 26 deletions(-)
rename meta/recipes-extended/iputils/{iputils_20210202.bb =>
iputils_20210722.bb} (98%)
diff --git
a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
index d7367caf78..c61e39dc80 100644
---
a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
+++
b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
@@ -1,20 +1,20 @@
-From 6e51d529988cfc0bb357751fd767e9f1478e2b81 Mon Sep 17 00:00:00 2001
+From dfeeb3f1328d09f516edeb6349bd63e3c87f9397 Mon Sep 17 00:00:00 2001
From: Alex Kiernan
Date: Thu, 13 Feb 2020 06:08:45 +
-Subject: [PATCH] rarpd: rdisc: Drop PrivateUsers
+Subject: [PATCH] rarpd:Drop PrivateUsers
-Neither rarpd nor rdisc can gain the necessary capabilities with
+rarpd cannot gain the necessary capabilities with
PrivateUsers enabled.
Upstream-Status: Pending
Signed-off-by: Alex Kiernan
+
---
systemd/rarpd.service.in | 1 -
- systemd/rdisc.service.in | 3 ++-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 1 deletion(-)
diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in
-index e600c10c93e6..f5d7621a7ce8 100644
+index e600c10..f5d7621 100644
--- a/systemd/rarpd.service.in
+++ b/systemd/rarpd.service.in
@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW
@@ -25,22 +25,3 @@ index e600c10c93e6..f5d7621a7ce8 100644
ProtectSystem=strict
ProtectHome=yes
ProtectControlGroups=yes
-diff --git a/systemd/rdisc.service.in b/systemd/rdisc.service.in
-index 4e2a1ec9d0e5..a71b87d36b37 100644
a/systemd/rdisc.service.in
-+++ b/systemd/rdisc.service.in
-@@ -8,9 +8,10 @@ After=network.target
- EnvironmentFile=-/etc/sysconfig/rdisc
- ExecStart=@sbindir@/rdisc -f -t $OPTIONS $SEND_ADDRESS $RECEIVE_ADDRESS
-
-+CapabilityBoundingSet=CAP_NET_RAW
- AmbientCapabilities=CAP_NET_RAW
- PrivateTmp=yes
--PrivateUsers=yes
-+DynamicUser=yes
- ProtectSystem=strict
- ProtectHome=yes
- ProtectControlGroups=yes
---
-2.17.1
-
diff --git a/meta/recipes-extended/iputils/iputils_20210202.bb
b/meta/recipes-extended/iputils/iputils_20210722.bb
similarity index 98%
rename from meta/recipes-extended/iputils/iputils_20210202.bb
rename to meta/recipes-extended/iputils/iputils_20210722.bb
index 02a303782e..b5a774073e 100644
--- a/meta/recipes-extended/iputils/iputils_20210202.bb
+++ b/meta/recipes-extended/iputils/iputils_20210722.bb
@@ -13,7 +13,7 @@ DEPENDS = "gnutls"
SRC_URI = "git://github.com/iputils/iputils \
file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
"
-SRCREV = "cc16da6b574ce6637f3e6e9ab3c1a728663006ff"
+SRCREV = "71bb2a6c72e9f658e90ac618c73d873a76bbaa81"
S = "${WORKDIR}/git"
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154274):
https://lists.openembedded.org/g/openembedded-core/message/154274
Mute This Topic: https://lists.openembedded.org/mt/84548196/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 1/9] cmake: update 3.21.0 -> 3.21.1
Signed-off-by: Alexander Kanavin
---
.../cmake/{cmake-native_3.21.0.bb => cmake-native_3.21.1.bb}| 0
meta/recipes-devtools/cmake/cmake.inc | 2 +-
.../recipes-devtools/cmake/{cmake_3.21.0.bb => cmake_3.21.1.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/cmake/{cmake-native_3.21.0.bb =>
cmake-native_3.21.1.bb} (100%)
rename meta/recipes-devtools/cmake/{cmake_3.21.0.bb => cmake_3.21.1.bb} (100%)
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.21.0.bb
b/meta/recipes-devtools/cmake/cmake-native_3.21.1.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.21.0.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.21.1.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc
b/meta/recipes-devtools/cmake/cmake.inc
index 358f284279..7f0aff8118 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -21,7 +21,7 @@ SRC_URI =
"https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch
\
"
-SRC_URI[sha256sum] =
"4a42d56449a51f4d3809ab4d3b61fd4a96a469e56266e896ce1009b5768bd2ab"
+SRC_URI[sha256sum] =
"fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4"
UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/cmake/cmake_3.21.0.bb
b/meta/recipes-devtools/cmake/cmake_3.21.1.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.21.0.bb
rename to meta/recipes-devtools/cmake/cmake_3.21.1.bb
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154271):
https://lists.openembedded.org/g/openembedded-core/message/154271
Mute This Topic: https://lists.openembedded.org/mt/84548192/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 3/9] util-linux: update 2.37 -> 2.37.1
Drop backports.
Signed-off-by: Alexander Kanavin
---
...d_2.37.bb => util-linux-libuuid_2.37.1.bb} | 0
meta/recipes-core/util-linux/util-linux.inc | 9 +-
.../0001-login-fix-close_range-use.patch | 62 -
...74160b96498d672e3652827aa7e6d7f3a120.patch | 29 --
.../util-linux/tests-blkdiscard.patch | 31 ---
.../util-linux/util-linux/tests-eject.patch | 56
.../util-linux/util-linux/tests-kill.patch| 88 ---
.../util-linux/util-linux/tests-lscpu.patch | 42 -
.../util-linux/util-linux/tests-ul.patch | 35
...til-linux_2.37.bb => util-linux_2.37.1.bb} | 0
10 files changed, 1 insertion(+), 351 deletions(-)
rename meta/recipes-core/util-linux/{util-linux-libuuid_2.37.bb =>
util-linux-libuuid_2.37.1.bb} (100%)
delete mode 100644
meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch
delete mode 100644
meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch
delete mode 100644
meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/tests-eject.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/tests-kill.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/tests-lscpu.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/tests-ul.patch
rename meta/recipes-core/util-linux/{util-linux_2.37.bb =>
util-linux_2.37.1.bb} (100%)
diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb
b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.1.bb
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb
rename to meta/recipes-core/util-linux/util-linux-libuuid_2.37.1.bb
diff --git a/meta/recipes-core/util-linux/util-linux.inc
b/meta/recipes-core/util-linux/util-linux.inc
index 0648366baf..264c2e84f7 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -35,13 +35,6 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
file://run-ptest \
file://display_testname_for_subtest.patch \
file://avoid_parallel_tests.patch \
- file://8a3a74160b96498d672e3652827aa7e6d7f3a120.patch \
- file://tests-kill.patch \
- file://tests-blkdiscard.patch \
- file://tests-ul.patch \
- file://tests-eject.patch \
- file://tests-lscpu.patch \
- file://0001-login-fix-close_range-use.patch \
"
-SRC_URI[sha256sum] =
"bd07b7e98839e0359842110525a3032fdb8eaf3a90bedde3dd1652d32d15cce5"
+SRC_URI[sha256sum] =
"8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76"
diff --git
a/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch
b/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch
deleted file mode 100644
index 7a47597bd6..00
---
a/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 76ae0badd3fd7c8653fa4d3c78d2dcfcec51d23d Mon Sep 17 00:00:00 2001
-From: Karel Zak
-Date: Wed, 14 Jul 2021 17:25:57 +0200
-Subject: [PATCH] login: fix close_range() use
-
-This new syscall comes with three arguments (see kernel commit
-278a5fbaed89dacd04e9d052f4594ffd0e0585de). Not sure why util-linux
-assume only two.
-
-Upstream-Status: Backport
[https://github.com/karelzak/util-linux/commit/b8d99a618baffb4fc03cda4c40e29778b6d77ad4]
-Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1981729
-Signed-off-by: Karel Zak
- include/fileutils.h | 4 ++--
- lib/fileutils.c | 2 +-
- login-utils/login.c | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/fileutils.h b/include/fileutils.h
-index ad54b95..f86426b 100644
a/include/fileutils.h
-+++ b/include/fileutils.h
-@@ -82,9 +82,9 @@ static inline struct dirent *xreaddir(DIR *dp)
- # if defined(SYS_close_range)
- # include
- # ifndef HAVE_CLOSE_RANGE
--static inline int close_range(unsigned int first, unsigned int last)
-+static inline int close_range(unsigned int first, unsigned int last, int
flags)
- {
-- return syscall(SYS_close_range, first, last);
-+ return syscall(SYS_close_range, first, last, flags);
- }
- # endif
- # define HAVE_CLOSE_RANGE 1
-diff --git a/lib/fileutils.c b/lib/fileutils.c
-index 846b718..a979b03 100644
a/lib/fileutils.c
-+++ b/lib/fileutils.c
-@@ -189,7 +189,7 @@ int main(int argc, char *argv[])
- ignore_result( dup(STDIN_FILENO) );
-
- # ifdef HAVE_CLOSE_RANGE
-- close_range(STDERR_FILENO + 1, ~0U);
-+ close_range(STDERR_FILENO + 1, ~0U, 0);
- # else
- ul_close_all_fds(STDERR_FILENO + 1, ~0U);
- # endif
-diff --git a/login-utils/login.c b/login-utils/login.c
-index 7fefd05..94a042d 100644
a/login-utils/login.c
-+++
[OE-core] [PATCH 2/9] mtools: update 4.0.32 -> 4.0.34
Drop no-x11.gplv3.patch (the libraries are now
dynamically enabled from configure.in).
Signed-off-by: Alexander Kanavin
---
.../mtools/disable-hardcoded-configs.patch | 4 ++--
.../mtools/mtools/no-x11.gplv3.patch | 18 --
.../{mtools_4.0.32.bb => mtools_4.0.34.bb} | 3 +--
3 files changed, 3 insertions(+), 22 deletions(-)
delete mode 100644 meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
rename meta/recipes-devtools/mtools/{mtools_4.0.32.bb => mtools_4.0.34.bb}
(91%)
diff --git
a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
index 81d76d060e..c78f73d255 100644
--- a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
+++ b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
@@ -1,4 +1,4 @@
-From 630dbcabc408cf5d73edaa7cf64a48194976b290 Mon Sep 17 00:00:00 2001
+From bd2ec723326b6d57350da73b444dd43e923011e8 Mon Sep 17 00:00:00 2001
From: Ed Bartosh
Date: Tue, 13 Jun 2017 14:55:52 +0300
Subject: [PATCH] Disabled reading host configs.
@@ -12,7 +12,7 @@ Signed-off-by: Ed Bartosh
1 file changed, 8 deletions(-)
diff --git a/config.c b/config.c
-index bb13682..9186c77 100644
+index 173eae0..0654cc1 100644
--- a/config.c
+++ b/config.c
@@ -836,14 +836,6 @@ void read_config(void)
diff --git a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
b/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
deleted file mode 100644
index 9cb3e39f5c..00
--- a/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Disable building with X11 support.
-
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Scott Garman
-
-diff -urN mtools-4.0.15.orig//Makefile.in mtools-4.0.15//Makefile.in
mtools-4.0.15.orig//Makefile.in2010-10-17 08:41:09.0 -0700
-+++ mtools-4.0.15//Makefile.in 2010-11-23 13:59:49.258258374 -0800
-@@ -146,7 +146,7 @@
- CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@
-I@srcdir@ $(USERCFLAGS)
- LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@
- ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS)
--X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) -lXau -lX11 $(LIBS)
-+X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(LIBS)
- X_CCFLAGS = $(X_CFLAGS) $(CFLAGS)
-
- all:mtools $(LINKS) mkmanifest @FLOPPYD@ mtools.1 mtools.5
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.32.bb
b/meta/recipes-devtools/mtools/mtools_4.0.34.bb
similarity index 91%
rename from meta/recipes-devtools/mtools/mtools_4.0.32.bb
rename to meta/recipes-devtools/mtools/mtools_4.0.34.bb
index 501875037a..3d2702ac36 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.32.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.34.bb
@@ -24,11 +24,10 @@ RRECOMMENDS_${PN}_libc-glibc = "\
glibc-gconv-ibm866 \
glibc-gconv-ibm869 \
"
-SRC_URI[sha256sum] =
"62498cd51ae7c79a27c879a45f0d2a8c44e1404cbb901372d09b02735ef5ad89"
+SRC_URI[sha256sum] =
"ada543eb1b0ffe5440d4ee42634309ea1e286d7ebb80c99ba50db5cb2c360cab"
SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
file://mtools-makeinfo.patch \
- file://no-x11.gplv3.patch \
file://clang_UNUSED.patch \
"
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154272):
https://lists.openembedded.org/g/openembedded-core/message/154272
Mute This Topic: https://lists.openembedded.org/mt/84548194/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] python3-pytest: fix display version info
On Fri, 2021-07-30 at 19:03 +0800, kai wrote: > On 7/30/21 6:11 PM, Richard Purdie wrote: > > On Fri, 2021-07-30 at 11:38 +0800, kai wrote: > > > From: Kai Kang > > > > > > It does not show correct version info of python3-pytest by: > > > > > > $ pip3 list | grep pytest > > > pytest 0.0.0 > > > > > > Remove 0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch > > > and depends on python3-setuptools-scm-native to make it right. > > > > > > Signed-off-by: Kai Kang > > > --- > > > ...he-setup_requires-for-setuptools-scm.patch | 36 --- > > > .../python/python3-pytest_6.2.4.bb| 4 +-- > > > 2 files changed, 2 insertions(+), 38 deletions(-) > > > delete mode 100644 > > > meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch > > > > > > diff --git > > > a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch > > > > > > b/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch > > > deleted file mode 100644 > > > index 1abd531c62..00 > > > --- > > > a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch > > > +++ /dev/null > > > @@ -1,36 +0,0 @@ > > > -From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001 > > > -From: Yuan Chao > > > -Date: Wed, 28 Aug 2019 16:12:27 +0900 > > > -Subject: [PATCH] setup.py: remove the setup_requires for setuptools-scm > > > - > > > -The setup_requires argument forces the download of the egg file for > > > setuptools-scm > > > -during the do_compile phase. This download is incompatible with the > > > typical fetch > > > -and mirror structure. The only usage of scm is the generation of the > > > _version.py > > > -file and in the release tarball it is already correctly created > > > - > > Recipes should not be downloading during do_compile. We need to fix this in > > some > > other way, we can't just remove the patch. > > > > Cheers, > > > > Richard > > > Hi Richard, > > It calls pip to download the egg file for setuptools-scm. But pip is not > a dependency and does not exist in sysroot, so it fails when remove the > patch and > "python3-setuptools-scm-native" is not a dependency: > > > DEBUG: Executing shell function do_compile > > WARNING: The wheel package is not available. > > > /buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/bin/python3-native/pytho > n3: No module named pip > > Traceback (most recent call last): > > File > "/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/lib/python3.9/si > te-packages/setuptools/installer.py", line 75, in fetch_build_egg > > subprocess.check_call(cmd) > > File > "/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/lib/python3.9/su > bprocess.py", line 373, in check_call > > raise CalledProcessError(retcode, cmd) > > subprocess.CalledProcessError: Command > '['/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-s > ysroot-native/usr/bin/python3-native/python3', '-m', 'pip', > '--disable-pip-version-check', 'wheel', '--no-deps', '-w', > '/tmp/tmpovfcfgaq', '--q > uiet', 'setuptools-scm>=3.4']' returned non-zero exit status 1. > > After add "python3-setuptools-scm-native" to dependency, it meets the > requirement in setup.cfg: > > setuptools-scm>=3.4 > > then it does not call pip anymore to download any file. That makes more sense, thanks for clarifying. Could you update the commit message to make that clearer please? Thanks, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154270): https://lists.openembedded.org/g/openembedded-core/message/154270 Mute This Topic: https://lists.openembedded.org/mt/84543785/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] python3-pytest: fix display version info
On 7/30/21 6:11 PM, Richard Purdie wrote: On Fri, 2021-07-30 at 11:38 +0800, kai wrote: From: Kai Kang It does not show correct version info of python3-pytest by: $ pip3 list | grep pytest pytest 0.0.0 Remove 0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch and depends on python3-setuptools-scm-native to make it right. Signed-off-by: Kai Kang --- ...he-setup_requires-for-setuptools-scm.patch | 36 --- .../python/python3-pytest_6.2.4.bb| 4 +-- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch diff --git a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch deleted file mode 100644 index 1abd531c62..00 --- a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001 -From: Yuan Chao -Date: Wed, 28 Aug 2019 16:12:27 +0900 -Subject: [PATCH] setup.py: remove the setup_requires for setuptools-scm - -The setup_requires argument forces the download of the egg file for setuptools-scm -during the do_compile phase. This download is incompatible with the typical fetch -and mirror structure. The only usage of scm is the generation of the _version.py -file and in the release tarball it is already correctly created - Recipes should not be downloading during do_compile. We need to fix this in some other way, we can't just remove the patch. Cheers, Richard Hi Richard, It calls pip to download the egg file for setuptools-scm. But pip is not a dependency and does not exist in sysroot, so it fails when remove the patch and "python3-setuptools-scm-native" is not a dependency: | DEBUG: Executing shell function do_compile | WARNING: The wheel package is not available. | /buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/bin/python3-native/pytho n3: No module named pip | Traceback (most recent call last): | File "/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/lib/python3.9/si te-packages/setuptools/installer.py", line 75, in fetch_build_egg | subprocess.check_call(cmd) | File "/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-sysroot-native/usr/lib/python3.9/su bprocess.py", line 373, in check_call | raise CalledProcessError(retcode, cmd) | subprocess.CalledProcessError: Command '['/buildarea6/kkang/Yocto/build-qemux86/tmp/work/core2-64-poky-linux/python3-pytest/6.2.4-r0/recipe-s ysroot-native/usr/bin/python3-native/python3', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/tmp/tmpovfcfgaq', '--q uiet', 'setuptools-scm>=3.4']' returned non-zero exit status 1. After add "python3-setuptools-scm-native" to dependency, it meets the requirement in setup.cfg: setuptools-scm>=3.4 then it does not call pip anymore to download any file. Regards, -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154269): https://lists.openembedded.org/g/openembedded-core/message/154269 Mute This Topic: https://lists.openembedded.org/mt/84543785/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 2/2] convert-overrides.py: allow specifying multiple target dirs
Signed-off-by: Martin Jansa
---
scripts/contrib/convert-overrides.py | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/scripts/contrib/convert-overrides.py
b/scripts/contrib/convert-overrides.py
index 739fd53bdb..bfdf785719 100755
--- a/scripts/contrib/convert-overrides.py
+++ b/scripts/contrib/convert-overrides.py
@@ -23,12 +23,10 @@ import tempfile
import shutil
import mimetypes
-if len(sys.argv) != 2:
+if len(sys.argv) < 2:
print("Please specify a directory to run the conversion script against.")
sys.exit(1)
-targetdir = sys.argv[1]
-
# List of strings to treat as overrides
vars = ["append", "prepend", "remove"]
vars = vars + ["qemuarm", "qemux86", "qemumips", "qemuppc", "qemuriscv",
"qemuall"]
@@ -125,15 +123,17 @@ def processfile(fn):
ourname = os.path.basename(sys.argv[0])
ourversion = "0.9.1"
-for root, dirs, files in os.walk(targetdir):
- for name in files:
- if name == ourname:
- continue
- fn = os.path.join(root, name)
- if os.path.islink(fn):
- continue
- if "/.git/" in fn or fn.endswith(".html") or fn.endswith(".patch") or
fn.endswith(".m4") or fn.endswith(".diff"):
- continue
- processfile(fn)
+for targetdir in sys.argv[1:]:
+print("processing directory '%s'" % targetdir)
+for root, dirs, files in os.walk(targetdir):
+for name in files:
+if name == ourname:
+continue
+fn = os.path.join(root, name)
+if os.path.islink(fn):
+continue
+if "/.git/" in fn or fn.endswith(".html") or fn.endswith(".patch")
or fn.endswith(".m4") or fn.endswith(".diff"):
+continue
+processfile(fn)
print("All files processed with version %s" % ourversion)
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154268):
https://lists.openembedded.org/g/openembedded-core/message/154268
Mute This Topic: https://lists.openembedded.org/mt/84547388/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 1/2] convert-overrides.py: 0.9.1 include '(' as delimiter for shortvars
Signed-off-by: Martin Jansa
---
scripts/contrib/convert-overrides.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/contrib/convert-overrides.py
b/scripts/contrib/convert-overrides.py
index 057758f1bb..739fd53bdb 100755
--- a/scripts/contrib/convert-overrides.py
+++ b/scripts/contrib/convert-overrides.py
@@ -74,7 +74,7 @@ for exp in vars:
shortvars_re = {}
for exp in shortvars:
-shortvars_re[exp] = (re.compile('((^|[\'"\s])[A-Za-z0-9_\-:${}]+)_' + exp
+ '([\'"\s:])'), r"\1:" + exp + r"\3")
+shortvars_re[exp] = (re.compile('((^|[\'"\s])[A-Za-z0-9_\-:${}]+)_' + exp
+ '([\(\'"\s:])'), r"\1:" + exp + r"\3")
package_re = {}
for exp in packagevars:
@@ -123,7 +123,7 @@ def processfile(fn):
pass
ourname = os.path.basename(sys.argv[0])
-ourversion = "0.9.0"
+ourversion = "0.9.1"
for root, dirs, files in os.walk(targetdir):
for name in files:
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154267):
https://lists.openembedded.org/g/openembedded-core/message/154267
Mute This Topic: https://lists.openembedded.org/mt/84547387/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] python3-pytest: fix display version info
On Fri, 2021-07-30 at 11:38 +0800, kai wrote: > From: Kai Kang > > It does not show correct version info of python3-pytest by: > > $ pip3 list | grep pytest > pytest 0.0.0 > > Remove 0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch > and depends on python3-setuptools-scm-native to make it right. > > Signed-off-by: Kai Kang > --- > ...he-setup_requires-for-setuptools-scm.patch | 36 --- > .../python/python3-pytest_6.2.4.bb| 4 +-- > 2 files changed, 2 insertions(+), 38 deletions(-) > delete mode 100644 > meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch > > diff --git > a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch > > b/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch > deleted file mode 100644 > index 1abd531c62..00 > --- > a/meta/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -From ead04f2da75efeca3369feff6161ea4a8baecbc9 Mon Sep 17 00:00:00 2001 > -From: Yuan Chao > -Date: Wed, 28 Aug 2019 16:12:27 +0900 > -Subject: [PATCH] setup.py: remove the setup_requires for setuptools-scm > - > -The setup_requires argument forces the download of the egg file for > setuptools-scm > -during the do_compile phase. This download is incompatible with the typical > fetch > -and mirror structure. The only usage of scm is the generation of the > _version.py > -file and in the release tarball it is already correctly created > - Recipes should not be downloading during do_compile. We need to fix this in some other way, we can't just remove the patch. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154266): https://lists.openembedded.org/g/openembedded-core/message/154266 Mute This Topic: https://lists.openembedded.org/mt/84543785/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 0/4] yocto-check-layer: add support to check for dependencies
On Fri, 2021-07-30 at 11:08 +0200, Nicolas Dechesne wrote: > > > On Fri, Jul 30, 2021 at 10:03 AM Richard Purdie > wrote: > > On Thu, 2021-07-22 at 14:46 +0200, Nicolas Dechesne wrote: > > > It has been recentely mentioned to me by the YP TSC that a layer must > > > not only pass the yocto-check-layer script, but also all its > > > dependencies. These patches add support for testing dependencies > > > automatically. > > > > > > Patch #1 and #3 are not much related, but improvements I made along > > > the lines. > > > > > > Patch #2 split the internal function into 2 parts, so that we can get > > > the list of dependencies from the main script. > > > > > > Patch #4 is where the processing of the dependencies is done. I chose > > > to enable checking the dependencies by default, and use > > > '--no-auto-dependency' to disable it, we could decide the other way > > > around. For any dependency of the 'layers under test' we will simply > > > add them to the list of layers to test unless they are already there. > > > > > > Here is a sample output with these changes: > > > > > > $ yocto-check-layer /work/oe/sources/meta-aws \ > > > --dependency /work/oe/sources/meta-openembedded/ > > > > > > INFO: Summary of results: > > > INFO: > > > INFO: meta-aws ... PASS > > > INFO: meta-python ... PASS > > > INFO: meta-oe ... PASS > > > INFO: meta-networking ... PASS > > > > We merged this but have started seeing: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/121/builds/166 > > > > which seems a little strange and is probably related to this series. > > > > > yes, it's related. > > ... > INFO: Adding meta-poky to the list of layers to test, as a dependency > ... > INFO: meta-poky ... SKIPPED (Layer under test should not present in BBLAYERS) > > With these changes, we are now adding all dependencies and trying to test > them too. But meta-poky seems to > be in bblayers.conf, and yocto-check-layer won't work since it needs to > compute all checksum *without* the > layer in the config first. > > It is probably a good idea to make sure bblayers only has oe-core when we try > to perform YP compat. > Alternatively, as discussed, we use --no-auto-dependency on AB.. Fair enough, I'll update the config to do that. Cheers, Richard > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154265): https://lists.openembedded.org/g/openembedded-core/message/154265 Mute This Topic: https://lists.openembedded.org/mt/84377963/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 2/2] convert-overrides.py: remove base_dep_prepend and autotools_dep_prepend exception
* the functions were renamed in:
https://git.openembedded.org/openembedded-core/commit/?id=9d002acae720b0a8e96a6734424a142b86880461
Signed-off-by: Martin Jansa
---
scripts/contrib/convert-overrides.py | 6 --
1 file changed, 6 deletions(-)
diff --git a/scripts/contrib/convert-overrides.py
b/scripts/contrib/convert-overrides.py
index 68ae356083..057758f1bb 100755
--- a/scripts/contrib/convert-overrides.py
+++ b/scripts/contrib/convert-overrides.py
@@ -102,12 +102,6 @@ def processfile(fn):
skip = True
if "ptest_append" in line or "ptest_remove" in
line or "ptest_prepend" in line:
skip = False
-if "base_dep_prepend" in line and
line.startswith("BASEDEPENDS_class"):
-line = line.replace("BASEDEPENDS_class",
"BASEDEPENDS:class")
-skip = True
-if "autotools_dep_prepend" in line and
line.startswith("DEPENDS_prepend"):
-line = line.replace("DEPENDS_prepend",
"DEPENDS:prepend")
-skip = True
for sub in subs:
if sub in line:
line = line.replace(sub, subs[sub])
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154264):
https://lists.openembedded.org/g/openembedded-core/message/154264
Mute This Topic: https://lists.openembedded.org/mt/84546901/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 1/2] convert-overrides.py: show processed file and version of this script
* on bigger layer this script takes couple minutes without showing any progress
* add a version to reference it in the conversion commit (to easily figure out
if it's worth re-converting the layer).
Signed-off-by: Martin Jansa
---
scripts/contrib/convert-overrides.py | 4
1 file changed, 4 insertions(+)
diff --git a/scripts/contrib/convert-overrides.py
b/scripts/contrib/convert-overrides.py
index 499852bd26..68ae356083 100755
--- a/scripts/contrib/convert-overrides.py
+++ b/scripts/contrib/convert-overrides.py
@@ -90,6 +90,7 @@ subs = {
}
def processfile(fn):
+print("processing file '%s'" % fn)
try:
fh, abs_path = tempfile.mkstemp()
with os.fdopen(fh, 'w') as new_file:
@@ -128,6 +129,7 @@ def processfile(fn):
pass
ourname = os.path.basename(sys.argv[0])
+ourversion = "0.9.0"
for root, dirs, files in os.walk(targetdir):
for name in files:
@@ -139,3 +141,5 @@ for root, dirs, files in os.walk(targetdir):
if "/.git/" in fn or fn.endswith(".html") or fn.endswith(".patch") or
fn.endswith(".m4") or fn.endswith(".diff"):
continue
processfile(fn)
+
+print("All files processed with version %s" % ourversion)
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154263):
https://lists.openembedded.org/g/openembedded-core/message/154263
Mute This Topic: https://lists.openembedded.org/mt/84546899/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 0/4] yocto-check-layer: add support to check for dependencies
On Fri, Jul 30, 2021 at 10:03 AM Richard Purdie < richard.pur...@linuxfoundation.org> wrote: > On Thu, 2021-07-22 at 14:46 +0200, Nicolas Dechesne wrote: > > It has been recentely mentioned to me by the YP TSC that a layer must > > not only pass the yocto-check-layer script, but also all its > > dependencies. These patches add support for testing dependencies > > automatically. > > > > Patch #1 and #3 are not much related, but improvements I made along > > the lines. > > > > Patch #2 split the internal function into 2 parts, so that we can get > > the list of dependencies from the main script. > > > > Patch #4 is where the processing of the dependencies is done. I chose > > to enable checking the dependencies by default, and use > > '--no-auto-dependency' to disable it, we could decide the other way > > around. For any dependency of the 'layers under test' we will simply > > add them to the list of layers to test unless they are already there. > > > > Here is a sample output with these changes: > > > > $ yocto-check-layer /work/oe/sources/meta-aws \ > > --dependency /work/oe/sources/meta-openembedded/ > > > > INFO: Summary of results: > > INFO: > > INFO: meta-aws ... PASS > > INFO: meta-python ... PASS > > INFO: meta-oe ... PASS > > INFO: meta-networking ... PASS > > We merged this but have started seeing: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/121/builds/166 > > which seems a little strange and is probably related to this series. > yes, it's related. ... INFO: Adding meta-poky to the list of layers to test, as a dependency ... INFO: meta-poky ... SKIPPED (Layer under test should not present in BBLAYERS) With these changes, we are now adding all dependencies and trying to test them too. But meta-poky seems to be in bblayers.conf, and yocto-check-layer won't work since it needs to compute all checksum *without* the layer in the config first. It is probably a good idea to make sure bblayers only has oe-core when we try to perform YP compat. Alternatively, as discussed, we use --no-auto-dependency on AB.. > > Cheers, > > Richard > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154262): https://lists.openembedded.org/g/openembedded-core/message/154262 Mute This Topic: https://lists.openembedded.org/mt/84377963/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 v3 2/8] overlayfs.bbclass: generate overlayfs mount units
On Fri, 2021-07-30 at 07:14 +0200, Vyacheslav Yurkov wrote:
> Sorry for the late response. Do you mean to move only helper functions
> to meta/lib/oe, right?
Correct, yes. The things being defined as "def ".
> By variable dependencies you mean that bitbake would not pick up meta
> data changes automatically?
I mean that if a function is something like:
def function(d):
d.getVar("VAR")
it will no longer magically depend on the variable VAR.
> I will try to move common parts to meta/lib/oe then and send a v4
Thanks!
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154261):
https://lists.openembedded.org/g/openembedded-core/message/154261
Mute This Topic: https://lists.openembedded.org/mt/84233761/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 0/4] yocto-check-layer: add support to check for dependencies
On Thu, 2021-07-22 at 14:46 +0200, Nicolas Dechesne wrote: > It has been recentely mentioned to me by the YP TSC that a layer must > not only pass the yocto-check-layer script, but also all its > dependencies. These patches add support for testing dependencies > automatically. > > Patch #1 and #3 are not much related, but improvements I made along > the lines. > > Patch #2 split the internal function into 2 parts, so that we can get > the list of dependencies from the main script. > > Patch #4 is where the processing of the dependencies is done. I chose > to enable checking the dependencies by default, and use > '--no-auto-dependency' to disable it, we could decide the other way > around. For any dependency of the 'layers under test' we will simply > add them to the list of layers to test unless they are already there. > > Here is a sample output with these changes: > > $ yocto-check-layer /work/oe/sources/meta-aws \ > --dependency /work/oe/sources/meta-openembedded/ > > INFO: Summary of results: > INFO: > INFO: meta-aws ... PASS > INFO: meta-python ... PASS > INFO: meta-oe ... PASS > INFO: meta-networking ... PASS We merged this but have started seeing: https://autobuilder.yoctoproject.org/typhoon/#/builders/121/builds/166 which seems a little strange and is probably related to this series. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154260): https://lists.openembedded.org/g/openembedded-core/message/154260 Mute This Topic: https://lists.openembedded.org/mt/84377963/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
