[OE-core] [PATCH] libglu: Remove deprecated register in C++17
Signed-off-by: Khem Raj
---
...1-Remove-deprecated-register-in-C-17.patch | 32 +++
meta/recipes-graphics/mesa/libglu_9.0.2.bb| 4 ++-
2 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch
diff --git
a/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch
b/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch
new file mode 100644
index 00..95d56e9573
--- /dev/null
+++
b/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch
@@ -0,0 +1,32 @@
+From 1910b3a83a7e5aa1a31c4325829c94134fafce76 Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Fri, 13 Jan 2023 20:58:07 -0800
+Subject: [PATCH] Remove deprecated register in C++17
+
+Fixes errors like
+
+src/libnurbs/internals/varray.cc:76:5: error: ISO C++17 does not allow
'register' storage class specifier [-Wregister]
+register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]);
+^
+
+Upstream-Status: Submitted
[https://gitlab.freedesktop.org/mesa/glu/-/merge_requests/10]
+Signed-off-by: Khem Raj
+---
+ src/libnurbs/internals/varray.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libnurbs/internals/varray.cc
b/src/libnurbs/internals/varray.cc
+index 1cb2354..41b3b18 100644
+--- a/src/libnurbs/internals/varray.cc
b/src/libnurbs/internals/varray.cc
+@@ -73,8 +73,8 @@ Varray::~Varray( void )
+ inline void
+ Varray::update( Arc_ptr arc, long dir[2], REAL val )
+ {
+-register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]);
+-register long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]);
++long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]);
++long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]);
+
+ if( dir[0] != ds || dir[1] != dt ) {
+ dir[0] = ds;
diff --git a/meta/recipes-graphics/mesa/libglu_9.0.2.bb
b/meta/recipes-graphics/mesa/libglu_9.0.2.bb
index 0d27dd116b..525d631611 100644
--- a/meta/recipes-graphics/mesa/libglu_9.0.2.bb
+++ b/meta/recipes-graphics/mesa/libglu_9.0.2.bb
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM =
"file://include/GL/glu.h;endline=29;md5=6b79c570f644363b35645
# Epoch as this used to be part of mesa
PE = "2"
-SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz;
+SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz \
+ file://0001-Remove-deprecated-register-in-C-17.patch \
+ "
SRC_URI[sha256sum] =
"24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65"
--
2.39.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175849):
https://lists.openembedded.org/g/openembedded-core/message/175849
Mute This Topic: https://lists.openembedded.org/mt/96262544/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] createrepo-c: Include missing rpm/rpmstring.h
Signed-off-by: Khem Raj --- .../0001-include-rpm-rpmstring.h.patch| 27 +++ .../createrepo-c/createrepo-c_0.20.1.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta/recipes-devtools/createrepo-c/createrepo-c/0001-include-rpm-rpmstring.h.patch diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-include-rpm-rpmstring.h.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-include-rpm-rpmstring.h.patch new file mode 100644 index 00..a249eaf5a1 --- /dev/null +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-include-rpm-rpmstring.h.patch @@ -0,0 +1,27 @@ +From 8defe6aaf91613c3fcb540df65a94cd56d377367 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 13 Jan 2023 13:21:51 -0800 +Subject: [PATCH 1/2] include rpm/rpmstring.h + +Its needed for rasprintf declaration + +Fixes +src/xml_file.c:341:36: error: call to undeclared functi +on 'rasprintf'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + +Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/340] +Signed-off-by: Khem Raj +--- + src/xml_file.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/xml_file.c b/src/xml_file.c +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include + #include "xml_file.h" + #include diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb index d309bb895f..053198ca5e 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.20.1.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ + file://0001-include-rpm-rpmstring.h.patch \ " SRCREV = "af14e164a3e4ab9dfaef1212e852b9ecebc326a2" -- 2.39.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175848): https://lists.openembedded.org/g/openembedded-core/message/175848 Mute This Topic: https://lists.openembedded.org/mt/96262380/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] gstreamer1.0-plugins-good: Fix libsoup runtime dependency
The runtime dependency on libsoup set via PACKAGECONFIG does not work.
The problem is the dependency is placed on the main package, but the
soup package has no dependency on the main package.
I considered modifying the call to do_split_packages from
gstreamer1.0-plugins-packaging.inc, changing extra_depends from '' to
None:
```
extra_depends -- extra runtime dependencies (RDEPENDS) to be set for
all packages. The default value of None causes a
dependency on the main package (${PN}) - if you do
not want this, pass '' for this parameter.
```
However, the problem with this solution is that it does add the runtime
dependency to _all_ such split packages.
So, fix the problem with an explicit runtime dependency.
Signed-off-by: Tom Hochstein
---
.../gstreamer/gstreamer1.0-plugins-good_1.20.5.bb | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb
index f7ade89ef8..ed48c57311 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.5.bb
@@ -19,6 +19,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
DEPENDS += "gstreamer1.0-plugins-base libcap zlib"
RPROVIDES:${PN}-pulseaudio += "${PN}-pulse"
RPROVIDES:${PN}-soup += "${PN}-souphttpsrc"
+RDEPENDS:${PN}-soup += "${@bb.utils.contains('PACKAGECONFIG', 'soup2',
'libsoup-2.4', 'libsoup', d)}"
PACKAGECONFIG_SOUP ?= "soup3"
@@ -52,13 +53,8 @@ PACKAGECONFIG[libv4l2]=
"-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-
PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123"
PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
PACKAGECONFIG[qt5]= "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative
qtbase-native ${QT5WAYLANDDEPENDS}"
-# Starting with version 1.20, the GStreamer soup plugin loads libsoup with
dlopen()
-# instead of linking to it. And instead of using the default libsoup C
headers, it
-# uses its own stub header. Consequently, objdump will not show the libsoup
.so as
-# a dependency, and libsoup won't be added to an image. Fix this by setting
libsoup
-# as RDEPEND.
-PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,libsoup-2.4,,soup3"
-PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,libsoup,,soup2"
+PACKAGECONFIG[soup2] = "-Dsoup=enabled,soup3"
+PACKAGECONFIG[soup3] = "-Dsoup=enabled,soup2"
PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex"
PACKAGECONFIG[rpi]= "-Drpicamsrc=enabled,-Drpicamsrc=disabled,userland"
PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175847):
https://lists.openembedded.org/g/openembedded-core/message/175847
Mute This Topic: https://lists.openembedded.org/mt/96257892/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] package_rpm: allow arch overriding
On Fri, 13 Jan 2023 at 17:01, Sergey Zhmylev wrote: > There are a lot of useful tools in this huge world of enterprise-level > distros, especially all those staff related to static security > scans/audit and around SBOM collection and processing. Those tools > rely on some basic rules of rpm naming for their analysis and do not > handle architectures like "genericx86_64". Can you list the tools please? Are they under open source licenses? What do they do that Yocto doesn't yet offer? Yocto does CVE scans, and SBOM generation as well, so what is it that is missing? It also goes both ways: you can figure out why the tools do not handle architectures in a generic way and submit a patch to respective upstreams so that they do. 'Enterprise-level distros' means vendor lock-in and expensive subscription fees. Precisely the thing that most or all of us here do not want. Yes, we are not mature. Alex - -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175846): https://lists.openembedded.org/g/openembedded-core/message/175846 Mute This Topic: https://lists.openembedded.org/mt/96233100/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] rust-bin.bbclass: remove unused class
From: Michael Opdenacker
Signed-off-by: Michael Opdenacker
---
meta/classes-recipe/rust-bin.bbclass | 154 ---
1 file changed, 154 deletions(-)
delete mode 100644 meta/classes-recipe/rust-bin.bbclass
diff --git a/meta/classes-recipe/rust-bin.bbclass
b/meta/classes-recipe/rust-bin.bbclass
deleted file mode 100644
index b8e7ef8191..00
--- a/meta/classes-recipe/rust-bin.bbclass
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# Copyright OpenEmbedded Contributors
-#
-# SPDX-License-Identifier: MIT
-#
-
-inherit rust
-
-RDEPENDS:${PN}:append:class-target = " ${RUSTLIB_DEP}"
-
-RUSTC_ARCHFLAGS += "-C opt-level=3 -g -L ${STAGING_DIR_HOST}/${rustlibdir} -C
linker=${RUST_TARGET_CCLD}"
-EXTRA_OEMAKE += 'RUSTC_ARCHFLAGS="${RUSTC_ARCHFLAGS}"'
-
-# Some libraries alias with the standard library but libstd is configured to
-# make it difficult or imposisble to use its version. Unfortunately libstd
-# must be explicitly overridden using extern.
-OVERLAP_LIBS = "\
-libc \
-log \
-getopts \
-rand \
-"
-def get_overlap_deps(d):
-deps = d.getVar("DEPENDS").split()
-overlap_deps = []
-for o in d.getVar("OVERLAP_LIBS").split():
-l = len([o for dep in deps if (o + '-rs' in dep)])
-if l > 0:
-overlap_deps.append(o)
-return " ".join(overlap_deps)
-OVERLAP_DEPS = "${@get_overlap_deps(d)}"
-
-# Prevents multiple static copies of standard library modules
-# See https://github.com/rust-lang/rust/issues/19680
-RUSTC_PREFER_DYNAMIC = "-C prefer-dynamic"
-RUSTC_FLAGS += "${RUSTC_PREFER_DYNAMIC}"
-
-CRATE_NAME ?= "${@d.getVar('BPN').replace('-rs', '').replace('-', '_')}"
-BINNAME ?= "${BPN}"
-LIBNAME ?= "lib${CRATE_NAME}-rs"
-CRATE_TYPE ?= "dylib"
-BIN_SRC ?= "${S}/src/main.rs"
-LIB_SRC ?= "${S}/src/lib.rs"
-
-rustbindest ?= "${bindir}"
-rustlibdest ?= "${rustlibdir}"
-RUST_RPATH_ABS ?= "${rustlibdir}:${rustlib}"
-
-def relative_rpaths(paths, base):
-relpaths = set()
-for p in paths.split(':'):
-if p == base:
-relpaths.add('$ORIGIN')
-continue
-relpaths.add(os.path.join('$ORIGIN', os.path.relpath(p, base)))
-return '-rpath=' + ':'.join(relpaths) if len(relpaths) else ''
-
-RUST_LIB_RPATH_FLAGS ?= "${@relative_rpaths(d.getVar('RUST_RPATH_ABS', True),
d.getVar('rustlibdest', True))}"
-RUST_BIN_RPATH_FLAGS ?= "${@relative_rpaths(d.getVar('RUST_RPATH_ABS', True),
d.getVar('rustbindest', True))}"
-
-def libfilename(d):
-if d.getVar('CRATE_TYPE', True) == 'dylib':
-return d.getVar('LIBNAME', True) + '.so'
-else:
-return d.getVar('LIBNAME', True) + '.rlib'
-
-def link_args(d, bin):
-linkargs = []
-if bin:
-rpaths = d.getVar('RUST_BIN_RPATH_FLAGS', False)
-else:
-rpaths = d.getVar('RUST_LIB_RPATH_FLAGS', False)
-if d.getVar('CRATE_TYPE', True) == 'dylib':
-linkargs.append('-soname')
-linkargs.append(libfilename(d))
-if len(rpaths):
-linkargs.append(rpaths)
-if len(linkargs):
-return ' '.join(['-Wl,' + arg for arg in linkargs])
-else:
-return ''
-
-get_overlap_externs () {
-externs=
-for dep in ${OVERLAP_DEPS}; do
-extern=$(ls ${STAGING_DIR_HOST}/${rustlibdir}/lib$dep-rs.{so,rlib}
2>/dev/null \
-| awk '{print $1}');
-if [ -n "$extern" ]; then
-externs="$externs --extern $dep=$extern"
-else
-echo "$dep in depends but no such library found in ${rustlibdir}!"
>&2
-exit 1
-fi
-done
-echo "$externs"
-}
-
-do_configure () {
-}
-
-oe_runrustc () {
- bbnote ${RUSTC} ${RUSTC_ARCHFLAGS} ${RUSTC_FLAGS} "$@"
- "${RUSTC}" ${RUSTC_ARCHFLAGS} ${RUSTC_FLAGS} "$@"
-}
-
-oe_compile_rust_lib () {
-rm -rf ${LIBNAME}.{rlib,so}
-local -a link_args
-if [ -n '${@link_args(d, False)}' ]; then
-link_args[0]='-C'
-link_args[1]='link-args=${@link_args(d, False)}'
-fi
-oe_runrustc $(get_overlap_externs) \
-"${link_args[@]}" \
-${LIB_SRC} \
--o ${@libfilename(d)} \
---crate-name=${CRATE_NAME} --crate-type=${CRATE_TYPE} \
-"$@"
-}
-oe_compile_rust_lib[vardeps] += "get_overlap_externs"
-
-oe_compile_rust_bin () {
-rm -rf ${BINNAME}
-local -a link_args
-if [ -n '${@link_args(d, True)}' ]; then
-link_args[0]='-C'
-link_args[1]='link-args=${@link_args(d, True)}'
-fi
-oe_runrustc $(get_overlap_externs) \
-"${link_args[@]}" \
-${BIN_SRC} -o ${BINNAME} "$@"
-}
-oe_compile_rust_bin[vardeps] += "get_overlap_externs"
-
-oe_install_rust_lib () {
-for lib in $(ls ${LIBNAME}.{so,rlib} 2>/dev/null); do
-echo Installing $lib
-install -D -m 755 $lib ${D}/${rustlibdest}/$lib
-done
-}
-
-oe_install_rust_bin () {
-echo Installing ${BINNAME}
-install -D -m 755 ${BINNAME} ${D}/${rustbindest}/${BINNAME}
-}
-
-do_rust_bin_fixups() {
-for f in `find ${PKGD} -name
[OE-core] [PATCH] cve-update-db-native: show IP on failure
We get random SSL failures when fetching the CVE database, and it's
notable that the NVD server is behind a DNS round-robin or geographically
diverse servers.
On a hunch that there is one misconfigured server, dump the IP that we
connected to.
Signed-off-by: Ross Burton
---
meta/recipes-core/meta/cve-update-db-native.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb
b/meta/recipes-core/meta/cve-update-db-native.bb
index 079f062f79b..e042e67b09a 100644
--- a/meta/recipes-core/meta/cve-update-db-native.bb
+++ b/meta/recipes-core/meta/cve-update-db-native.bb
@@ -130,7 +130,10 @@ def update_db_file(db_tmp_file, d):
response = urllib.request.urlopen(meta_url,
timeout=cve_socket_timeout)
except urllib.error.URLError as e:
cve_f.write('Warning: CVE db update error, Unable to fetch CVE
data.\n\n')
-bb.warn("Failed to fetch CVE data (%s)" % e.reason)
+bb.warn("Failed to fetch CVE data (%s)" % e)
+import socket
+result = socket.getaddrinfo("nvd.nist.gov", 443,
proto=socket.IPPROTO_TCP)
+bb.warn("Host IPs are %s" % (", ".join(t[4][0] for t in
result)))
return False
if response:
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175844):
https://lists.openembedded.org/g/openembedded-core/message/175844
Mute This Topic: https://lists.openembedded.org/mt/96250646/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] Is rust-bin.bbclass still in use?
On 13.01.23 at 18:06, Alex Kiernan wrote: Nothing I know of - I suspect it wants deleting. Thanks for the quick answer. I'll send such a patch. Cheers Michael. -- Michael Opdenacker, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175843): https://lists.openembedded.org/g/openembedded-core/message/175843 Mute This Topic: https://lists.openembedded.org/mt/96250144/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] Is rust-bin.bbclass still in use?
Nothing I know of - I suspect it wants deleting. On Fri, Jan 13, 2023 at 4:55 PM Michael Opdenacker via lists.openembedded.org wrote: > > Greetings, > > I can't find any use of the rust-bin class, neither in oe-core, nor in > Poky, nor in meta-oe? > > Is it still in use anywhere? > > Cheers > Michael. > > -- > Michael Opdenacker, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > > > > -- Alex Kiernan -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175842): https://lists.openembedded.org/g/openembedded-core/message/175842 Mute This Topic: https://lists.openembedded.org/mt/96250144/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] quilt: rewrite ptest glue
The ptest glue was overly complex. Not as many files are needed to be
installed if we tell it to use the system's quilt tools, there's no
need for a custom Makefile just to set some environment variables, and
/usr/bin/ed doesn't appear to be used at all.
Signed-off-by: Ross Burton
---
meta/recipes-devtools/quilt/quilt.inc | 28 -
meta/recipes-devtools/quilt/quilt/Makefile | 14 ---
meta/recipes-devtools/quilt/quilt/run-ptest | 7 +++---
meta/recipes-devtools/quilt/quilt/test.sh | 25 +-
4 files changed, 38 insertions(+), 36 deletions(-)
delete mode 100644 meta/recipes-devtools/quilt/quilt/Makefile
diff --git a/meta/recipes-devtools/quilt/quilt.inc
b/meta/recipes-devtools/quilt/quilt.inc
index ec69705093b..b4284dcafb3 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
file://run-ptest \
-file://Makefile \
file://test.sh \
file://0001-tests-Allow-different-output-from-mv.patch \
file://fix-grep-3.8.patch \
@@ -61,17 +60,12 @@ do_install:append:class-native () {
touch ${D}${sysconfdir}/quiltrc
}
-do_compile_ptest() {
- oe_runmake bin/patch-wrapper test/.depend
-}
-
do_install_ptest() {
- tar -c --exclude=\*.in bin/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
- tar -c --exclude=\*.in compat/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
- tar -c --exclude=\*.in quilt/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
- tar -c --exclude=mail.test --exclude=delete.test test/ | ( cd
${D}${PTEST_PATH} && tar -xf - && chmod 777 test)
- cp ${WORKDIR}/Makefile ${D}${PTEST_PATH}
- cp ${WORKDIR}/test.sh ${D}${PTEST_PATH}
+ install ${WORKDIR}/test.sh ${D}${PTEST_PATH}
+mkdir ${D}${PTEST_PATH}/test
+install ${S}/test/* ${D}${PTEST_PATH}/test
+# mail needs a MTA, and the patch-wrapper is disabled
+rm -f ${D}${PTEST_PATH}/test/mail.test
${D}${PTEST_PATH}/test/patch-wrapper.test
}
PACKAGES += "guards guards-doc"
@@ -85,9 +79,9 @@ FILES:guards-doc = "${mandir}/man1/guards.1"
RDEPENDS:${PN} = "bash patch diffstat bzip2 util-linux less"
RDEPENDS:${PN}:class-native = "diffstat-native patch-native bzip2-native"
-RDEPENDS:${PN}-ptest = "make file sed gawk diffutils findutils ed perl \
-perl-module-filehandle perl-module-getopt-std \
-perl-module-posix perl-module-file-temp \
-perl-module-text-parsewords perl-module-overloading \
-bash util-linux-getopt patch \
- "
+RDEPENDS:${PN}-ptest += "file sed gawk diffutils findutils ed perl \
+ perl-module-filehandle perl-module-getopt-std \
+ perl-module-posix perl-module-file-temp \
+ perl-module-text-parsewords perl-module-overloading \
+ bash util-linux-getopt \
+"
diff --git a/meta/recipes-devtools/quilt/quilt/Makefile
b/meta/recipes-devtools/quilt/quilt/Makefile
deleted file mode 100644
index 1f6cd2479ca..000
--- a/meta/recipes-devtools/quilt/quilt/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-PATH := $(CURDIR)/bin:$(CURDIR)/compat:$(PATH)
-QUILT_DIR :=$(CURDIR)/quilt
-QUILTRC := $(CURDIR)/test/test.quiltrc
-export QUILT_DIR QUILTRC
-CHECK_ENV := P=patches/; _P=../patches/; export P _P;
-CHECK_ENV += QUILT_PC=.pc; export QUILT_PC
--include test/.depend
-
-check-% : test/%.test
- @LANG=C; LC_ALL=C; \
- export LANG LC_ALL; \
- $(CHECK_ENV); \
- cd $(
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175840):
https://lists.openembedded.org/g/openembedded-core/message/175840
Mute This Topic: https://lists.openembedded.org/mt/96250167/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] quilt: fix intermittent failure in faildiff.test
This test assumes that if a child process writes one line to stderr and
then another line to stdout, and stderr is redirected to stdout, that
the order the lines will be read is stable.
This isn't the case and occasionally the lines will be read in a
different order. Change the test to ignore line ordering.
[ YOCTO #14469 ]
Signed-off-by: Ross Burton
---
meta/recipes-devtools/quilt/quilt.inc | 1 +
.../quilt/quilt/faildiff-order.patch | 28 +++
2 files changed, 29 insertions(+)
create mode 100644 meta/recipes-devtools/quilt/quilt/faildiff-order.patch
diff --git a/meta/recipes-devtools/quilt/quilt.inc
b/meta/recipes-devtools/quilt/quilt.inc
index b4284dcafb3..f7ff958103e 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -12,6 +12,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
file://test.sh \
file://0001-tests-Allow-different-output-from-mv.patch \
file://fix-grep-3.8.patch \
+file://faildiff-order.patch \
"
SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch"
diff --git a/meta/recipes-devtools/quilt/quilt/faildiff-order.patch
b/meta/recipes-devtools/quilt/quilt/faildiff-order.patch
new file mode 100644
index 000..40f3c2636a5
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/faildiff-order.patch
@@ -0,0 +1,28 @@
+This test assumes that two lines that are output on different streams (stdout
+and stderr) will be read in the same order, but thanks to buffering that may
not
+be the case.
+
+Change the expected lines to be regexs that each match both expected lines, so
+the test always works no matter the actual order the lines are read in.
+
+Bug filed at https://savannah.nongnu.org/bugs/index.php?63651 to discuss a
+proper solution.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton
+
+diff --git a/test/faildiff.test b/test/faildiff.test
+index 5afb8e3..5f32f71 100644
+--- a/test/faildiff.test
b/test/faildiff.test
+@@ -28,8 +28,8 @@ What happens on binary files?
+
+ $ printf "\\003\\000\\001" > test.bin
+ $ quilt diff -pab --no-index
+- >~ (Files|Binary files) a/test\.bin and b/test\.bin differ
+- > Diff failed on file 'test.bin', aborting
++ >~ (.*[Ff]iles a/test\.bin and b/test\.bin differ|Diff failed on file
'test.bin', aborting)
++ >~ (.*[Ff]iles a/test\.bin and b/test\.bin differ|Diff failed on file
'test.bin', aborting)
+ $ echo %{?}
+ > 1
+
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175841):
https://lists.openembedded.org/g/openembedded-core/message/175841
Mute This Topic: https://lists.openembedded.org/mt/96250168/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Is rust-bin.bbclass still in use?
Greetings, I can't find any use of the rust-bin class, neither in oe-core, nor in Poky, nor in meta-oe? Is it still in use anywhere? Cheers Michael. -- Michael Opdenacker, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175839): https://lists.openembedded.org/g/openembedded-core/message/175839 Mute This Topic: https://lists.openembedded.org/mt/96250144/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][langdale][PATCH v2 1/2] kernel-fitimage: Adjust order of dtb/dtbo files
Hi Richard, Alex,
Thanks for merging the patches in master. Can you merge these patches to
langdale release as well?
Thanks,
Sandeep
On 1/12/2023 7:19 PM, Gundlupet Raju, Sandeep wrote:
Hi Michael,
Any updates on patch merge?
Thanks,
Sandeep
On 1/8/2023 10:25 AM, sandeep.gundlupet-r...@amd.com wrote:
From: Sandeep Gundlupet Raju
The dtb files must be before the dtbo files, otherwise the overlays may
not be applied correctly.
From Bruce Ashfield:
We can split between dtbs and dtbos, they just need to be sorted
for reproducibility reasons.
Of course, this was only working by luck previously (before the
sort), since it has always been gathering dtbs and dtbo's with
find, depending on filesystem ordering for the order in the
fitimage).
Signed-off-by: Sandeep Gundlupet Raju
---
Changes in v2:
- Remove 2 loops and use single loop for dtb and dtbo with same logic.
---
meta/classes-recipe/kernel-fitimage.bbclass | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes-recipe/kernel-fitimage.bbclass
b/meta/classes-recipe/kernel-fitimage.bbclass
index 8ddebf8dd8..06cdc4f1ec 100644
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -546,10 +546,11 @@ fitimage_assemble() {
if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
dtbcount=1
- for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name
'*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do
+ for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name
'*.dtb' -printf '%P\n' | sort) \
+ $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtbo'
-printf '%P\n' | sort); do
DTB=$(echo "$DTB" | tr '/' '_')
- # Skip DTB if we've picked it up previously
+ # Skip DTB/DTBO if we've picked it up previously
echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
DTBS="$DTBS $DTB"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175838):
https://lists.openembedded.org/g/openembedded-core/message/175838
Mute This Topic: https://lists.openembedded.org/mt/96134986/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] package_rpm: allow arch overriding
On Fri, Jan 13, 2023 at 11:01 AM Sergey Zhmylev wrote: > > > > > What is the use-case for this level of control then, and why would it > > be specific to RPM? > > > > Despite Alexander's words about this document, most of (I suppose, > actually all) wide-used rpm-based distros use the same well-known rpm > packages naming convention: red hat, opensuse, centos, oracle > enterprise linux, fedora, ... > > There are a lot of useful tools in this huge world of enterprise-level > distros, especially all those staff related to static security > scans/audit and around SBOM collection and processing. Those tools > rely on some basic rules of rpm naming for their analysis and do not > handle architectures like "genericx86_64". You mean things that the Yocto Project does itself ? :) My humorous answer is on purpose. If there are gaps in the tooling, the project is interested in filing those gaps, and doing it in a way that anyone using the project could leverage. Not just the users of a specific packaging format. It isn't that we wouldn't want to enable that sort of tools / packaging capability, but if it opens us up to complexity or other issues down the road, it needs to be carefully considered. Which is what the questions in the thread are trying to determine. > > I.e. this level of control opens for us a tremendous window of > possibilities when our build pretends to be a mature distro. > FWIW. I would not characterize a distro created with the Yocto project as "immature". Cheers, Bruce > BR, Sergei > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175837): https://lists.openembedded.org/g/openembedded-core/message/175837 Mute This Topic: https://lists.openembedded.org/mt/96233100/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] package_rpm: allow arch overriding
> > What is the use-case for this level of control then, and why would it > be specific to RPM? > Despite Alexander's words about this document, most of (I suppose, actually all) wide-used rpm-based distros use the same well-known rpm packages naming convention: red hat, opensuse, centos, oracle enterprise linux, fedora, ... There are a lot of useful tools in this huge world of enterprise-level distros, especially all those staff related to static security scans/audit and around SBOM collection and processing. Those tools rely on some basic rules of rpm naming for their analysis and do not handle architectures like "genericx86_64". I.e. this level of control opens for us a tremendous window of possibilities when our build pretends to be a mature distro. BR, Sergei -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175836): https://lists.openembedded.org/g/openembedded-core/message/175836 Mute This Topic: https://lists.openembedded.org/mt/96233100/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] rm_work: adjust dependency to make do_rm_work_all depend on do_rm_work
Hi Chen,
Just for your information,
This patch introduces a regression that breaks the do_create_spdx tasks
when building with multiconfig machines.
I am investigating it more deeply and will come back with my findings.
Jose
Chen Qi escreveu no dia segunda, 5/12/2022 à(s)
04:59:
> For now, if we use rm_work and `bitbake core-image-minimal', some
> recipes' WORKDIRs are not cleaned up, e.g., makedevs-native.
>
> Adjust the dependency to make do_rm_work_all depend on do_rm_work
> to solve this problem.
>
> Below are the detailed explanation of why this would work.
>
> Without this patch, the dependency chain is like:
> [other deps] -> [do_rm_work] -+-> [do_build]
> |
> [do_rm_work_all] -+
>
> With this patch, the depedency chain is like:
> [other deps] -> [do_rm_work] -> [do_rm_work_all] -> [do_build]
>
> Such dependency chain adjustment fixes the issue because do_rm_work_all
> now depends on [other deps] and thus the [depends] of these [other deps].
> Take core-image-minimal as an example. Before this adjustment,
> do_rm_work_all does not have any relationship with do_rootfs, and we have
> do_rootfs[depends] += "makedevs-native:do_populate_sysroot ..."
> This essentially prevents 'recrdeptask' setting of do_rm_work_all extend
> to makedevs-native. With this patch, the do_rm_work_all now depends
> on do_rm_work which in turn depends on do_rootfs, and so do_rm_work_all's
> recrdeptask could have effect on makedevs-native.
>
> With this patch, all built recipes WORKDIR will be cleaned up with
> a few expected exceptions such as kernel and qemu-helper-native.
>
> Signed-off-by: Chen Qi
> ---
> meta/classes/rm_work.bbclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
> index 4121a13279..1f28bc7187 100644
> --- a/meta/classes/rm_work.bbclass
> +++ b/meta/classes/rm_work.bbclass
> @@ -180,7 +180,7 @@ python inject_rm_work() {
> # other recipes and thus will typically run much later than
> completion of
> # work in the recipe itself.
> # In practice, addtask() here merely updates the dependencies.
> -bb.build.addtask('do_rm_work', 'do_build', ' '.join(deps), d)
> +bb.build.addtask('do_rm_work', 'do_rm_work_all do_build', '
> '.join(deps), d)
>
> # Always update do_build_without_rm_work dependencies.
> bb.build.addtask('do_build_without_rm_work', '', ' '.join(deps), d)
> --
> 2.37.1
>
>
>
>
>
--
Best regards,
José Quaresma
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175835):
https://lists.openembedded.org/g/openembedded-core/message/175835
Mute This Topic: https://lists.openembedded.org/mt/95462765/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 5/7] python3-sphinxcontrib-applehelp: update 1.0.2 -> 1.0.3
Convert to flit, adjust pypi name.
Signed-off-by: Alexander Kanavin
---
...lp_1.0.2.bb => python3-sphinxcontrib-applehelp_1.0.3.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python3-sphinxcontrib-applehelp_1.0.2.bb
=> python3-sphinxcontrib-applehelp_1.0.3.bb} (62%)
diff --git
a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.2.bb
b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb
similarity index 62%
rename from
meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.2.bb
rename to meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb
index cde0da8265..c97d204c06 100644
--- a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.2.bb
+++ b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb
@@ -3,10 +3,10 @@ HOMEPAGE = "https://www.sphinx-doc.org;
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c7715857042d4c8c0105999ca0c072c5"
-SRC_URI[sha256sum] =
"a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"
+SRC_URI[sha256sum] =
"83749f09f6ac843b8cb685277dbc818a8bf2d76cc19602699094fe9a74db529e"
-PYPI_PACKAGE = "sphinxcontrib-applehelp"
+PYPI_PACKAGE = "sphinxcontrib.applehelp"
-inherit pypi setuptools3
+inherit pypi python_flit_core
BBCLASSEXTEND = "native nativesdk"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175832):
https://lists.openembedded.org/g/openembedded-core/message/175832
Mute This Topic: https://lists.openembedded.org/mt/96247132/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/7] gdk-pixbuf: remove ptest support
Moving to x86-64-v3 instructions revealed that the recipe was doing an entirely
incorrect thing: running native gdk-pixbuf-query-loaders executable against the
target set
of loader .so binaries. This worked, but only by coincidence, and no longer
works on build hosts that do not support v3 instructions.
Re-enabling installed tests in a cross compile scenario requires a complete
re-think (against the need to run gdk-pixbuf executables to produce the tests),
and is best done upstream, so sadly the cross-testing has to be dropped
for now.
Signed-off-by: Alexander Kanavin
---
.../distro/include/ptest-packagelists.inc | 1 -
.../0001-Add-use_prebuilt_tools-option.patch | 173 --
.../gdk-pixbuf/gdk-pixbuf_2.42.10.bb | 30 +--
3 files changed, 3 insertions(+), 201 deletions(-)
delete mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch
diff --git a/meta/conf/distro/include/ptest-packagelists.inc
b/meta/conf/distro/include/ptest-packagelists.inc
index 48dec07577..32c341a9bc 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -20,7 +20,6 @@ PTESTS_FAST = "\
flex-ptest \
gawk-ptest \
gdbm-ptest \
-gdk-pixbuf-ptest \
glib-networking-ptest \
gzip-ptest \
json-c-ptest \
diff --git
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch
deleted file mode 100644
index 02cc9a2a70..00
---
a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From f81b60ebcbbfd9548c8aa1e388662c429068d1e3 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Sat, 8 May 2021 21:58:54 +0200
-Subject: [PATCH] Add use_prebuilt_tools option
-
-This allows using the gdk-pixbuf tools from the host to
-build and install tests in a cross-compile scenarion.
-
-Upstream-Status: Submitted
[https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/119]
-Signed-off-by: Alexander Kanavin
-
- gdk-pixbuf/meson.build | 11 +--
- meson.build | 6 +++---
- meson_options.txt | 4
- tests/meson.build | 16
- thumbnailer/meson.build | 24 ++--
- 5 files changed, 42 insertions(+), 19 deletions(-)
-
-diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index 54ff9dd..2e321cf 100644
a/gdk-pixbuf/meson.build
-+++ b/gdk-pixbuf/meson.build
-@@ -342,13 +342,20 @@ foreach bin: gdkpixbuf_bin
-include_directories: [ root_inc, gdk_pixbuf_inc ],
-c_args: common_cflags + gdk_pixbuf_cflags,
-install: true)
-- meson.override_find_program(bin_name, bin)
-+ if not get_option('use_prebuilt_tools')
-+ meson.override_find_program(bin_name, bin)
-+ endif
-
- # Used in tests
- set_variable(bin_name.underscorify(), bin)
- endforeach
-
--if not meson.is_cross_build()
-+if get_option('use_prebuilt_tools')
-+gdk_pixbuf_query_loaders = find_program('gdk-pixbuf-query-loaders',
required: true)
-+gdk_pixbuf_pixdata = find_program('gdk-pixbuf-pixdata', required: true)
-+endif
-+
-+if not meson.is_cross_build() or get_option('use_prebuilt_tools')
- # The 'loaders.cache' used for testing, so we don't accidentally
- # load the installed cache; we always build it by default
- loaders_cache = custom_target('loaders.cache',
-diff --git a/meson.build b/meson.build
-index 813bd43..a93e6f7 100644
a/meson.build
-+++ b/meson.build
-@@ -369,18 +369,18 @@ subdir('gdk-pixbuf')
- # i18n
- subdir('po')
-
--if not meson.is_cross_build()
-+if not meson.is_cross_build() or get_option('use_prebuilt_tools')
- if get_option('tests')
- subdir('tests')
- endif
-- subdir('thumbnailer')
- endif
-+subdir('thumbnailer')
-
- # Documentation
- build_docs = get_option('gtk_doc') or get_option('docs')
- subdir('docs')
-
--if not meson.is_cross_build()
-+if not meson.is_cross_build() or get_option('use_prebuilt_tools')
- meson.add_install_script('build-aux/post-install.py',
- gdk_pixbuf_bindir,
- gdk_pixbuf_libdir,
-diff --git a/meson_options.txt b/meson_options.txt
-index d198d99..1c899e9 100644
a/meson_options.txt
-+++ b/meson_options.txt
-@@ -53,4 +53,8 @@ option('gio_sniffing',
-description: 'Perform file type detection using GIO (Unused on MacOS
and Windows)',
-type: 'boolean',
-value: true)
-+option('use_prebuilt_tools',
-+ description: 'Use prebuilt gdk-pixbuf tools from the host for
cross-compilation',
-+ type: 'boolean',
-+ value: false)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 28c2525..d97c02d 100644
a/tests/meson.build
-+++ b/tests/meson.build
-@@ -5,6 +5,12 @@
- # $PATH. Ideally we should use gnome.compile_resources() and let Meson deal
with
- # this problem: See
[OE-core] [PATCH 7/7] selftest/virgl: use pkg-config from the host
The check needs to report dri location on the host machine,
so pkg-config binary needs to be capable of finding the needed
dri.pc file on the host, and therefore needs to know where
host .pc files are located.
This may not be the case when using pkg-config from buildtools,
so this forces usage of host pkg-config.
runqemu already does the same PATH tweak, so this simply brings
the two in sync.
Signed-off-by: Alexander Kanavin
---
meta/lib/oeqa/selftest/cases/runtime_test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index ae79724956..7d99c158e5 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -268,7 +268,7 @@ class TestImage(OESelftestTestCase):
except FileNotFoundError:
self.fail("/dev/dri directory does not exist; no render nodes
available on this machine. %s" %(render_hint))
try:
-dripath = subprocess.check_output("pkg-config
--variable=dridriverdir dri", shell=True)
+dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH
pkg-config --variable=dridriverdir dri", shell=True)
except subprocess.CalledProcessError as e:
self.fail("Could not determine the path to dri drivers on the host
via pkg-config.\nPlease install Mesa development files (particularly, dri.pc)
on the host machine.")
qemu_distrofeatures = get_bb_var('DISTRO_FEATURES',
'qemu-system-native')
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175834):
https://lists.openembedded.org/g/openembedded-core/message/175834
Mute This Topic: https://lists.openembedded.org/mt/96247135/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/7] mesa: update 22.2.3 -> 22.3.3
gallium-xvmc option removed upstream
Remove 0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch
as upstream code no longer uses these definitions.
Signed-off-by: Alexander Kanavin
---
...fine-__NR_futex-if-it-does-not-exist.patch | 34 ---
...k-for-all-linux-host_os-combinations.patch | 14
.../{mesa-gl_22.2.3.bb => mesa-gl_22.3.3.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 4 +--
.../mesa/{mesa_22.2.3.bb => mesa_22.3.3.bb} | 0
5 files changed, 8 insertions(+), 44 deletions(-)
delete mode 100644
meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch
rename meta/recipes-graphics/mesa/{mesa-gl_22.2.3.bb => mesa-gl_22.3.3.bb}
(100%)
rename meta/recipes-graphics/mesa/{mesa_22.2.3.bb => mesa_22.3.3.bb} (100%)
diff --git
a/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch
b/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch
deleted file mode 100644
index e7d92197be..00
---
a/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 859bfc342d1db9b61c43f30d9aa27cea35ca7599 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Fri, 16 Oct 2020 11:03:47 -0700
-Subject: [PATCH] futex.h: Define __NR_futex if it does not exist
-
-__NR_futex is not defines by newer architectures e.g. arc, riscv32 as
-they only have 64bit variant of time_t. Glibc defines SYS_futex interface
based on
-__NR_futex, since this is used in applications, such applications start
-to fail to build for these newer architectures. This patch defines a
-fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps
-working
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj
-
- src/util/futex.h | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/util/futex.h b/src/util/futex.h
-index 2a2a00c..92fc123 100644
a/src/util/futex.h
-+++ b/src/util/futex.h
-@@ -38,6 +38,10 @@
- #define SYS_futex SYS_futex_time64
- #endif
-
-+#if !defined(SYS_futex) && defined(SYS_futex_time64)
-+# define SYS_futex SYS_futex_time64
-+#endif
-+
- static inline long sys_futex(void *addr1, int op, int val1, const struct
timespec *timeout, void *addr2, int val3)
- {
-return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index ec263ce479..36c33f889b 100644
---
a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++
b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,4 +1,4 @@
-From d092a9000da62dfccca5b58fca56b94eb9989c48 Mon Sep 17 00:00:00 2001
+From 3b4d6b89f644b43e507c08181fef06db4326f9da Mon Sep 17 00:00:00 2001
From: Alistair Francis
Date: Thu, 14 Nov 2019 13:04:49 -0800
Subject: [PATCH] meson.build: check for all linux host_os combinations
@@ -20,19 +20,19 @@ Signed-off-by: Alistair Francis
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index 250b528..b5c98f8 100644
+index 172c64a..9b5294c 100644
--- a/meson.build
+++ b/meson.build
@@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
# Only build shared_glapi if at least one OpenGL API is enabled
with_shared_glapi = with_shared_glapi and with_any_opengl
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
-+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd',
'dragonfly'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
+-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system())
++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd',
'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or
host_machine.system().startswith('linux')
- dri_drivers = get_option('dri-drivers')
- if dri_drivers.length() != 0
-@@ -1091,7 +1091,7 @@ if cc.has_function('reallocarray')
+ with_freedreno_kgsl = get_option('freedreno-kgsl')
+ if with_freedreno_kgsl
+@@ -1076,7 +1076,7 @@ if cc.has_function('reallocarray')
endif
# TODO: this is very incomplete
diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb
b/meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb
rename to meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 77aa97069a..5fdb67ca2a 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -17,7 +17,6 @@
[OE-core] [PATCH 4/7] webkitgtk: submit a patch upstream
Signed-off-by: Alexander Kanavin --- ...1-When-building-introspection-files-do-not-quote-CFLAG.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch index 4ef0dbfe2f..2dab00a075 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-do-not-quote-CFLAG.patch @@ -31,7 +31,7 @@ Traceback (most recent call last): raise DistutilsExecError( distutils.errors.DistutilsExecError: command '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/webkitgtk/2.36.0-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-gcc' failed with exit code 1 -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/8290] Signed-off-by: Alexander Kanavin -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175831): https://lists.openembedded.org/g/openembedded-core/message/175831 Mute This Topic: https://lists.openembedded.org/mt/96247131/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/7] man-pages: upgrade 6.01 -> 6.02
License-Update: readme rewritten, set of licenses provided explicitly.
Signed-off-by: Alexander Kanavin
---
.../man-pages/man-pages_6.01.bb | 37 ---
.../man-pages/man-pages_6.02.bb | 46 +++
2 files changed, 46 insertions(+), 37 deletions(-)
delete mode 100644 meta/recipes-extended/man-pages/man-pages_6.01.bb
create mode 100644 meta/recipes-extended/man-pages/man-pages_6.02.bb
diff --git a/meta/recipes-extended/man-pages/man-pages_6.01.bb
b/meta/recipes-extended/man-pages/man-pages_6.01.bb
deleted file mode 100644
index 1ad4ed1317..00
--- a/meta/recipes-extended/man-pages/man-pages_6.01.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "Linux man-pages"
-DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C
library interfaces that are employed by user programs"
-SECTION = "console/utils"
-HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages;
-LICENSE = "GPL-2.0-or-later"
-
-LIC_FILES_CHKSUM = "file://README;md5=bf1faa9b0245e39a7c0c9690ffdf6e54"
-SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz"
-
-SRC_URI[sha256sum] =
"c1e8bea88589f1a80b67dafd82fb98b018ddd7f7bfa594f8f79686258d26e784"
-
-inherit manpages
-
-MAN_PKG = "${PN}"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[manpages] = ""
-
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-
-do_install() {
-oe_runmake install prefix=${prefix} DESTDIR=${D}
-}
-
-# Only deliveres man-pages so FILES:${PN} gets everything
-FILES:${PN}-doc = ""
-FILES:${PN} = "${mandir}/*"
-
-inherit update-alternatives
-
-ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE:${PN} = "crypt.3 crypt_r.3 getspnam.3 passwd.5"
-ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"
-ALTERNATIVE_LINK_NAME[crypt_r.3] = "${mandir}/man3/crypt_r.3"
-ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3"
-ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"
diff --git a/meta/recipes-extended/man-pages/man-pages_6.02.bb
b/meta/recipes-extended/man-pages/man-pages_6.02.bb
new file mode 100644
index 00..8f1eb38082
--- /dev/null
+++ b/meta/recipes-extended/man-pages/man-pages_6.02.bb
@@ -0,0 +1,46 @@
+SUMMARY = "Linux man-pages"
+DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C
library interfaces that are employed by user programs"
+SECTION = "console/utils"
+HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages;
+LICENSE = "GPL-2.0-or-later & GPL-2.0-only & GPL-1.0-or-later & BSD-2-Clause &
BSD-3-Clause & BSD-4-Clause & MIT"
+
+LIC_FILES_CHKSUM = "file://README;md5=26901408d8cfd6f6675f8b49daf9cc74 \
+
file://LICENSES/BSD-2-Clause.txt;md5=d0f280d1058e77e66264a9b9e10e6c89 \
+
file://LICENSES/BSD-3-Clause.txt;md5=71f739ef75581cae312e8c711bcdab16 \
+
file://LICENSES/BSD-4-Clause-UC.txt;md5=1da3cf8ad50cd8d5d1de3cfc53196d01 \
+
file://LICENSES/GPL-1.0-or-later.txt;md5=e5b7c80002ef72ab868b43ce47b65125 \
+
file://LICENSES/GPL-2.0-only.txt;md5=3d26203303a722dedc6bf909d95ba815 \
+
file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \
+
file://LICENSES/Linux-man-pages-copyleft.txt;md5=173b960c686ff2d26f043ddaeb63f6ce
\
+
file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \
+ "
+SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz"
+
+SRC_URI[sha256sum] =
"968def9e7055c9cbca9a4f21f79677b02ac8b0d2fa62ceea7bd8ef4dcc6cac41"
+
+inherit manpages
+
+MAN_PKG = "${PN}"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[manpages] = ""
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+do_install() {
+oe_runmake install prefix=${prefix} DESTDIR=${D}
+}
+
+# Only deliveres man-pages so FILES:${PN} gets everything
+FILES:${PN}-doc = ""
+FILES:${PN} = "${mandir}/*"
+
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE:${PN} = "crypt.3 crypt_r.3 getspnam.3 passwd.5"
+ALTERNATIVE_LINK_NAME[crypt.3] = "${mandir}/man3/crypt.3"
+ALTERNATIVE_LINK_NAME[crypt_r.3] = "${mandir}/man3/crypt_r.3"
+ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3"
+ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175829):
https://lists.openembedded.org/g/openembedded-core/message/175829
Mute This Topic: https://lists.openembedded.org/mt/96247129/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/7] ethtool: upgrade 6.0 -> 6.1
Signed-off-by: Alexander Kanavin
---
.../0001-marvell.c-define-_GNU_SOURCE.patch | 59 +++
.../ethtool/avoid_parallel_tests.patch| 6 +-
.../{ethtool_6.0.bb => ethtool_6.1.bb}| 3 +-
3 files changed, 64 insertions(+), 4 deletions(-)
create mode 100644
meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch
rename meta/recipes-extended/ethtool/{ethtool_6.0.bb => ethtool_6.1.bb} (90%)
diff --git
a/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch
b/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch
new file mode 100644
index 00..8a7eeafb9c
--- /dev/null
+++
b/meta/recipes-extended/ethtool/ethtool/0001-marvell.c-define-_GNU_SOURCE.patch
@@ -0,0 +1,59 @@
+From 5112785191e3279c671a027fe797be77e1071ecd Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Mon, 2 Jan 2023 13:45:46 +0100
+Subject: [PATCH] marvell.c: use portable integer types
+
+u_int32_t is not portable, but uint32_t is.
+
+Upstream-Status: Submitted [by email to mkube...@suse.cz]
+Signed-off-by: Alexander Kanavin
+
+---
+ marvell.c | 34 +-
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/marvell.c b/marvell.c
+index d3d570e..3d42eed 100644
+--- a/marvell.c
b/marvell.c
+@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p)
+ static void dump_queue(const char *name, const void *a, int rx)
+ {
+ struct desc {
+- u_int32_t ctl;
+- u_int32_t next;
+- u_int32_t data_lo;
+- u_int32_t data_hi;
+- u_int32_t status;
+- u_int32_t timestamp;
+- u_int16_t csum2;
+- u_int16_t csum1;
+- u_int16_t csum2_start;
+- u_int16_t csum1_start;
+- u_int32_t addr_lo;
+- u_int32_t addr_hi;
+- u_int32_t count_lo;
+- u_int32_t count_hi;
+- u_int32_t byte_count;
+- u_int32_t csr;
+- u_int32_t flag;
++ uint32_tctl;
++ uint32_tnext;
++ uint32_tdata_lo;
++ uint32_tdata_hi;
++ uint32_tstatus;
++ uint32_ttimestamp;
++ uint16_tcsum2;
++ uint16_tcsum1;
++ uint16_tcsum2_start;
++ uint16_tcsum1_start;
++ uint32_taddr_lo;
++ uint32_taddr_hi;
++ uint32_tcount_lo;
++ uint32_tcount_hi;
++ uint32_tbyte_count;
++ uint32_tcsr;
++ uint32_t flag;
+ };
+ const struct desc *d = a;
+
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index c3cefbb5e6..4994369682 100644
--- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
+++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
@@ -1,4 +1,4 @@
-From dea90ab711acad251b5d8536c534409979ea8be4 Mon Sep 17 00:00:00 2001
+From 0d066a901292e6a44ff7bc7ee16f99dd2ba4ea15 Mon Sep 17 00:00:00 2001
From: Tudor Florea
Date: Wed, 28 May 2014 18:59:54 +0200
Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 89d0e70..ab2be9c 100644
+index 3eb4e7b..ee5c72f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure
script.
- AC_INIT(ethtool, 6.0, net...@vger.kernel.org)
+ AC_INIT(ethtool, 6.1, net...@vger.kernel.org)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR([ethtool.c])
-AM_INIT_AUTOMAKE([gnu subdir-objects])
diff --git a/meta/recipes-extended/ethtool/ethtool_6.0.bb
b/meta/recipes-extended/ethtool/ethtool_6.1.bb
similarity index 90%
rename from meta/recipes-extended/ethtool/ethtool_6.0.bb
rename to meta/recipes-extended/ethtool/ethtool_6.1.bb
index 8f36520b00..2b9bbe69db 100644
--- a/meta/recipes-extended/ethtool/ethtool_6.0.bb
+++ b/meta/recipes-extended/ethtool/ethtool_6.1.bb
@@ -9,9 +9,10 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
file://run-ptest \
file://avoid_parallel_tests.patch \
+
[OE-core][dunfell 0/8] Pull request (cover letter only)
This is the final pull request for the 3.1.22 release build on Monday. The following changes since commit deb919a693e4371ace649680ca06ca6b6e3da4e2: lib/buildstats: fix parsing of trees with reduced_proc_pressure directories (2023-01-06 17:34:50 +) are available in the Git repository at: https://git.openembedded.org/openembedded-core-contrib stable/dunfell-next http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-next Changqing Li (1): base.bbclass: Fix way to check ccache path Chee Yang Lee (1): libksba: fix CVE-2022-47629 Hitendra Prajapati (1): grub2: Fix CVE-2022-2601 & CVE-2022-3775 Luis (1): rm_work.bbclass: use HOSTTOOLS 'rm' binary exclusively Pavel Zhukov (1): oeqa/rpm.py: Increase timeout and add debug output Steve Sakoman (3): ovmf: fix gcc12 warning in GenFfs ovmf: fix gcc12 warning in LzmaEnc ovmf: fix gcc12 warning for device path handling meta/classes/base.bbclass | 2 +- meta/classes/rm_work.bbclass | 15 ++- meta/lib/oeqa/runtime/cases/rpm.py| 23 ++-- .../grub/files/CVE-2022-2601.patch| 87 + .../grub/files/CVE-2022-3775.patch| 97 +++ ...erflow-in-grub_font_get_glyph_intern.patch | 117 ++ meta/recipes-bsp/grub/grub2.inc | 3 + ...1-Basetools-genffs-fix-gcc12-warning.patch | 49 ...-Basetools-lzmaenc-fix-gcc12-warning.patch | 53 ...001-Basetools-turn-off-gcc12-warning.patch | 41 ++ meta/recipes-core/ovmf/ovmf_git.bb| 3 + .../libksba/libksba/CVE-2022-47629.patch | 69 +++ meta/recipes-support/libksba/libksba_1.3.5.bb | 4 +- 13 files changed, 545 insertions(+), 18 deletions(-) create mode 100644 meta/recipes-bsp/grub/files/CVE-2022-2601.patch create mode 100644 meta/recipes-bsp/grub/files/CVE-2022-3775.patch create mode 100644 meta/recipes-bsp/grub/files/font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch create mode 100644 meta/recipes-core/ovmf/ovmf/0001-Basetools-genffs-fix-gcc12-warning.patch create mode 100644 meta/recipes-core/ovmf/ovmf/0001-Basetools-lzmaenc-fix-gcc12-warning.patch create mode 100644 meta/recipes-core/ovmf/ovmf/0001-Basetools-turn-off-gcc12-warning.patch create mode 100644 meta/recipes-support/libksba/libksba/CVE-2022-47629.patch -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175827): https://lists.openembedded.org/g/openembedded-core/message/175827 Mute This Topic: https://lists.openembedded.org/mt/96246780/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [master][langdale][kirkstone][patch] ppp: fix CVE-2022-4603
From: Lee Chee Yang
Signed-off-by: Lee Chee Yang
---
.../ppp/ppp/CVE-2022-4603.patch | 50 +++
meta/recipes-connectivity/ppp/ppp_2.4.9.bb| 1 +
2 files changed, 51 insertions(+)
create mode 100644 meta/recipes-connectivity/ppp/ppp/CVE-2022-4603.patch
diff --git a/meta/recipes-connectivity/ppp/ppp/CVE-2022-4603.patch
b/meta/recipes-connectivity/ppp/ppp/CVE-2022-4603.patch
new file mode 100644
index 00..2b63422cc1
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp/CVE-2022-4603.patch
@@ -0,0 +1,50 @@
+From a75fb7b198eed50d769c80c36629f38346882cbf Mon Sep 17 00:00:00 2001
+From: Paul Mackerras
+Date: Thu, 4 Aug 2022 12:23:08 +1000
+Subject: [PATCH] pppdump: Avoid out-of-range access to packet buffer
+
+This fixes a potential vulnerability where data is written to spkt.buf
+and rpkt.buf without a check on the array index. To fix this, we
+check the array index (pkt->cnt) before storing the byte or
+incrementing the count. This also means we no longer have a potential
+signed integer overflow on the increment of pkt->cnt.
+
+Fortunately, pppdump is not used in the normal process of setting up a
+PPP connection, is not installed setuid-root, and is not invoked
+automatically in any scenario that I am aware of.
+
+Signed-off-by: Paul Mackerras
+
+CVE: CVE-2022-4603
+https://github.com/ppp-project/ppp/commit/a75fb7b198eed50d769c80c36629f38346882cbf
+Upstream-Status: Backport
+Signed-off-by: Lee Chee Yang
+---
+ pppdump/pppdump.c | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c
+index 2b815fc9..b85a8627 100644
+--- a/pppdump/pppdump.c
b/pppdump/pppdump.c
+@@ -297,6 +297,10 @@ dum(f)
+ printf("%s aborted packet:\n ", dir);
+ q = "";
+ }
++ if (pkt->cnt >= sizeof(pkt->buf)) {
++ printf("%s over-long packet truncated:\n ",
dir);
++ q = "";
++ }
+ nb = pkt->cnt;
+ p = pkt->buf;
+ pkt->cnt = 0;
+@@ -400,7 +404,8 @@ dum(f)
+ c ^= 0x20;
+ pkt->esc = 0;
+ }
+- pkt->buf[pkt->cnt++] = c;
++ if (pkt->cnt < sizeof(pkt->buf))
++ pkt->buf[pkt->cnt++] = c;
+ break;
+ }
+ }
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
b/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
index 700ece61dc..7e3ae43b58 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
@@ -25,6 +25,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz
\
file://provider \
file://ppp@.service \
file://0001-ppp-fix-build-against-5.15-headers.patch \
+ file://CVE-2022-4603.patch \
"
SRC_URI[sha256sum] =
"f938b35eccde533ea800b15a7445b2f1137da7f88e32a16898d02dee8adc058d"
--
2.37.3
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175826):
https://lists.openembedded.org/g/openembedded-core/message/175826
Mute This Topic: https://lists.openembedded.org/mt/96245860/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] package_rpm: allow arch overriding
> On 13 Jan 2023, at 12:29, Sergey Zhmylev via lists.openembedded.org > wrote: >> So no, I don't think we should be taking a patch which would just >> confuse things for what seems to be a cosmetic reason. >> > > The patch proposed is not about a cosmetic change, it's about precise > control over what packaging system produces. Given the recipes can > override variables with a priority over any confs/classes, it looks > like there is no proper way to overload the values (in particular > PACKAGE_ARCH) used during packaging process. Some variables could be > used to adjust TUNE flags and their values should stay intact prior to > packaging. What is the use-case for this level of control then, and why would it be specific to RPM? Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175825): https://lists.openembedded.org/g/openembedded-core/message/175825 Mute This Topic: https://lists.openembedded.org/mt/96233100/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 4/4] python3-picobuild: remove
On 13 Jan 2023, at 10:36, Ross Burton via lists.openembedded.org wrote: > I have the patch for pytest-forked, failed to send. I’ve not seen the > opengl-es-cts one before, I’ll have a look. Patches sent to oe-devel. Note that the pyforked one needs to merge after the picobuild->build migration. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175824): https://lists.openembedded.org/g/openembedded-core/message/175824 Mute This Topic: https://lists.openembedded.org/mt/96220394/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] package_rpm: allow arch overriding
> One more thing I want to mention is that if you want to align the > architectures so that you can install RPMs from Fedora, RHEL or any > other RPM-based binary distro, don't. It's not going to work at all, > or will cause you lots of pain and suffering. We use rpm for its > packaging and dependency resolution functions, but no one ever > promised any kind of 'compatibility' with Red Hat products. > Indeed, I'm not going to align those names for this. Moreover, for this particular case rpm(1) supports several parameters to disable arch/os/etc checks. > So no, I don't think we should be taking a patch which would just > confuse things for what seems to be a cosmetic reason. > The patch proposed is not about a cosmetic change, it's about precise control over what packaging system produces. Given the recipes can override variables with a priority over any confs/classes, it looks like there is no proper way to overload the values (in particular PACKAGE_ARCH) used during packaging process. Some variables could be used to adjust TUNE flags and their values should stay intact prior to packaging. Anyways, your word will be the last but I am still sure that "more control" is better than "no conrol". Kind wishes, Sergei -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175823): https://lists.openembedded.org/g/openembedded-core/message/175823 Mute This Topic: https://lists.openembedded.org/mt/96233100/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 2/2] rust: Remove CARGO_VERSION
CARGO_VERSION isn't broken out in rust/src/stage0.json, there's only one
snapshot version, so just use that.
Signed-off-by: Alex Kiernan
---
(no changes since v1)
meta/recipes-devtools/rust/rust-snapshot.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc
b/meta/recipes-devtools/rust/rust-snapshot.inc
index 6420bcff55ad..25192c9f7666 100644
--- a/meta/recipes-devtools/rust/rust-snapshot.inc
+++ b/meta/recipes-devtools/rust/rust-snapshot.inc
@@ -7,7 +7,6 @@
## earlier SRC_URI.
SNAPSHOT_VERSION = "1.65.0"
-CARGO_VERSION = "1.65.0"
# TODO: Add hashes for other architecture toolchains as well. Make a script?
SRC_URI[rust-std-snapshot-x86_64.sha256sum] =
"2b588cd2d49688c0c33b7466614123e8fe4c910f4d802fc0ff0662b1772816a9"
@@ -30,4 +29,4 @@ SRC_URI += " \
RUST_STD_SNAPSHOT =
"rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
RUSTC_SNAPSHOT =
"rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
-CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
+CARGO_SNAPSHOT =
"cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
--
2.39.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175822):
https://lists.openembedded.org/g/openembedded-core/message/175822
Mute This Topic: https://lists.openembedded.org/mt/96244210/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 1/2] rust: Upgrade 1.66.0 -> 1.66.1
Changes:
Added validation of SSH host keys for git URLs in Cargo (CVE-2022-46176)
Signed-off-by: Alex Kiernan
---
Changes in v2:
- Add patch to drop redundant CARGO_VERSION
- Rebased
meta/recipes-devtools/rust/{cargo_1.66.0.bb => cargo_1.66.1.bb} | 0
.../rust/{libstd-rs_1.66.0.bb => libstd-rs_1.66.1.bb} | 0
...t-cross-canadian_1.66.0.bb => rust-cross-canadian_1.66.1.bb} | 0
.../rust/{rust-llvm_1.66.0.bb => rust-llvm_1.66.1.bb} | 0
meta/recipes-devtools/rust/rust-source.inc | 2 +-
meta/recipes-devtools/rust/{rust_1.66.0.bb => rust_1.66.1.bb} | 0
6 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/rust/{cargo_1.66.0.bb => cargo_1.66.1.bb} (100%)
rename meta/recipes-devtools/rust/{libstd-rs_1.66.0.bb => libstd-rs_1.66.1.bb}
(100%)
rename meta/recipes-devtools/rust/{rust-cross-canadian_1.66.0.bb =>
rust-cross-canadian_1.66.1.bb} (100%)
rename meta/recipes-devtools/rust/{rust-llvm_1.66.0.bb => rust-llvm_1.66.1.bb}
(100%)
rename meta/recipes-devtools/rust/{rust_1.66.0.bb => rust_1.66.1.bb} (100%)
diff --git a/meta/recipes-devtools/rust/cargo_1.66.0.bb
b/meta/recipes-devtools/rust/cargo_1.66.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.66.0.bb
rename to meta/recipes-devtools/rust/cargo_1.66.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.66.0.bb
b/meta/recipes-devtools/rust/libstd-rs_1.66.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.66.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.66.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.66.0.bb
b/meta/recipes-devtools/rust/rust-cross-canadian_1.66.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.66.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.66.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.66.0.bb
b/meta/recipes-devtools/rust/rust-llvm_1.66.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.66.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.66.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc
b/meta/recipes-devtools/rust/rust-source.inc
index 6f1df4561b29..22e97174a98c 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -7,7 +7,7 @@ SRC_URI +=
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
file://0001-Do-not-use-LFS64-on-linux-with-musl.patch;patchdir=${RUSTSRC} \
file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
"
-SRC_URI[rust.sha256sum] =
"0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c"
+SRC_URI[rust.sha256sum] =
"07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe"
RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
diff --git a/meta/recipes-devtools/rust/rust_1.66.0.bb
b/meta/recipes-devtools/rust/rust_1.66.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.66.0.bb
rename to meta/recipes-devtools/rust/rust_1.66.1.bb
--
2.39.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175821):
https://lists.openembedded.org/g/openembedded-core/message/175821
Mute This Topic: https://lists.openembedded.org/mt/96244208/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 4/4] python3-picobuild: remove
On 13 Jan 2023, at 07:51, Khem Raj wrote: > > I think meta-python has > meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb > which needs some TLC after this. > > There is another failure with opengl-es-cts > > | ModuleNotFoundError: No module named 'build.common' > > See > https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/2348/steps/14/logs/stdio I have the patch for pytest-forked, failed to send. I’ve not seen the opengl-es-cts one before, I’ll have a look. Ross -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175820): https://lists.openembedded.org/g/openembedded-core/message/175820 Mute This Topic: https://lists.openembedded.org/mt/96220394/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] package_rpm: allow arch overriding
On Fri, 13 Jan 2023 at 10:50, Richard Purdie wrote: > Can you perhaps convince your audit team this is a sensible usage given > how the project builds and uses the rpms? One more thing I want to mention is that if you want to align the architectures so that you can install RPMs from Fedora, RHEL or any other RPM-based binary distro, don't. It's not going to work at all, or will cause you lots of pain and suffering. We use rpm for its packaging and dependency resolution functions, but no one ever promised any kind of 'compatibility' with Red Hat products. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175819): https://lists.openembedded.org/g/openembedded-core/message/175819 Mute This Topic: https://lists.openembedded.org/mt/96233100/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] package_rpm: allow arch overriding
On Fri, 2023-01-13 at 09:14 +, Sergey Zhmylev wrote: > Sure, RPM naming convention from rpm.org: > http://ftp.rpm.org/max-rpm/ch-rpm-file-format.html > As you can see, there are nothing about "core2_64" architecture. We build target binaries to different levels of tuning, there are packages which run everywhere (noarch), there are binaries which are optimised to a specific tune and there is machine specific output. People can inject other levels of packages as well. Giving a hint of the kind of thing a given rpm contains seems like a perfectly reasonable thing for us to be doing. If you come from the rpm world, yes it is slightly unusual but as the document above says, it works fine. We're not "in-compliant", we're just adapting rpm usage to the environment it is being used in. So no, I don't think we should be taking a patch which would just confuse things for what seems to be a cosmetic reason. Can you perhaps convince your audit team this is a sensible usage given how the project builds and uses the rpms? Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175818): https://lists.openembedded.org/g/openembedded-core/message/175818 Mute This Topic: https://lists.openembedded.org/mt/96233100/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] package_rpm: allow arch overriding
This document hasn't been maintained in decades, and is not in any way official. Alex On Fri, 13 Jan 2023 at 10:14, Sergey Zhmylev wrote: > > Sure, RPM naming convention from rpm.org: > http://ftp.rpm.org/max-rpm/ch-rpm-file-format.html > As you can see, there are nothing about "core2_64" architecture. > > -- > With best wishes, > Sergei Zhmylev > Engineering consultant > OS development department > > > > > > > > > On Fri, 2023-01-13 at 09:34 +0100, Alexander Kanavin wrote: > > «Внимание! Данное письмо от внешнего адресата!» > > > > On Fri, 13 Jan 2023 at 09:25, Sergey Zhmylev > > wrote: > > > > > > Exactly! Even more: when I build for "genericx86_64", I get mix of > > > packages with architecture one of: "x86_64", "genericx86_64", > > > "core2_64", and "noarch". Our audit team highlited this as this is > > > not > > > compliant with common RPM naming convention. > > > > Can you please link to (or describe with references) the common > > naming > > convention? > > > > Alex > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175817): https://lists.openembedded.org/g/openembedded-core/message/175817 Mute This Topic: https://lists.openembedded.org/mt/96233100/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] package_rpm: allow arch overriding
Sure, RPM naming convention from rpm.org: http://ftp.rpm.org/max-rpm/ch-rpm-file-format.html As you can see, there are nothing about "core2_64" architecture. -- With best wishes, Sergei Zhmylev Engineering consultant OS development department On Fri, 2023-01-13 at 09:34 +0100, Alexander Kanavin wrote: > «Внимание! Данное письмо от внешнего адресата!» > > On Fri, 13 Jan 2023 at 09:25, Sergey Zhmylev > wrote: > > > > Exactly! Even more: when I build for "genericx86_64", I get mix of > > packages with architecture one of: "x86_64", "genericx86_64", > > "core2_64", and "noarch". Our audit team highlited this as this is > > not > > compliant with common RPM naming convention. > > Can you please link to (or describe with references) the common > naming > convention? > > Alex > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175816): https://lists.openembedded.org/g/openembedded-core/message/175816 Mute This Topic: https://lists.openembedded.org/mt/96233100/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] package_rpm: allow arch overriding
On Fri, 13 Jan 2023 at 09:25, Sergey Zhmylev wrote: > > Exactly! Even more: when I build for "genericx86_64", I get mix of > packages with architecture one of: "x86_64", "genericx86_64", > "core2_64", and "noarch". Our audit team highlited this as this is not > compliant with common RPM naming convention. Can you please link to (or describe with references) the common naming convention? Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175815): https://lists.openembedded.org/g/openembedded-core/message/175815 Mute This Topic: https://lists.openembedded.org/mt/96233100/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] busybox: 1.35.0 -> 1.36.0
I guess, we should wait a little bit with the merging here, because
this problem is known in the same busybox mailing list thread.
Andrej
On Wed, 2023-01-11 at 11:33 -0800, Khem Raj wrote:
> On Wed, Jan 11, 2023 at 2:54 AM Alexandre Belloni via
> lists.openembedded.org
> wrote:
> >
> > This generates a warning:
> >
> > WARNING: busybox-1.36.0-r0 do_package_qa: QA Issue: busybox: ELF
> > binary /bin/busybox.nosuid has relocations in .text [textrel]
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/6507/steps/11/logs/stdio
>
> hmmm yes. I think texrels is the fundamental problem originally. I
> will take a look and see if this one is harmless
>
> >
> > On 06/01/2023 12:05:05+0100, Andrej Valek wrote:
> > > - update to next (un)stable version 1.36.0
> > > - refresh defconfig
> > > - disable new applets (tree, tsort, seedrng)
> > > - use hw-accel for sha1/256 sums when available
> > > - remove and refresh already merged patches
> > >
> > > Signed-off-by: Andrej Valek
> > > ---
> > > ...ab_1.35.0.bb => busybox-inittab_1.36.0.bb} | 0
> > > .../0001-devmem-add-128-bit-width.patch | 128
> > > --
> > > .../busybox/busybox/CVE-2022-30065.patch | 29
> > > meta/recipes-core/busybox/busybox/defconfig | 10 +-
> > > .../busybox/busybox/recognize_connmand.patch | 10 +-
> > > meta/recipes-core/busybox/busybox/sha1sum.cfg | 2 +
> > > .../busybox/busybox/sha256sum.cfg | 1 +
> > > .../{busybox_1.35.0.bb => busybox_1.36.0.bb} | 4 +-
> > > 8 files changed, 17 insertions(+), 167 deletions(-)
> > > rename meta/recipes-core/busybox/{busybox-inittab_1.35.0.bb =>
> > > busybox-inittab_1.36.0.bb} (100%)
> > > delete mode 100644 meta/recipes-core/busybox/busybox/0001-
> > > devmem-add-128-bit-width.patch
> > > delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2022-
> > > 30065.patch
> > > rename meta/recipes-core/busybox/{busybox_1.35.0.bb =>
> > > busybox_1.36.0.bb} (92%)
> > >
> > > diff --git a/meta/recipes-core/busybox/busybox-inittab_1.35.0.bb
> > > b/meta/recipes-core/busybox/busybox-inittab_1.36.0.bb
> > > similarity index 100%
> > > rename from meta/recipes-core/busybox/busybox-inittab_1.35.0.bb
> > > rename to meta/recipes-core/busybox/busybox-inittab_1.36.0.bb
> > > diff --git a/meta/recipes-core/busybox/busybox/0001-devmem-add-
> > > 128-bit-width.patch b/meta/recipes-core/busybox/busybox/0001-
> > > devmem-add-128-bit-width.patch
> > > deleted file mode 100644
> > > index 985e2bf1d9..00
> > > --- a/meta/recipes-core/busybox/busybox/0001-devmem-add-128-bit-
> > > width.patch
> > > +++ /dev/null
> > > @@ -1,128 +0,0 @@
> > > -From d432049f288c9acdc4a7caa729c68ceba3c5dca1 Mon Sep 17
> > > 00:00:00 2001
> > > -From: Aaro Koskinen
> > > -Date: Thu, 25 Aug 2022 18:47:02 +0300
> > > -Subject: [PATCH] devmem: add 128-bit width
> > > -
> > > -Add 128-bit width if the compiler provides the needed type.
> > > -
> > > -function old
> > > new delta
> > > -devmem_main 405
> > > 464 +59
> > > -.rodata 109025
> > > 109043 +18
> > > -
> > > --
> > > -(add/remove: 0/0 grow/shrink: 2/0 up/down: 77/0)
> > > Total: 77 bytes
> > > -
> > > -Upstream-Status: Backport
> > > [https://git.busybox.net/busybox/commit/?id=d432049f288c9acdc4a7caa729c68ceba3c5dca1
> > > ]
> > > -
> > > -Signed-off-by: Aaro Koskinen
> > > -Signed-off-by: Aaro Koskinen
> > > -Signed-off-by: Denys Vlasenko
> > > -Signed-off-by: Mingli Yu
> > >
> > > - miscutils/devmem.c | 68 ++-
> > > ---
> > > - 1 file changed, 44 insertions(+), 24 deletions(-)
> > > -
> > > -diff --git a/miscutils/devmem.c b/miscutils/devmem.c
> > > -index f9f0276bc..f21621bd6 100644
> > > a/miscutils/devmem.c
> > > -+++ b/miscutils/devmem.c
> > > -@@ -29,7 +29,6 @@ int devmem_main(int argc UNUSED_PARAM, char
> > > **argv)
> > > - {
> > > - void *map_base, *virt_addr;
> > > - uint64_t read_result;
> > > -- uint64_t writeval = writeval; /* for compiler */
> > > - off_t target;
> > > - unsigned page_size, mapped_size, offset_in_page;
> > > - int fd;
> > > -@@ -64,9 +63,6 @@ int devmem_main(int argc UNUSED_PARAM, char
> > > **argv)
> > > - width = strchrnul(bhwl, (argv[2][0] |
> > > 0x20)) - bhwl;
> > > - width = sizes[width];
> > > - }
> > > -- /* VALUE */
> > > -- if (argv[3])
> > > -- writeval = bb_strtoull(argv[3], NULL, 0);
> > > - } else { /* argv[2] == NULL */
> > > - /* make argv[3] to be a valid thing to fetch */
> > > - argv--;
> > > -@@ -96,28 +92,46 @@ int devmem_main(int argc UNUSED_PARAM, char
> > > **argv)
> > > - virt_addr =
Re: [OE-core] [PATCH] package_rpm: allow arch overriding
Exactly! Even more: when I build for "genericx86_64", I get mix of
packages with architecture one of: "x86_64", "genericx86_64",
"core2_64", and "noarch". Our audit team highlited this as this is not
compliant with common RPM naming convention.
In that case override architecture string only for packaging would be,
from my perspective, the best workaround.
At the same time I doubt we have to change other package backends as
they're less strict while architecture overriding effectively looses
(probably) important information.
--
With best wishes,
Sergei Zhmylev
Engineering consultant
OS development department
On Thu, 2023-01-12 at 22:32 +, Richard Purdie wrote:
> «Внимание! Данное письмо от внешнего адресата!»
>
> On Fri, 2023-01-13 at 00:33 +0300, Sergey Zhmylev wrote:
> > From: Sergei Zhmylev
> >
> > Currently arch is being calculated from either MACHINE_ARCH or
> > TUNE_PKGARCH. Some recipes do override PACKAGE_ARCH intentionally.
> > This commit makes possible to override ARCH for RPM packages
> > separately in order to simplify common rpm naming conformance.
> >
> > Signed-off-by: Sergei Zhmylev
> > ---
> > meta/classes-global/package_rpm.bbclass | 4
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/meta/classes-global/package_rpm.bbclass
> > b/meta/classes-global/package_rpm.bbclass
> > index 85d0bd7fce..3fb7466778 100644
> > --- a/meta/classes-global/package_rpm.bbclass
> > +++ b/meta/classes-global/package_rpm.bbclass
> > @@ -678,6 +678,10 @@ python do_package_rpm () {
> > bb.utils.mkdirhier(pkgwritedir)
> > os.chmod(pkgwritedir, 0o755)
> >
> > + rpm_arch_override = d.getVar("RPM_ARCH_OVERRIDE")
> > + if package_arch != "noarch" and rpm_arch_override:
> > + pkgarch = rpm_arch_override
> > +
> > cmd = rpmbuild
> > cmd = cmd + " --noclean --nodeps --short-circuit --target " +
> > pkgarch + " --buildroot " + pkgd
> > cmd = cmd + " --define '_topdir " + workdir + "' --define
> > '_rpmdir " + pkgwritedir + "'"
>
> This makes me very nervous. PACKAGE_ARCH can be overridden and I know
> of BSPs which inject a whole new level of architecture into the
> system
> but they don't need to make rpm backend specific changes to make it
> work.
>
> If we were to add such a thing we'd need a much clearer picture of
> when
> it should be used and why it is needed. Wouldn't all package backends
> need to adjust this?
>
> Cheers,
>
> Richard
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175813):
https://lists.openembedded.org/g/openembedded-core/message/175813
Mute This Topic: https://lists.openembedded.org/mt/96233100/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] curl: enable nghttp2 for support HTTP2
On 1/5/23 22:09, Alexandre Belloni wrote: CAUTION: This email comes from a non Wind River email account! Do not click links or open attachments unless you recognize the sender and know the content is safe. This fails on the AB: https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/4580/steps/14/logs/stdio Hi, Alexandre I need some help to debug this issue. I cannot reproduce this issue on my host. First, the gcc command used to build the binary conftest will have as-needed enabled by default, so actually, these libs will not be linked, and runtime check will passed. Refer the command: gcc -o conftest -isystem/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/include -pipe -Werror-implicit-function-declaration -g -O2 -std=gnu89 -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Wunused -Wshadow -Winline -Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wno-long-long -Wbad-function-cast -Wfloat-equal -Wno-multichar -Wsign-compare -Wundef -Wno-format-nonliteral -Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement -Wold-style-definition -Wstrict-aliasing=3 -Wcast-align -Wtype-limits -Wold-style-declaration -Wmissing-parameter-type -Wempty-body -Wclobbered -Wignored-qualifiers -Wconversion -Wno-sign-conversion -Wvla -ftree-vrp -Wdouble-promotion -Wformat=2 -Warray-bounds=2 -Wshift-negative-value -Wshift-overflow=2 -Wnull-dereference -fdelete-null-pointer-checks -Wduplicated-cond -Wunused-const-variable -Wduplicated-branches -Wrestrict -Walloc-zero -Wformat-overflow=2 -Wformat-truncation=2 -Wimplicit-fallthrough=4 -Wno-system-headers -isystem/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/include -I/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib/..//include -I/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include -DOPENSSL_SUPPRESS_DEPRECATED -I/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/include -L/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib -L/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/lib -Wl,--enable-new-dtags -Wl,-rpath-link,/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/lib -Wl,-rpath,/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/mnt/lincd/build/tmp-glibc/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 -L/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib/..//lib -L/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib -L/mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib conftest.c -lnghttp2 -lssl -lcrypto -lssl -lcrypto -lz I also tried to add "-Wl,--no-as-needed" in above comand, and manually run it, then conftest will link those libraries. These libraries can also be found at runtime since these libraries will be in recipe-sysroot-native. $/mnt/yocto/test/tmp/work/x86_64-linux/curl-native/7.87.0-r0/build# ldd conftest linux-vdso.so.1 (0x7ffd447c1000) libnghttp2.so.14 => /mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib/libnghttp2.so.14 (0x7f6bd36af000) libssl.so.3 => /mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib/libssl.so.3 (0x7f6bd3606000) libcrypto.so.3 => /mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib/libcrypto.so.3 (0x7f6bd31cf000) libz.so.1 => /mnt/lincd/build/tmp-glibc/work/x86_64-linux/curl-native/7.87.0-r0/recipe-sysroot-native/usr/lib/libz.so.1 (0x7f6bd31b5000) libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x7f6bd2fb9000) libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x7f6bd2f96000) libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x7f6bd2f9) /mnt/lincd/build/tmp-glibc/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 => /lib64/ld-linux-x86-64.so.2 (0x7f6bd36e6000) $/mnt/yocto/test/tmp/work/x86_64-linux/curl-native/7.87.0-r0/build# ./conftest This should be an host related issue, Does the worker "debian11-ty-3" means that this build is built on debian11 docker or debian11 host? Thanks. Regards Changqing |
