* [OE-core][kirkstone 00/24] Patch review
@ 2022-08-27 18:25 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 01/24] vim: Upgrade 9.0.0115 -> 9.0.0242 Steve Sakoman
` (23 more replies)
0 siblings, 24 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
Please review this set of patches for kirkstone and have comments back by
end of day Tuesday.
Pass a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/4141
The following changes since commit 7709a8c1c1b2dcf05678f1a2a1fd579a95e492f2:
packagegroup-self-hosted: update for strace (2022-08-23 04:23:01 -1000)
are available in the Git repository at:
git://git.openembedded.org/openembedded-core-contrib stable/kirkstone-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/kirkstone-nut
Alexander Kanavin (10):
tzdata: upgrade 2022a -> 2022b
xz: update 5.2.5 -> 5.2.6
gdk-pixbuf: upgrade 2.42.6 -> 2.42.8
gdk-pixbuf: update 2.42.8 -> 2.42.9
epiphany: upgrade 42.3 -> 42.4
glib-networking: upgrade 2.72.1 -> 2.72.2
libjpeg-turbo: upgrade 2.1.3 -> 2.1.4
libwebp: upgrade 1.2.3 -> 1.2.4
wireless-regdb: upgrade 2022.06.06 -> 2022.08.12
wpebackend-fdo: upgrade 1.12.0 -> 1.12.1
Awais Belal (1):
kernel-fitimage.bbclass: only package unique DTBs
Bertrand Marquis (1):
sysvinit-inittab/start_getty: Fix respawn too fast
Hitendra Prajapati (1):
Revert "gdk-pixbuf: CVE-2021-46829 a heap-based buffer overflow"
Jon Mason (1):
oeqa/parselogs: add qemuarmv5 arm-charlcd masking
Pavel Zhukov (1):
package_rpm: Do not replace square brackets in %files
Richard Purdie (1):
vim: Upgrade 9.0.0115 -> 9.0.0242
Ross Burton (7):
oeqa/qemurunner: add run_serial() comment
oeqa/selftest: rename git.py to intercept.py
oeqa/gotoolchain: put writable files in the Go module cache
oeqa/gotoolchain: set CGO_ENABLED=1
wic: add target tools to PATH when executing native commands
wic/bootimg-efi: use cross objcopy when building unified kernel image
wic: depend on cross-binutils
Shubham Kulkarni (1):
sanity: add a comment to ensure CONNECTIVITY_CHECK_URIS is correct
meta/classes/image_types_wic.bbclass | 2 +
meta/classes/kernel-fitimage.bbclass | 8 ++
meta/classes/package_rpm.bbclass | 6 --
meta/classes/sanity.bbclass | 1 +
meta/lib/oeqa/runtime/cases/parselogs.py | 1 +
meta/lib/oeqa/selftest/cases/gotoolchain.py | 8 +-
.../selftest/cases/{git.py => intercept.py} | 0
.../oeqa/selftest/cases/oelib/buildhistory.py | 6 +-
meta/lib/oeqa/utils/qemurunner.py | 2 +
...ng_2.72.1.bb => glib-networking_2.72.2.bb} | 2 +-
meta/recipes-core/meta/wic-tools.bb | 3 +-
.../sysvinit/sysvinit-inittab/start_getty | 3 +
meta/recipes-extended/timezone/timezone.inc | 6 +-
.../xz/xz/CVE-2022-1271.patch | 96 -------------------
.../xz/{xz_5.2.5.bb => xz_5.2.6.bb} | 7 +-
.../{epiphany_42.3.bb => epiphany_42.4.bb} | 2 +-
.../0001-Add-use_prebuilt_tools-option.patch | 18 ++--
.../gdk-pixbuf/CVE-2021-46829.patch | 61 ------------
.../gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | 20 ++--
...-pixbuf_2.42.6.bb => gdk-pixbuf_2.42.9.bb} | 19 ++--
...-turbo_2.1.3.bb => libjpeg-turbo_2.1.4.bb} | 2 +-
....06.06.bb => wireless-regdb_2022.08.12.bb} | 2 +-
.../{libwebp_1.2.3.bb => libwebp_1.2.4.bb} | 2 +-
...fdo_1.12.0.bb => wpebackend-fdo_1.12.1.bb} | 2 +-
meta/recipes-support/vim/vim.inc | 4 +-
scripts/lib/wic/misc.py | 7 +-
scripts/lib/wic/plugins/source/bootimg-efi.py | 25 +++--
27 files changed, 84 insertions(+), 231 deletions(-)
rename meta/lib/oeqa/selftest/cases/{git.py => intercept.py} (100%)
rename meta/recipes-core/glib-networking/{glib-networking_2.72.1.bb => glib-networking_2.72.2.bb} (93%)
delete mode 100644 meta/recipes-extended/xz/xz/CVE-2022-1271.patch
rename meta/recipes-extended/xz/{xz_5.2.5.bb => xz_5.2.6.bb} (88%)
rename meta/recipes-gnome/epiphany/{epiphany_42.3.bb => epiphany_42.4.bb} (94%)
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-46829.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.42.6.bb => gdk-pixbuf_2.42.9.bb} (87%)
rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.1.3.bb => libjpeg-turbo_2.1.4.bb} (97%)
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.06.06.bb => wireless-regdb_2022.08.12.bb} (94%)
rename meta/recipes-multimedia/webp/{libwebp_1.2.3.bb => libwebp_1.2.4.bb} (95%)
rename meta/recipes-sato/webkit/{wpebackend-fdo_1.12.0.bb => wpebackend-fdo_1.12.1.bb} (90%)
--
2.25.1
^ permalink raw reply [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 01/24] vim: Upgrade 9.0.0115 -> 9.0.0242
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 02/24] tzdata: upgrade 2022a -> 2022b Steve Sakoman
` (22 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Includes fixes for:
CVE-2022-2816
CVE-2022-2817
CVE-2022-2819
CVE-2022-2845
CVE-2022-2849
CVE-2022-2862
CVE-2022-2874
CVE-2022-2889
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3ec2d27d09444213ec1c9b91c6f8c4363f297294)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-support/vim/vim.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 48896465ed..5b95ab2625 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
file://no-path-adjust.patch \
"
-PV .= ".0115"
-SRCREV = "6747cf1671bd41cddee77c65b3f9a70509f968db"
+PV .= ".0242"
+SRCREV = "171c683237149262665135c7d5841a89bb156f53"
# Remove when 8.3 is out
UPSTREAM_VERSION_UNKNOWN = "1"
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 02/24] tzdata: upgrade 2022a -> 2022b
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 01/24] vim: Upgrade 9.0.0115 -> 9.0.0242 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 03/24] xz: update 5.2.5 -> 5.2.6 Steve Sakoman
` (21 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b301d5203a4da0a0985670848126c5db762ddc86)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-extended/timezone/timezone.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc
index cdd1a2ac3c..2b956cf7c0 100644
--- a/meta/recipes-extended/timezone/timezone.inc
+++ b/meta/recipes-extended/timezone/timezone.inc
@@ -6,7 +6,7 @@ SECTION = "base"
LICENSE = "PD & BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"
-PV = "2022a"
+PV = "2022b"
SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \
@@ -14,6 +14,6 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz
UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
-SRC_URI[tzcode.sha256sum] = "f8575e7e33be9ee265df2081092526b81c80abac3f4a04399ae9d4d91cdadac7"
-SRC_URI[tzdata.sha256sum] = "ef7fffd9f4f50f4f58328b35022a32a5a056b245c5cb3d6791dddb342f871664"
+SRC_URI[tzcode.sha256sum] = "bab20d943e59a3218435f48d868a4e552f18d6d7f3dd128660c5660c80b8a05f"
+SRC_URI[tzdata.sha256sum] = "f590eaf04a395245426c2be4fae71c143aea5cebc11088b7a0a5704461df397d"
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 03/24] xz: update 5.2.5 -> 5.2.6
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 01/24] vim: Upgrade 9.0.0115 -> 9.0.0242 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 02/24] tzdata: upgrade 2022a -> 2022b Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 04/24] Revert "gdk-pixbuf: CVE-2021-46829 a heap-based buffer overflow" Steve Sakoman
` (20 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
5.2.6 (2022-08-12)
* xz:
- The --keep option now accepts symlinks, hardlinks, and
setuid, setgid, and sticky files. Previously this required
using --force.
- When copying metadata from the source file to the destination
file, don't try to set the group (GID) if it is already set
correctly. This avoids a failure on OpenBSD (and possibly on
a few other OSes) where files may get created so that their
group doesn't belong to the user, and fchown(2) can fail even
if it needs to do nothing.
- Cap --memlimit-compress to 2000 MiB instead of 4020 MiB on
MIPS32 because on MIPS32 userspace processes are limited
to 2 GiB of address space.
* liblzma:
- Fixed a missing error-check in the threaded encoder. If a
small memory allocation fails, a .xz file with an invalid
Index field would be created. Decompressing such a file would
produce the correct output but result in an error at the end.
Thus this is a "mild" data corruption bug. Note that while
a failed memory allocation can trigger the bug, it cannot
cause invalid memory access.
- The decoder for .lzma files now supports files that have
uncompressed size stored in the header and still use the
end of payload marker (end of stream marker) at the end
of the LZMA stream. Such files are rare but, according to
the documentation in LZMA SDK, they are valid.
doc/lzma-file-format.txt was updated too.
- Improved 32-bit x86 assembly files:
* Support Intel Control-flow Enforcement Technology (CET)
* Use non-executable stack on FreeBSD.
- Visual Studio: Use non-standard _MSVC_LANG to detect C++
standard version in the lzma.h API header. It's used to
detect when "noexcept" can be used.
* xzgrep:
- Fixed arbitrary command injection via a malicious filename
(CVE-2022-1271, ZDI-CAN-16587). A standalone patch for
this was released to the public on 2022-04-07. A slight
robustness improvement has been made since then and, if
using GNU or *BSD grep, a new faster method is now used
that doesn't use the old sed-based construct at all. This
also fixes bad output with GNU grep >= 3.5 (2020-09-27)
when xzgrepping binary files.
This vulnerability was discovered by:
cleemy desu wayo working with Trend Micro Zero Day Initiative
- Fixed detection of corrupt .bz2 files.
- Improved error handling to fix exit status in some situations
and to fix handling of signals: in some situations a signal
didn't make xzgrep exit when it clearly should have. It's
possible that the signal handling still isn't quite perfect
but hopefully it's good enough.
- Documented exit statuses on the man page.
- xzegrep and xzfgrep now use "grep -E" and "grep -F" instead
of the deprecated egrep and fgrep commands.
- Fixed parsing of the options -E, -F, -G, -P, and -X. The
problem occurred when multiple options were specied in
a single argument, for example,
echo foo | xzgrep -Fe foo
treated foo as a filename because -Fe wasn't correctly
split into -F -e.
- Added zstd support.
* xzdiff/xzcmp:
- Fixed wrong exit status. Exit status could be 2 when the
correct value is 1.
- Documented on the man page that exit status of 2 is used
for decompression errors.
- Added zstd support.
* xzless:
- Fix less(1) version detection. It failed if the version number
from "less -V" contained a dot.
* Translations:
- Added new translations: Catalan, Croatian, Esperanto,
Korean, Portuguese, Romanian, Serbian, Spanish, Swedish,
and Ukrainian
- Updated the Brazilian Portuguese translation.
- Added French man page translation. This and the existing
German translation aren't complete anymore because the
English man pages got a few updates and the translators
weren't reached so that they could update their work.
* Build systems:
- Windows: Fix building of resource files when config.h isn't
used. CMake + Visual Studio can now build liblzma.dll.
- Various fixes to the CMake support. Building static or shared
liblzma should work fine in most cases. In contrast, building
the command line tools with CMake is still clearly incomplete
and experimental and should be used for testing only.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 7e3782f4d66973cb7ab922d4bbc6ef6241756ed2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../xz/xz/CVE-2022-1271.patch | 96 -------------------
.../xz/{xz_5.2.5.bb => xz_5.2.6.bb} | 7 +-
2 files changed, 2 insertions(+), 101 deletions(-)
delete mode 100644 meta/recipes-extended/xz/xz/CVE-2022-1271.patch
rename meta/recipes-extended/xz/{xz_5.2.5.bb => xz_5.2.6.bb} (88%)
diff --git a/meta/recipes-extended/xz/xz/CVE-2022-1271.patch b/meta/recipes-extended/xz/xz/CVE-2022-1271.patch
deleted file mode 100644
index e43e73cf12..0000000000
--- a/meta/recipes-extended/xz/xz/CVE-2022-1271.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From dc932a1e9c0d9f1db71be11a9b82496e3a72f112 Mon Sep 17 00:00:00 2001
-From: Lasse Collin <lasse.collin@tukaani.org>
-Date: Tue, 29 Mar 2022 19:19:12 +0300
-Subject: [PATCH] xzgrep: Fix escaping of malicious filenames (ZDI-CAN-16587).
-
-Malicious filenames can make xzgrep to write to arbitrary files
-or (with a GNU sed extension) lead to arbitrary code execution.
-
-xzgrep from XZ Utils versions up to and including 5.2.5 are
-affected. 5.3.1alpha and 5.3.2alpha are affected as well.
-This patch works for all of them.
-
-This bug was inherited from gzip's zgrep. gzip 1.12 includes
-a fix for zgrep.
-
-The issue with the old sed script is that with multiple newlines,
-the N-command will read the second line of input, then the
-s-commands will be skipped because it's not the end of the
-file yet, then a new sed cycle starts and the pattern space
-is printed and emptied. So only the last line or two get escaped.
-
-One way to fix this would be to read all lines into the pattern
-space first. However, the included fix is even simpler: All lines
-except the last line get a backslash appended at the end. To ensure
-that shell command substitution doesn't eat a possible trailing
-newline, a colon is appended to the filename before escaping.
-The colon is later used to separate the filename from the grep
-output so it is fine to add it here instead of a few lines later.
-
-The old code also wasn't POSIX compliant as it used \n in the
-replacement section of the s-command. Using \<newline> is the
-POSIX compatible method.
-
-LC_ALL=C was added to the two critical sed commands. POSIX sed
-manual recommends it when using sed to manipulate pathnames
-because in other locales invalid multibyte sequences might
-cause issues with some sed implementations. In case of GNU sed,
-these particular sed scripts wouldn't have such problems but some
-other scripts could have, see:
-
- info '(sed)Locale Considerations'
-
-This vulnerability was discovered by:
-cleemy desu wayo working with Trend Micro Zero Day Initiative
-
-Thanks to Jim Meyering and Paul Eggert discussing the different
-ways to fix this and for coordinating the patch release schedule
-with gzip.
-
-Upstream-Status: Backport [https://tukaani.org/xz/xzgrep-ZDI-CAN-16587.patch]
-CVE: CVE-2022-1271
-
-Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
----
- src/scripts/xzgrep.in | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in
-index 9db5c3a..f64dddb 100644
---- a/src/scripts/xzgrep.in
-+++ b/src/scripts/xzgrep.in
-@@ -179,22 +179,26 @@ for i; do
- { test $# -eq 1 || test $no_filename -eq 1; }; then
- eval "$grep"
- else
-+ # Append a colon so that the last character will never be a newline
-+ # which would otherwise get lost in shell command substitution.
-+ i="$i:"
-+
-+ # Escape & \ | and newlines only if such characters are present
-+ # (speed optimization).
- case $i in
- (*'
- '* | *'&'* | *'\'* | *'|'*)
-- i=$(printf '%s\n' "$i" |
-- sed '
-- $!N
-- $s/[&\|]/\\&/g
-- $s/\n/\\n/g
-- ');;
-+ i=$(printf '%s\n' "$i" | LC_ALL=C sed 's/[&\|]/\\&/g; $!s/$/\\/');;
- esac
-- sed_script="s|^|$i:|"
-+
-+ # $i already ends with a colon so don't add it here.
-+ sed_script="s|^|$i|"
-
- # Fail if grep or sed fails.
- r=$(
- exec 4>&1
-- (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
-+ (eval "$grep" 4>&-; echo $? >&4) 3>&- |
-+ LC_ALL=C sed "$sed_script" >&3 4>&-
- ) || r=2
- exit $r
- fi >&3 5>&-
diff --git a/meta/recipes-extended/xz/xz_5.2.5.bb b/meta/recipes-extended/xz/xz_5.2.6.bb
similarity index 88%
rename from meta/recipes-extended/xz/xz_5.2.5.bb
rename to meta/recipes-extended/xz/xz_5.2.6.bb
index 720e070f4a..3482622471 100644
--- a/meta/recipes-extended/xz/xz_5.2.5.bb
+++ b/meta/recipes-extended/xz/xz_5.2.6.bb
@@ -24,11 +24,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=97d554a32881fee0aa283d96e47cb24a \
file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \
"
-SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz \
- file://CVE-2022-1271.patch \
- "
-SRC_URI[md5sum] = "0d270c997aff29708c74d53f599ef717"
-SRC_URI[sha256sum] = "f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10"
+SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz"
+SRC_URI[sha256sum] = "a2105abee17bcd2ebd15ced31b4f5eda6e17efd6b10f921a01cda4a44c91b3a0"
UPSTREAM_CHECK_REGEX = "xz-(?P<pver>\d+(\.\d+)+)\.tar"
CACHED_CONFIGUREVARS += "gl_cv_posix_shell=/bin/sh"
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 04/24] Revert "gdk-pixbuf: CVE-2021-46829 a heap-based buffer overflow"
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (2 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 03/24] xz: update 5.2.5 -> 5.2.6 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 05/24] gdk-pixbuf: upgrade 2.42.6 -> 2.42.8 Steve Sakoman
` (19 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Hitendra Prajapati <hprajapati@mvista.com>
CVE will be fixed in subsequent stable release update
This reverts commit 978bc910ac326e34ec4f99c4645a80ed09c65407.
---
.../gdk-pixbuf/CVE-2021-46829.patch | 61 -------------------
.../gdk-pixbuf/gdk-pixbuf_2.42.6.bb | 1 -
2 files changed, 62 deletions(-)
delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-46829.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-46829.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-46829.patch
deleted file mode 100644
index 82ceae6348..0000000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-46829.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From dc296a24862c2bcfbfbd642abbb4826ec282f0a1 Mon Sep 17 00:00:00 2001
-From: Hitendra Prajapati <hprajapati@mvista.com>
-Date: Mon, 8 Aug 2022 17:28:21 +0530
-Subject: [PATCH] CVE-2021-46829
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/5398f04d772f7f8baf5265715696ed88db0f0512]
-CVE: CVE-2021-46829
-Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
----
- gdk-pixbuf/io-gif-animation.c | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-animation.c
-index 8335cdd..71d9265 100644
---- a/gdk-pixbuf/io-gif-animation.c
-+++ b/gdk-pixbuf/io-gif-animation.c
-@@ -369,7 +369,7 @@ composite_frame (GdkPixbufGifAnim *anim, GdkPixbufFrame *frame)
- for (i = 0; i < n_indexes; i++) {
- guint8 index = index_buffer[i];
- guint x, y;
-- int offset;
-+ gsize offset;
-
- if (index == frame->transparent_index)
- continue;
-@@ -379,11 +379,13 @@ composite_frame (GdkPixbufGifAnim *anim, GdkPixbufFrame *frame)
- if (x >= anim->width || y >= anim->height)
- continue;
-
-- offset = y * gdk_pixbuf_get_rowstride (anim->last_frame_data) + x * 4;
-- pixels[offset + 0] = frame->color_map[index * 3 + 0];
-- pixels[offset + 1] = frame->color_map[index * 3 + 1];
-- pixels[offset + 2] = frame->color_map[index * 3 + 2];
-- pixels[offset + 3] = 255;
-+ if (g_size_checked_mul (&offset, gdk_pixbuf_get_rowstride (anim->last_frame_data), y) &&
-+ g_size_checked_add (&offset, offset, x * 4)) {
-+ pixels[offset + 0] = frame->color_map[index * 3 + 0];
-+ pixels[offset + 1] = frame->color_map[index * 3 + 1];
-+ pixels[offset + 2] = frame->color_map[index * 3 + 2];
-+ pixels[offset + 3] = 255;
-+ }
- }
-
- out:
-@@ -448,8 +450,11 @@ gdk_pixbuf_gif_anim_iter_get_pixbuf (GdkPixbufAnimationIter *anim_iter)
- x_end = MIN (anim->last_frame->x_offset + anim->last_frame->width, anim->width);
- y_end = MIN (anim->last_frame->y_offset + anim->last_frame->height, anim->height);
- for (y = anim->last_frame->y_offset; y < y_end; y++) {
-- guchar *line = pixels + y * gdk_pixbuf_get_rowstride (anim->last_frame_data) + anim->last_frame->x_offset * 4;
-- memset (line, 0, (x_end - anim->last_frame->x_offset) * 4);
-+ gsize offset;
-+ if (g_size_checked_mul (&offset, gdk_pixbuf_get_rowstride (anim->last_frame_data), y) &&
-+ g_size_checked_add (&offset, offset, anim->last_frame->x_offset * 4)) {
-+ memset (pixels + offset, 0, (x_end - anim->last_frame->x_offset) * 4);
-+ }
- }
- break;
- case GDK_PIXBUF_FRAME_REVERT:
---
-2.25.1
-
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb
index b5ff29b5e3..55c16e4d66 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb
@@ -21,7 +21,6 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://run-ptest \
file://fatal-loader.patch \
file://0001-Add-use_prebuilt_tools-option.patch \
- file://CVE-2021-46829.patch \
"
SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f"
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 05/24] gdk-pixbuf: upgrade 2.42.6 -> 2.42.8
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (3 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 04/24] Revert "gdk-pixbuf: CVE-2021-46829 a heap-based buffer overflow" Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 06/24] gdk-pixbuf: update 2.42.8 -> 2.42.9 Steve Sakoman
` (18 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
2.42.8 (stable)
===
- Clear the pixbuf's memory buffer to avoid returning uninitialized memory [#199]
- Turn GdkPixbufModule functions into typed callbacks [!123]
- tiff: Use non-deprecated C99 integer types [!124]
- gif: Check for overflow when compositing or clearing frames [#190]
- Change png/jpeg/tiff build options from boolean to feature [!118]
- jpeg: Do not rely on UB around setjmp/longjmp [#143]
- Build fixes [!114, #185, #182]
- Documentation fixes [!120, !125]
- Translation updates
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d8398c88c6d950781709a112446d6a320e624346)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../{gdk-pixbuf_2.42.6.bb => gdk-pixbuf_2.42.8.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.42.6.bb => gdk-pixbuf_2.42.8.bb} (94%)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.8.bb
similarity index 94%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.8.bb
index 55c16e4d66..fb6829a7d1 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.8.bb
@@ -23,7 +23,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://0001-Add-use_prebuilt_tools-option.patch \
"
-SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f"
+SRC_URI[sha256sum] = "84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6"
inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package
@@ -39,9 +39,9 @@ PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \
${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
PACKAGECONFIG:class-native = "${GDK_PIXBUF_LOADERS}"
-PACKAGECONFIG[png] = "-Dpng=true,-Dpng=false,libpng"
-PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg"
-PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff"
+PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng"
+PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg"
+PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff"
PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false"
EXTRA_OEMESON:class-target = " \
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 06/24] gdk-pixbuf: update 2.42.8 -> 2.42.9
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (4 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 05/24] gdk-pixbuf: upgrade 2.42.6 -> 2.42.8 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 07/24] epiphany: upgrade 42.3 -> 42.4 Steve Sakoman
` (17 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
2.42.9 (stable)
===
- Fix the check for maximum value of LZW initial code size [#136, Robert Ancell]
- Use CMake for dependencies on Windows/MSVC [!131, Chun-Wei Fan]
- Add option for building tests [!132]
- Move man pages to reStructuredText [!134]
- Disable relocation when built as a static libary on Windows [!136, Hesham Essam]
- Update wrap file for libjpeg-turbo [!138, Georges Basile Stavracas Neto]
- Limit the memory size when loading image data [#205, Sam Ezeh]
Disable manpages, as they require rst2man.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 06fc6230823753f2325da7e0916eccc4daac5c6a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../0001-Add-use_prebuilt_tools-option.patch | 18 +++++++++--------
.../gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | 20 +++++++++----------
...-pixbuf_2.42.8.bb => gdk-pixbuf_2.42.9.bb} | 12 +++++++----
3 files changed, 28 insertions(+), 22 deletions(-)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.42.8.bb => gdk-pixbuf_2.42.9.bb} (91%)
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
index a8206a4507..02cc9a2a70 100644
--- 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
@@ -1,4 +1,4 @@
-From ba73bb0f3d2023839bc3b681c49b7ec1192cceb4 Mon Sep 17 00:00:00 2001
+From f81b60ebcbbfd9548c8aa1e388662c429068d1e3 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Sat, 8 May 2021 21:58:54 +0200
Subject: [PATCH] Add use_prebuilt_tools option
@@ -18,7 +18,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
5 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index 8b0590b..7331491 100644
+index 54ff9dd..2e321cf 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -342,13 +342,20 @@ foreach bin: gdkpixbuf_bin
@@ -45,16 +45,18 @@ index 8b0590b..7331491 100644
# 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 7a1409b..0bc73eb 100644
+index 813bd43..a93e6f7 100644
--- a/meson.build
+++ b/meson.build
-@@ -403,16 +403,16 @@ subdir('gdk-pixbuf')
+@@ -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')
- subdir('tests')
+ if get_option('tests')
+ subdir('tests')
+ endif
- subdir('thumbnailer')
endif
+subdir('thumbnailer')
@@ -69,10 +71,10 @@ index 7a1409b..0bc73eb 100644
gdk_pixbuf_bindir,
gdk_pixbuf_libdir,
diff --git a/meson_options.txt b/meson_options.txt
-index 0ee6718..cc29855 100644
+index d198d99..1c899e9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
-@@ -49,4 +49,8 @@ option('gio_sniffing',
+@@ -53,4 +53,8 @@ option('gio_sniffing',
description: 'Perform file type detection using GIO (Unused on MacOS and Windows)',
type: 'boolean',
value: true)
@@ -82,7 +84,7 @@ index 0ee6718..cc29855 100644
+ value: false)
diff --git a/tests/meson.build b/tests/meson.build
-index 7c6cb11..1029e6a 100644
+index 28c2525..d97c02d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -5,6 +5,12 @@
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
index 25410b11ea..dd580f8162 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
@@ -1,4 +1,4 @@
-From f00603d58d844422363b896ea7d07aaf48ddaa66 Mon Sep 17 00:00:00 2001
+From b511bd1efb43ffc49c753e309717a242ec686ef1 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 1 Apr 2014 17:23:36 +0100
Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal
@@ -14,10 +14,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
-index 312aa78..b813d99 100644
+index 1d39b44..2b00815 100644
--- a/gdk-pixbuf/queryloaders.c
+++ b/gdk-pixbuf/queryloaders.c
-@@ -212,7 +212,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info)
+@@ -216,7 +216,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info)
g_string_append_c (contents, '\n');
}
@@ -26,7 +26,7 @@ index 312aa78..b813d99 100644
query_module (GString *contents, const char *dir, const char *file)
{
char *path;
-@@ -221,6 +221,7 @@ query_module (GString *contents, const char *dir, const char *file)
+@@ -225,6 +225,7 @@ query_module (GString *contents, const char *dir, const char *file)
void (*fill_vtable) (GdkPixbufModule *module);
gpointer fill_info_ptr;
gpointer fill_vtable_ptr;
@@ -34,7 +34,7 @@ index 312aa78..b813d99 100644
if (g_path_is_absolute (file))
path = g_strdup (file);
-@@ -270,10 +271,13 @@ query_module (GString *contents, const char *dir, const char *file)
+@@ -274,10 +275,13 @@ query_module (GString *contents, const char *dir, const char *file)
g_module_error());
else
g_fprintf (stderr, "Cannot load loader %s\n", path);
@@ -47,8 +47,8 @@ index 312aa78..b813d99 100644
+ return ret;
}
- #ifdef G_OS_WIN32
-@@ -314,6 +318,7 @@ int main (int argc, char **argv)
+ #if defined(G_OS_WIN32) && defined(GDK_PIXBUF_RELOCATABLE)
+@@ -318,6 +322,7 @@ int main (int argc, char **argv)
gint first_file = 1;
GFile *pixbuf_libdir_file;
gchar *pixbuf_libdir;
@@ -56,7 +56,7 @@ index 312aa78..b813d99 100644
#ifdef G_OS_WIN32
gchar *libdir;
-@@ -452,7 +457,9 @@ int main (int argc, char **argv)
+@@ -456,7 +461,9 @@ int main (int argc, char **argv)
}
modules = g_list_sort (modules, (GCompareFunc)strcmp);
for (l = modules; l != NULL; l = l->next)
@@ -67,7 +67,7 @@ index 312aa78..b813d99 100644
g_list_free_full (modules, g_free);
g_free (moduledir);
#else
-@@ -468,7 +475,8 @@ int main (int argc, char **argv)
+@@ -472,7 +479,8 @@ int main (int argc, char **argv)
infilename = g_locale_to_utf8 (infilename,
-1, NULL, NULL, NULL);
#endif
@@ -77,7 +77,7 @@ index 312aa78..b813d99 100644
}
g_free (cwd);
}
-@@ -486,5 +494,8 @@ int main (int argc, char **argv)
+@@ -490,5 +498,8 @@ int main (int argc, char **argv)
g_free (pixbuf_libdir);
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.8.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.9.bb
similarity index 91%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.8.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.9.bb
index fb6829a7d1..d33718e3ea 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.8.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.9.bb
@@ -23,7 +23,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://0001-Add-use_prebuilt_tools-option.patch \
"
-SRC_URI[sha256sum] = "84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6"
+SRC_URI[sha256sum] = "28f7958e7bf29a32d4e963556d241d0a41a6786582ff6a5ad11665e0347fc962"
inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package
@@ -44,11 +44,13 @@ PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg"
PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff"
PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false"
-EXTRA_OEMESON:class-target = " \
+EXTRA_OEMESON = "-Dman=false"
+
+EXTRA_OEMESON:append:class-target = " \
-Duse_prebuilt_tools=true \
"
-EXTRA_OEMESON:class-nativesdk = " \
+EXTRA_OEMESON:append:class-nativesdk = " \
-Duse_prebuilt_tools=true \
"
@@ -95,9 +97,11 @@ do_install:append() {
}
-# Remove a bad fuzzing attempt that sporadically fails without a way to reproduce
do_install_ptest() {
+ # Remove a bad fuzzing attempt that sporadically fails without a way to reproduce
rm ${D}/${datadir}/installed-tests/gdk-pixbuf/pixbuf-randomly-modified.test
+ # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215
+ rm ${D}/${datadir}/installed-tests/gdk-pixbuf/pixbuf-jpeg.test
}
do_install:append:class-native() {
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 07/24] epiphany: upgrade 42.3 -> 42.4
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (5 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 06/24] gdk-pixbuf: update 2.42.8 -> 2.42.9 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 08/24] glib-networking: upgrade 2.72.1 -> 2.72.2 Steve Sakoman
` (16 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Release notes:
Fix crashes and misbehavior when importing bookmarks (#1800)
Fix desktop notification priority (!1179)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit de741b26b23406e30d064685be1254b0d6caed84)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../epiphany/{epiphany_42.3.bb => epiphany_42.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-gnome/epiphany/{epiphany_42.3.bb => epiphany_42.4.bb} (94%)
diff --git a/meta/recipes-gnome/epiphany/epiphany_42.3.bb b/meta/recipes-gnome/epiphany/epiphany_42.4.bb
similarity index 94%
rename from meta/recipes-gnome/epiphany/epiphany_42.3.bb
rename to meta/recipes-gnome/epiphany/epiphany_42.4.bb
index f9d60ff2a9..9efd2800da 100644
--- a/meta/recipes-gnome/epiphany/epiphany_42.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_42.4.bb
@@ -28,7 +28,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
file://migrator.patch \
file://distributor.patch \
"
-SRC_URI[archive.sha256sum] = "7316d3c6500e825d8e57293fa58047c56727bee16cd6b6ac804ffe5d9b229560"
+SRC_URI[archive.sha256sum] = "370938ad2920eeb28bc2435944776b7ba55a0e2ede65836f79818cfb7e8f0860"
PACKAGECONFIG_SOUP ?= "soup2"
PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 08/24] glib-networking: upgrade 2.72.1 -> 2.72.2
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (6 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 07/24] epiphany: upgrade 42.3 -> 42.4 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 09/24] libjpeg-turbo: upgrade 2.1.3 -> 2.1.4 Steve Sakoman
` (15 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
2.72.2 - August 5, 2022
=======================
- Drop environment proxy resolver to lowest priority (#190)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 10d01291e67d7308e1758590ac020af24ed0a42f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../{glib-networking_2.72.1.bb => glib-networking_2.72.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.72.1.bb => glib-networking_2.72.2.bb} (93%)
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.72.1.bb b/meta/recipes-core/glib-networking/glib-networking_2.72.2.bb
similarity index 93%
rename from meta/recipes-core/glib-networking/glib-networking_2.72.1.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.72.2.bb
index 41f18d1c48..746d1bc39c 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.72.1.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.72.2.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SECTION = "libs"
DEPENDS = "glib-2.0"
-SRC_URI[archive.sha256sum] = "6fc1bedc8062484dc8a0204965995ef2367c3db5c934058ff1607e5a24d95a74"
+SRC_URI[archive.sha256sum] = "cd2a084c7bb91d78e849fb55d40e472f6d8f6862cddc9f12c39149359ba18268"
PACKAGECONFIG ??= "openssl ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 09/24] libjpeg-turbo: upgrade 2.1.3 -> 2.1.4
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (7 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 08/24] glib-networking: upgrade 2.72.1 -> 2.72.2 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 10/24] libwebp: upgrade 1.2.3 -> 1.2.4 Steve Sakoman
` (14 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Significant changes relative to 2.1.3
- Fixed a regression introduced in 2.1.3 that caused build failures with Visual Studio 2010.
- The tjDecompressHeader3() function in the TurboJPEG C API and the TJDecompressor.setSourceImage()
method in the TurboJPEG Java API now accept "abbreviated table specification" (AKA "tables-only")
datastreams, which can be used to prime the decompressor with quantization and Huffman tables that
can be used when decompressing subsequent "abbreviated image" datastreams.
- libjpeg-turbo now performs run-time detection of AltiVec instructions on OS X/PowerPC systems if
AltiVec instructions are not enabled at compile time. This allows both AltiVec-equipped (PowerPC G4
and G5) and non-AltiVec-equipped (PowerPC G3) CPUs to be supported using the same build of libjpeg-turbo.
- Fixed an error ("Bogus virtual array access") that occurred when attempting to decompress a progressive
JPEG image with a height less than or equal to one iMCU (8 * the vertical sampling factor) using
buffered-image mode with interblock smoothing enabled. This was a regression introduced by 2.1 beta1[6(b)].
- Fixed two issues that prevented partial image decompression from working properly with buffered-image mode:
* Attempting to call jpeg_crop_scanline() after jpeg_start_decompress() but before jpeg_start_output() resulted
in an error ("Improper call to JPEG library in state 207".)
* Attempting to use jpeg_skip_scanlines() resulted in an error ("Bogus virtual array access") under
certain circumstances.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ec92b905bca2ea773966672283d5f45872091b31)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../jpeg/{libjpeg-turbo_2.1.3.bb => libjpeg-turbo_2.1.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.1.3.bb => libjpeg-turbo_2.1.4.bb} (97%)
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.3.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb
similarity index 97%
rename from meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.3.bb
rename to meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb
index fdc035d5f7..1708fa97f0 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.3.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb
@@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
file://0001-libjpeg-turbo-fix-package_qa-error.patch \
"
-SRC_URI[sha256sum] = "467b310903832b033fe56cd37720d1b73a6a3bd0171dbf6ff0b620385f4f76d0"
+SRC_URI[sha256sum] = "d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/"
UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 10/24] libwebp: upgrade 1.2.3 -> 1.2.4
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (8 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 09/24] libjpeg-turbo: upgrade 2.1.3 -> 2.1.4 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 11/24] wireless-regdb: upgrade 2022.06.06 -> 2022.08.12 Steve Sakoman
` (13 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
- 8/4/2022: version 1.2.4
This is a binary compatible release.
* restore CMake libwebpmux target name for compatibility with 1.2.2 (#575)
* fix lossless crunch mode encoding with WEBP_REDUCE_SIZE
(chromium: #1345547, #1345595, #1345772, #1345804)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit efabd3d0d72220f17249abc13d2ca758bdd0141a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../webp/{libwebp_1.2.3.bb => libwebp_1.2.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-multimedia/webp/{libwebp_1.2.3.bb => libwebp_1.2.4.bb} (95%)
diff --git a/meta/recipes-multimedia/webp/libwebp_1.2.3.bb b/meta/recipes-multimedia/webp/libwebp_1.2.4.bb
similarity index 95%
rename from meta/recipes-multimedia/webp/libwebp_1.2.3.bb
rename to meta/recipes-multimedia/webp/libwebp_1.2.4.bb
index 2d523df749..263589846a 100644
--- a/meta/recipes-multimedia/webp/libwebp_1.2.3.bb
+++ b/meta/recipes-multimedia/webp/libwebp_1.2.4.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \
file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7"
SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz"
-SRC_URI[sha256sum] = "f5d7ab2390b06b8a934a4fc35784291b3885b557780d099bd32f09241f9d83f9"
+SRC_URI[sha256sum] = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df"
UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html"
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 11/24] wireless-regdb: upgrade 2022.06.06 -> 2022.08.12
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (9 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 10/24] libwebp: upgrade 1.2.3 -> 1.2.4 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 12/24] wpebackend-fdo: upgrade 1.12.0 -> 1.12.1 Steve Sakoman
` (12 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 75386480abd1660a50c79d5987b77ccc43295511)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...ireless-regdb_2022.06.06.bb => wireless-regdb_2022.08.12.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2022.06.06.bb => wireless-regdb_2022.08.12.bb} (94%)
diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb
similarity index 94%
rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb
rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb
index 2eba4f873b..357e79d7e1 100644
--- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.06.06.bb
+++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2022.08.12.bb
@@ -5,7 +5,7 @@ LICENSE = "ISC"
LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "ac00f97efecce5046ed069d1d93f3365fdf994c7c7854a8fc50831e959537230"
+SRC_URI[sha256sum] = "59c8f7d17966db71b27f90e735ee8f5b42ca3527694a8c5e6e9b56bd379c3b84"
inherit bin_package allarch
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 12/24] wpebackend-fdo: upgrade 1.12.0 -> 1.12.1
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (10 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 11/24] wireless-regdb: upgrade 2022.06.06 -> 2022.08.12 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 13/24] sysvinit-inittab/start_getty: Fix respawn too fast Steve Sakoman
` (11 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
This is the first bug fix release in the stable 1.12 series.
Fixed a crash caused by trying to deallocate already freed graphics
buffers in certain situations.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit a614bb96fab31049614d8cb24062fe77c76c8e30)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../{wpebackend-fdo_1.12.0.bb => wpebackend-fdo_1.12.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-sato/webkit/{wpebackend-fdo_1.12.0.bb => wpebackend-fdo_1.12.1.bb} (90%)
diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.12.0.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.12.1.bb
similarity index 90%
rename from meta/recipes-sato/webkit/wpebackend-fdo_1.12.0.bb
rename to meta/recipes-sato/webkit/wpebackend-fdo_1.12.1.bb
index 4a18467ea4..5f776c13e6 100644
--- a/meta/recipes-sato/webkit/wpebackend-fdo_1.12.0.bb
+++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.12.1.bb
@@ -13,7 +13,7 @@ inherit meson features_check pkgconfig
REQUIRED_DISTRO_FEATURES = "opengl"
SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "6239c9c15523410798d66315de6b491712ab30009ba180f3e0dd076d9b0074ac"
+SRC_URI[sha256sum] = "45aa833c44ec292f31fa943b01b8cc75e54eb623ad7ba6a66fc2f118fe69e629"
# Especially helps compiling with clang which enable this as error when
# using c++11
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 13/24] sysvinit-inittab/start_getty: Fix respawn too fast
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (11 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 12/24] wpebackend-fdo: upgrade 1.12.0 -> 1.12.1 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 14/24] kernel-fitimage.bbclass: only package unique DTBs Steve Sakoman
` (10 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Bertrand Marquis <bertrand.marquis@arm.com>
When an entry in /dev does not exist, start_getty is returning directly.
As it is started from init in a respawn mode, it will loop infinitely.
In this case add a sleep inside start_getty to prevent the "Respawning
too fast" message popping up every 5 minutes.
This case is happening quite often when the system is started as an
hypervisor guest as the standard serial line is usually taken by it and
removed from the configuration.
This was triggered quite often running linux as dom0 on top of Xen on
arm as the serial line is taken by Xen and removed from the device tree.
Use the opportunity to replace one tab with spaces as the rest of the
file is using spaces.
Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5a704d0ff4d95b6d3a67b80a0db2be66253e7d61)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/sysvinit/sysvinit-inittab/start_getty | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty b/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty
index 699a1ead1a..3c31a95f7f 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty
@@ -14,4 +14,7 @@ esac
if [ -e /sys/class/tty/$2 -a -c /dev/$2 ]; then
${setsid:-} ${getty} -L $1 $2 $3
+else
+ # Prevent respawning to fast error if /dev entry does not exist
+ sleep 1000
fi
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 14/24] kernel-fitimage.bbclass: only package unique DTBs
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (12 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 13/24] sysvinit-inittab/start_getty: Fix respawn too fast Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 15/24] oeqa/parselogs: add qemuarmv5 arm-charlcd masking Steve Sakoman
` (9 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Awais Belal <Awais_Belal@mentor.com>
The KERNEL_DEVICETREE and related variables could potentially have a device
tree listed multiple times and this works okay for most scenarios. However,
when we create FIT entries for these we get duplicate nodes and uboot-mkimage
fails with
fit-image-initramfs-image.its:219.58-229.19: ERROR (duplicate_node_names): /images/fdt-freescale_imx8mp-evk-ecspi-slave.dtb: Duplicate node name
fit-image-initramfs-image.its:307.50-317.19: ERROR (duplicate_node_names): /images/fdt-freescale_imx8mp-evk-ndm.dtb: Duplicate node name
fit-image-initramfs-image.its:362.54-372.19: ERROR (duplicate_node_names): /images/fdt-freescale_imx8mp-evk-rm67199.dtb: Duplicate node name
fit-image-initramfs-image.its:417.56-427.19: ERROR (duplicate_node_names): /images/fdt-freescale_imx8mp-evk-usdhc1-m2.dtb: Duplicate node name
fit-image-initramfs-image.its:648.59-658.19: ERROR (duplicate_node_names): /configurations/conf-freescale_imx8mp-evk-ecspi-slave.dtb: Duplicate node name
fit-image-initramfs-image.its:744.51-754.19: ERROR (duplicate_node_names): /configurations/conf-freescale_imx8mp-evk-ndm.dtb: Duplicate node name
fit-image-initramfs-image.its:804.55-814.19: ERROR (duplicate_node_names): /configurations/conf-freescale_imx8mp-evk-rm67199.dtb: Duplicate node name
fit-image-initramfs-image.its:864.57-874.19: ERROR (duplicate_node_names): /configurations/conf-freescale_imx8mp-evk-usdhc1-m2.dtb: Duplicate node name
ERROR: Input tree has errors, aborting (use -f to force output)
uboot-mkimage: Can't open arch/arm64/boot/fitImage.tmp: No such file or directory
We fix this by tracking the DTBs we're compiling in the FIT and only picking
up unique ones.
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 98acfea1e82a90c920bdd636033f930ac034b318)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/kernel-fitimage.bbclass | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 7e09b075ff..56d71ba8fa 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -527,6 +527,10 @@ fitimage_assemble() {
fi
DTB=$(echo "$DTB" | tr '/' '_')
+
+ # Skip DTB if we've picked it up previously
+ echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
+
DTBS="$DTBS $DTB"
fitimage_emit_section_dtb $1 $DTB $DTB_PATH
done
@@ -536,6 +540,10 @@ fitimage_assemble() {
dtbcount=1
for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do
DTB=$(echo "$DTB" | tr '/' '_')
+
+ # Skip DTB if we've picked it up previously
+ echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
+
DTBS="$DTBS $DTB"
fitimage_emit_section_dtb $1 $DTB "${EXTERNAL_KERNEL_DEVICETREE}/$DTB"
done
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 15/24] oeqa/parselogs: add qemuarmv5 arm-charlcd masking
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (13 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 14/24] kernel-fitimage.bbclass: only package unique DTBs Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 16/24] package_rpm: Do not replace square brackets in %files Steve Sakoman
` (8 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Jon Mason <jdmason@kudzu.us>
On qemuarmv5, arm-charlcd is logging an error because the device isn't
present on the virtual machine. Mask it off, as that device could be
present on the physical hardware (and we want to use the same kernel
config as the real hardware).
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c03c33a4032f995a288f7287e79f43fcd3140aa1)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/runtime/cases/parselogs.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py
index 1f9365f3a8..a33d645155 100644
--- a/meta/lib/oeqa/runtime/cases/parselogs.py
+++ b/meta/lib/oeqa/runtime/cases/parselogs.py
@@ -140,6 +140,7 @@ ignore_errors = {
'Failed to initialize \'/amba/timer@101e3000\': -22',
'jitterentropy: Initialization failed with host not compliant with requirements: 2',
'clcd-pl11x: probe of 10120000.display failed with error -2',
+ 'arm-charlcd 10008000.lcd: error -ENXIO: IRQ index 0 not found'
] + common_errors,
'qemuarm64' : [
'Fatal server error:',
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 16/24] package_rpm: Do not replace square brackets in %files
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (14 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 15/24] oeqa/parselogs: add qemuarmv5 arm-charlcd masking Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 17/24] sanity: add a comment to ensure CONNECTIVITY_CHECK_URIS is correct Steve Sakoman
` (7 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Pavel Zhukov <pavel@zhukoff.net>
This reverts commit f95adb749619e70920c6cc6cd01c6d02cd348fd8.
At some point RPM stopped treating "[]?" characters in quoted text as a glob
This causes rpmbuild error [1] in oe-core if package contains filenames
with such characters [Yocto #13746]. Reverting commit which replaces "[]" with "?"
fixes the issue.
It should be safe now becuase rpm tries to use filename directly if not
found by glob [2].
[1]
| error: File not found: /mnt/builds/yocto/build/build/tmp/work/core2-64-poky-linux/testrpm/0.0.1-r0/package/42 All-Time Classics (E) ?v1.1?.cht
| File not found: /mnt/builds/yocto/build/build/tmp/work/core2-64-poky-linux/testrpm/0.0.1-r0/package/42 All-Time Classics (E) ?v1.1?.cht
|
[2] https://github.com/rpm-software-management/rpm/commit/c16c70cbd6b31cd93541d5c22d23ba98d212ad3d
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9916212b4810280108107d94cd2c0cd3e07ae6ed)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/package_rpm.bbclass | 6 ------
1 file changed, 6 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index e9ff1f7e65..bbbef3793f 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -193,8 +193,6 @@ python write_specfile () {
if path.endswith("DEBIAN") or path.endswith("CONTROL"):
continue
path = path.replace("%", "%%%%%%%%")
- path = path.replace("[", "?")
- path = path.replace("]", "?")
# Treat all symlinks to directories as normal files.
# os.walk() lists them as directories.
@@ -214,8 +212,6 @@ python write_specfile () {
if dir == "CONTROL" or dir == "DEBIAN":
continue
dir = dir.replace("%", "%%%%%%%%")
- dir = dir.replace("[", "?")
- dir = dir.replace("]", "?")
# All packages own the directories their files are in...
target.append('%dir "' + path + '/' + dir + '"')
else:
@@ -230,8 +226,6 @@ python write_specfile () {
if file == "CONTROL" or file == "DEBIAN":
continue
file = file.replace("%", "%%%%%%%%")
- file = file.replace("[", "?")
- file = file.replace("]", "?")
if conffiles.count(path + '/' + file):
target.append('%config "' + path + '/' + file + '"')
else:
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 17/24] sanity: add a comment to ensure CONNECTIVITY_CHECK_URIS is correct
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (15 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 16/24] package_rpm: Do not replace square brackets in %files Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 18/24] oeqa/qemurunner: add run_serial() comment Steve Sakoman
` (6 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Shubham Kulkarni <skulkarni@mvista.com>
In sanity.bbclass, in function check_connectivity :
Connectivity is tested by fetching URIs in variable CONNECTIVITY_CHECK_URIS.
If none is accessible, the status error is ambiguous.
It says to ensure the host's network is correctly configured but
never if the remote is available.
Signed-off-by: Shubham Kulkarni <skulkarni@mvista.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9865176df6b6362a410b0fc3c115d942462dc338)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/sanity.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index b1fac107d5..a79e36b594 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -351,6 +351,7 @@ def check_connectivity(d):
if len(msg) == 0:
msg = "%s.\n" % err
msg += " Please ensure your host's network is configured correctly.\n"
+ msg += " Please ensure CONNECTIVITY_CHECK_URIS is correct and specified URIs are available.\n"
msg += " If your ISP or network is blocking the above URL,\n"
msg += " try with another domain name, for example by setting:\n"
msg += " CONNECTIVITY_CHECK_URIS = \"https://www.example.com/\""
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 18/24] oeqa/qemurunner: add run_serial() comment
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (16 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 17/24] sanity: add a comment to ensure CONNECTIVITY_CHECK_URIS is correct Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 19/24] oeqa/selftest: rename git.py to intercept.py Steve Sakoman
` (5 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
Add a comment explaining the non-obvious return codes.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6572baffa02ba6b8a686490d55af17cacb528920)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/utils/qemurunner.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 76296d50cd..4c3d2010fb 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -618,6 +618,8 @@ class QemuRunner:
return self.qmp.cmd(command)
def run_serial(self, command, raw=False, timeout=60):
+ # Returns (status, output) where status is 1 on success and 0 on error
+
# We assume target system have echo to get command status
if not raw:
command = "%s; echo $?\n" % command
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 19/24] oeqa/selftest: rename git.py to intercept.py
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (17 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 18/24] oeqa/qemurunner: add run_serial() comment Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 20/24] oeqa/gotoolchain: put writable files in the Go module cache Steve Sakoman
` (4 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
By naming this test class git.py, any attempt to import GitPython (as
needed by oelib.buildhistory) failed.
As this class exercises the intercepts, rename it to intercept.py.
(From OE-Core rev: d557cbbf86767bc2ebf2beb3d70af3b3ca5e0529)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/{git.py => intercept.py} | 0
meta/lib/oeqa/selftest/cases/oelib/buildhistory.py | 6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/lib/oeqa/selftest/cases/{git.py => intercept.py} (100%)
diff --git a/meta/lib/oeqa/selftest/cases/git.py b/meta/lib/oeqa/selftest/cases/intercept.py
similarity index 100%
rename from meta/lib/oeqa/selftest/cases/git.py
rename to meta/lib/oeqa/selftest/cases/intercept.py
diff --git a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
index 802a91a488..33bd6df2f3 100644
--- a/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
+++ b/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
@@ -3,6 +3,7 @@
#
import os
+import sys
from oeqa.selftest.case import OESelftestTestCase
import tempfile
import operator
@@ -11,15 +12,14 @@ from oeqa.utils.commands import get_bb_var
class TestBlobParsing(OESelftestTestCase):
def setUp(self):
- import time
self.repo_path = tempfile.mkdtemp(prefix='selftest-buildhistory',
dir=get_bb_var('TOPDIR'))
try:
from git import Repo
self.repo = Repo.init(self.repo_path)
- except ImportError:
- self.skipTest('Python module GitPython is not present')
+ except ImportError as e:
+ self.skipTest('Python module GitPython is not present (%s) (%s)' % (e, sys.path))
self.test_file = "test"
self.var_map = {}
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 20/24] oeqa/gotoolchain: put writable files in the Go module cache
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (18 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 19/24] oeqa/selftest: rename git.py to intercept.py Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 21/24] oeqa/gotoolchain: set CGO_ENABLED=1 Steve Sakoman
` (3 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
By default 'go mod' creates read-only files, but that just complicates
things. Add -modcacherw to make the cache read/write, so it can be
cleaned up without needing to chmod.
(From OE-Core rev: 7ff30e0d9fe8527cbc2f8ca84e0300fdc84663b6)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/gotoolchain.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/gotoolchain.py b/meta/lib/oeqa/selftest/cases/gotoolchain.py
index c809d7c9b1..345f533379 100644
--- a/meta/lib/oeqa/selftest/cases/gotoolchain.py
+++ b/meta/lib/oeqa/selftest/cases/gotoolchain.py
@@ -43,12 +43,6 @@ class oeGoToolchainSelfTest(OESelftestTestCase):
@classmethod
def tearDownClass(cls):
- # Go creates file which are readonly
- for dirpath, dirnames, filenames in os.walk(cls.tmpdir_SDKQA):
- for filename in filenames + dirnames:
- f = os.path.join(dirpath, filename)
- if not os.path.islink(f):
- os.chmod(f, 0o775)
shutil.rmtree(cls.tmpdir_SDKQA, ignore_errors=True)
super(oeGoToolchainSelfTest, cls).tearDownClass()
@@ -56,6 +50,7 @@ class oeGoToolchainSelfTest(OESelftestTestCase):
cmd = "cd %s/src/%s/%s; " % (self.go_path, proj, name)
cmd = cmd + ". %s; " % self.env_SDK
cmd = cmd + "export GOPATH=%s; " % self.go_path
+ cmd = cmd + "export GOFLAGS=-modcacherw; "
cmd = cmd + "${CROSS_COMPILE}go %s" % gocmd
return runCmd(cmd).status
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 21/24] oeqa/gotoolchain: set CGO_ENABLED=1
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (19 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 20/24] oeqa/gotoolchain: put writable files in the Go module cache Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 22/24] wic: add target tools to PATH when executing native commands Steve Sakoman
` (2 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
In cross-compiles CGO_ENABLED=1 needs to be set explicitly, as otherwise
Go refuses to use it even if CC is already set.
This fixes the selftest on setups where the host and the SDK target
don't have matching architectures.
[ YOCTO #14859 ]
(From OE-Core rev: 19be072619d39267df44f23c4c8b64f3808f6148)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/gotoolchain.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/selftest/cases/gotoolchain.py b/meta/lib/oeqa/selftest/cases/gotoolchain.py
index 345f533379..978898b86f 100644
--- a/meta/lib/oeqa/selftest/cases/gotoolchain.py
+++ b/meta/lib/oeqa/selftest/cases/gotoolchain.py
@@ -51,6 +51,7 @@ class oeGoToolchainSelfTest(OESelftestTestCase):
cmd = cmd + ". %s; " % self.env_SDK
cmd = cmd + "export GOPATH=%s; " % self.go_path
cmd = cmd + "export GOFLAGS=-modcacherw; "
+ cmd = cmd + "export CGO_ENABLED=1; "
cmd = cmd + "${CROSS_COMPILE}go %s" % gocmd
return runCmd(cmd).status
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 22/24] wic: add target tools to PATH when executing native commands
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (20 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 21/24] oeqa/gotoolchain: set CGO_ENABLED=1 Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 23/24] wic/bootimg-efi: use cross objcopy when building unified kernel image Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 24/24] wic: depend on cross-binutils Steve Sakoman
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
We might want to run a cross tool, such as objcopy, in wic. These are
in a TARGET_SYS/ subdirectory under /usr/bin, so add that directory to
the search path too.
(From OE-Core rev: c523549141e5c31edc75281f581d97867b7d251d)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
scripts/lib/wic/misc.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
index 3e11822996..a8aab6c524 100644
--- a/scripts/lib/wic/misc.py
+++ b/scripts/lib/wic/misc.py
@@ -140,11 +140,12 @@ def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""):
cmd_and_args = pseudo + cmd_and_args
hosttools_dir = get_bitbake_var("HOSTTOOLS_DIR")
+ target_sys = get_bitbake_var("TARGET_SYS")
- native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/bin:%s" % \
+ native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/usr/bin/%s:%s/bin:%s" % \
(native_sysroot, native_sysroot,
- native_sysroot, native_sysroot,
- hosttools_dir)
+ native_sysroot, native_sysroot, target_sys,
+ native_sysroot, hosttools_dir)
native_cmd_and_args = "export PATH=%s:$PATH;%s" % \
(native_paths, cmd_and_args)
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 23/24] wic/bootimg-efi: use cross objcopy when building unified kernel image
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (21 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 22/24] wic: add target tools to PATH when executing native commands Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 24/24] wic: depend on cross-binutils Steve Sakoman
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
We can't rely on the host objcopy knowing how to process target binaries,
so use the cross objcopy in the sysroot instead.
Also construct the command argument-by-argument as the format expression
was getting unwieldy.
(From OE-Core rev: 0264aeedbf21e9e7a104243c11b3b57f00e38bda)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
scripts/lib/wic/plugins/source/bootimg-efi.py | 25 +++++++++----------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 0391aebdc8..a65a5b9780 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -326,21 +326,20 @@ class BootimgEFIPlugin(SourcePlugin):
exec_cmd(install_cmd)
staging_dir_host = get_bitbake_var("STAGING_DIR_HOST")
+ target_sys = get_bitbake_var("TARGET_SYS")
# https://www.freedesktop.org/software/systemd/man/systemd-stub.html
- objcopy_cmd = "objcopy \
- --add-section .osrel=%s --change-section-vma .osrel=0x20000 \
- --add-section .cmdline=%s --change-section-vma .cmdline=0x30000 \
- --add-section .linux=%s --change-section-vma .linux=0x2000000 \
- --add-section .initrd=%s --change-section-vma .initrd=0x3000000 \
- %s %s" % \
- ("%s/usr/lib/os-release" % staging_dir_host,
- cmdline.name,
- "%s/%s" % (staging_kernel_dir, kernel),
- initrd.name,
- efi_stub,
- "%s/EFI/Linux/linux.efi" % hdddir)
- exec_cmd(objcopy_cmd)
+ objcopy_cmd = "%s-objcopy" % target_sys
+ objcopy_cmd += " --add-section .osrel=%s/usr/lib/os-release" % staging_dir_host
+ objcopy_cmd += " --change-section-vma .osrel=0x20000"
+ objcopy_cmd += " --add-section .cmdline=%s" % cmdline.name
+ objcopy_cmd += " --change-section-vma .cmdline=0x30000"
+ objcopy_cmd += " --add-section .linux=%s/%s" % (staging_kernel_dir, kernel)
+ objcopy_cmd += " --change-section-vma .linux=0x2000000"
+ objcopy_cmd += " --add-section .initrd=%s" % initrd.name
+ objcopy_cmd += " --change-section-vma .initrd=0x3000000"
+ objcopy_cmd += " %s %s/EFI/Linux/linux.efi" % (efi_stub, hdddir)
+ exec_native_cmd(objcopy_cmd, native_sysroot)
else:
install_cmd = "install -m 0644 %s/%s %s/%s" % \
(staging_kernel_dir, kernel, hdddir, kernel)
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [OE-core][kirkstone 24/24] wic: depend on cross-binutils
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
` (22 preceding siblings ...)
2022-08-27 18:25 ` [OE-core][kirkstone 23/24] wic/bootimg-efi: use cross objcopy when building unified kernel image Steve Sakoman
@ 2022-08-27 18:25 ` Steve Sakoman
23 siblings, 0 replies; 25+ messages in thread
From: Steve Sakoman @ 2022-08-27 18:25 UTC (permalink / raw
To: openembedded-core
From: Ross Burton <ross.burton@arm.com>
Wic can build an unified kernel image, but this needs the cross-objcopy
from binutils.
(From OE-Core rev: 7c7a488116f49083ca42d3628ebc0870585110c3)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/image_types_wic.bbclass | 2 ++
meta/recipes-core/meta/wic-tools.bb | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index e3863c88a9..5374d6125e 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -84,6 +84,8 @@ do_image_wic[deptask] += "do_image_complete"
WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}'
WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native"
+# Unified kernel images need objcopy
+WKS_FILE_DEPENDS_DEFAULT += "virtual/${TARGET_PREFIX}binutils"
WKS_FILE_DEPENDS_BOOTLOADERS = ""
WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release"
WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release"
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb
index ba0916cb56..daaf3ea576 100644
--- a/meta/recipes-core/meta/wic-tools.bb
+++ b/meta/recipes-core/meta/wic-tools.bb
@@ -6,7 +6,8 @@ DEPENDS = "\
parted-native gptfdisk-native dosfstools-native \
mtools-native bmap-tools-native grub-native cdrtools-native \
btrfs-tools-native squashfs-tools-native pseudo-native \
- e2fsprogs-native util-linux-native tar-native\
+ e2fsprogs-native util-linux-native tar-native \
+ virtual/${TARGET_PREFIX}binutils \
"
DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot"
DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot"
--
2.25.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
end of thread, other threads:[~2022-08-27 18:27 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-27 18:25 [OE-core][kirkstone 00/24] Patch review Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 01/24] vim: Upgrade 9.0.0115 -> 9.0.0242 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 02/24] tzdata: upgrade 2022a -> 2022b Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 03/24] xz: update 5.2.5 -> 5.2.6 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 04/24] Revert "gdk-pixbuf: CVE-2021-46829 a heap-based buffer overflow" Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 05/24] gdk-pixbuf: upgrade 2.42.6 -> 2.42.8 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 06/24] gdk-pixbuf: update 2.42.8 -> 2.42.9 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 07/24] epiphany: upgrade 42.3 -> 42.4 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 08/24] glib-networking: upgrade 2.72.1 -> 2.72.2 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 09/24] libjpeg-turbo: upgrade 2.1.3 -> 2.1.4 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 10/24] libwebp: upgrade 1.2.3 -> 1.2.4 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 11/24] wireless-regdb: upgrade 2022.06.06 -> 2022.08.12 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 12/24] wpebackend-fdo: upgrade 1.12.0 -> 1.12.1 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 13/24] sysvinit-inittab/start_getty: Fix respawn too fast Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 14/24] kernel-fitimage.bbclass: only package unique DTBs Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 15/24] oeqa/parselogs: add qemuarmv5 arm-charlcd masking Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 16/24] package_rpm: Do not replace square brackets in %files Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 17/24] sanity: add a comment to ensure CONNECTIVITY_CHECK_URIS is correct Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 18/24] oeqa/qemurunner: add run_serial() comment Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 19/24] oeqa/selftest: rename git.py to intercept.py Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 20/24] oeqa/gotoolchain: put writable files in the Go module cache Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 21/24] oeqa/gotoolchain: set CGO_ENABLED=1 Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 22/24] wic: add target tools to PATH when executing native commands Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 23/24] wic/bootimg-efi: use cross objcopy when building unified kernel image Steve Sakoman
2022-08-27 18:25 ` [OE-core][kirkstone 24/24] wic: depend on cross-binutils Steve Sakoman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.