Skip to contentSkip to conversation

Patch review

PATCH In review Steve Sakoman 3 participants 27 messages Jun 15, 2020 – Jun 18, 2020

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this next set of patches for dunfell and have comments back by end of day Wednesday.

The following changes since commit 6fa967f194edd314c9026c80f8d93360ac6d9efa:

build-appliance-image: Update to dunfell head revision (2020-06-08 21:45:09 +0100)

are available in the Git repository at:

git://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut

Alexander Kanavin (3):
lz4: disable static library
linux-firmware: upgrade 20200421 -> 20200519
build-sysroots: add sysroot paths with native binaries to PATH

Chen Qi (1):
db: do not install db_verify if 'verify' is not enabled

Joe Slater (2):
qemu: force build type to production
vim: _FORTIFY_SOURCE=2 be gone

Konrad Weihmann (2):
sysfsutils: rem leftover settings for libsysfs-dev
cogl: point to correct HOMEPAGE

Marco Felsch (1):
util-linux: alternatify rtcwake

Paul Barker (3):
archiver: Fix test case for srpm archiver mode
oe-selftest: Allow overriding the build directory used for tests
oe-selftest: Recursively patch test case paths

Peter Kjellerstedt (1):
cairo: Do not try to remove nonexistent directories

Ralph Siemsen (1):
cve-check: include epoch in product version output

Richard Purdie (5):
ltp: Exclude the memcg_stress tests due to timeout problems
maintainers: Update Ross' email address
logrotate: Drop obsolete setting/comment oeqa/targetcontrol: Rework exception handling to avoid warnings
patchelf: Add patch to address corrupt shared library issue

Wang Mingyu (1):
ca-certificates: upgrade 20190110 -> 20200601

hongxu (1):
core-image-minimal-initramfs: keep restriction with
initramfs-module-install

 meta/classes/cve-check.bbclass                |   2 +-
 meta/conf/distro/include/maintainers.inc      | 126 +++++++++---------
 meta/lib/oeqa/selftest/cases/archiver.py      |   1 +
 meta/lib/oeqa/selftest/context.py             |  24 +++-
 meta/lib/oeqa/targetcontrol.py                |   5 +-
 meta/lib/oeqa/utils/commands.py               |   5 +-
 .../images/core-image-minimal-initramfs.bb    |   4 +-
 meta/recipes-core/meta/build-sysroots.bb      |   4 +
 .../sysfsutils/sysfsutils_2.1.0.bb            |   2 -
 meta/recipes-core/util-linux/util-linux.inc   |   1 +
 .../patchelf/patchelf/fix-phdrs.patch         |  37 +++++
 .../patchelf/patchelf_0.10.bb                 |   1 +
 meta/recipes-devtools/qemu/qemu_4.2.0.bb      |   5 +
 .../logrotate/logrotate_3.15.1.bb             |   7 -
 meta/recipes-extended/ltp/ltp_20200120.bb     |   4 +
 meta/recipes-graphics/cairo/cairo_1.16.0.bb   |   6 +-
 meta/recipes-graphics/cogl/cogl-1.0.inc       |   2 +-
 ...20200421.bb => linux-firmware_20200519.bb} |   5 +-
 ...0190110.bb => ca-certificates_20200601.bb} |   4 +-
 meta/recipes-support/db/db_5.3.28.bb          |   3 +
 meta/recipes-support/lz4/lz4_1.9.2.bb         |   2 +-
 meta/recipes-support/vim/vim_8.2.bb           |   5 +
 22 files changed, 162 insertions(+), 93 deletions(-)
 create mode 100644 meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200421.bb => linux-firmware_20200519.bb} (99%)
 rename meta/recipes-support/ca-certificates/{ca-certificates_20190110.bb => ca-certificates_20200601.bb} (95%)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/21 core-image-minimal-initramfs: keep restriction with initramfs-module-install

From: hongxu <[email protected]>

Since commit [882ae0dcce core-image-minimal-initramfs: use initramfs-framework for initialization] applied, it should keep the restriction with initramfs-module-install

(cherry picked from commit 295dbabce213855432b6274026e3b45a18b90e80)
---
 meta/recipes-core/images/core-image-minimal-initramfs.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/images/core-image-minimal-initramfs.bb +2 -2
index 7df8ab1ebd..83d0eaa8df 100644
@@ -27,5 +27,5 @@ inherit core-image
 IMAGE_ROOTFS_SIZE = "8192"
 IMAGE_ROOTFS_EXTRA_SPACE = "0"
 
-# Use the same restriction as initramfs-live-install
-COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
+# Use the same restriction as initramfs-module-install
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/21 ltp: Exclude the memcg_stress tests due to timeout problems

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

This test runs for 900s, we often see tests killed after 300s without output which makes the test results unreliable and inconsistent. The easiest solution for now is to skip this long running test, patching it out wth sed.

(cherry picked from commit 0739a8901140c05d037517ffd89382f151ba627c)
---
 meta/recipes-extended/ltp/ltp_20200120.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-extended/ltp/ltp_20200120.bb +4 -0
index deac3917d7..b25da4030d 100644
@@ -74,6 +74,10 @@ do_install(){
          -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \
          -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \
          -e 's@[^ ]*--sysroot=[^ "]*@@g' 
+
+    # The controllers memcg_stree test seems to cause us hangs and takes 900s
+    # (maybe we expect more regular output?), anyhow, skip it
+    sed -e '/^memcg_stress/d' -i ${D}${prefix}/runtest/controllers
 }
 
 RDEPENDS_${PN} = "\
Signature · 1 line
2.17.1
#3 lore raw

PATCH 3/21 util-linux: alternatify rtcwake

In reply to Steve Sakoman

From: Marco Felsch <[email protected]>

This tool can be turned on in busybox which lead into a error during do_rootfs.

(cherry picked from commit eb22e7a1190a79fd74ae54f23a13ec4932f41b0d)
---
 meta/recipes-core/util-linux/util-linux.inc | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/util-linux/util-linux.inc +1 -0
index 0566569a61..532cceb935 100644
@@ -257,6 +257,7 @@ ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile"
 ALTERNATIVE_LINK_NAME[renice] = "${bindir}/renice"
 ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev"
 ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill"
+ALTERNATIVE_LINK_NAME[rtcwake] = "${sbindir}/rtcwake"
 ALTERNATIVE_LINK_NAME[setpriv] = "${bindir}/setpriv"
 ALTERNATIVE_LINK_NAME[setsid] = "${bindir}/setsid"
 ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su"
Signature · 1 line
2.17.1
#4 lore raw

PATCH 4/21 sysfsutils: rem leftover settings for libsysfs-dev

In reply to Steve Sakoman

From: Konrad Weihmann <[email protected]>

22af6a2595dbec98ce4a2e3b1324ad8d400390ad removed the PACKAGES setting, but left the FILES-assignments of libsysfs-dev and -staticdev. As these have no use anymore they can be safely removed

(cherry picked from commit 941cc0cd0a69e95ca571a9a8cb0732bb06fa2b3a)
---
 meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb | 2 --
 1 file changed, 2 deletions(-)
meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb +0 -2
index f9f067dcad..34bf431f40 100644
@@ -27,7 +27,5 @@ inherit autotools
 
 PACKAGES =+ "libsysfs"
 FILES_libsysfs = "${libdir}/lib*${SOLIBS}"
-FILES_libsysfs-dev = "${libdir}/lib*${SOLIBSDEV} ${includedir}"
-FILES_libsysfs-staticdev = "${libdir}/lib*.a"
 
 export libdir = "${base_libdir}"
Signature · 1 line
2.17.1
#5 lore raw

PATCH 5/21 lz4: disable static library

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

It was found to be built in a non-reproducible way.

[YOCTO #13925]

(cherry picked from commit f8f3f03e7ffcefdb6a97b747a26276dec4bfa77c)
---
 meta/recipes-support/lz4/lz4_1.9.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/lz4/lz4_1.9.2.bb +1 -1
index ed4452c82e..6510156ed0 100644
@@ -21,7 +21,7 @@ S = "${WORKDIR}/git"
 # Fixed in r118, which is larger than the current version.
 CVE_CHECK_WHITELIST += "CVE-2014-4715"
 
-EXTRA_OEMAKE = "PREFIX=${prefix} CC='${CC}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir}"
+EXTRA_OEMAKE = "PREFIX=${prefix} CC='${CC}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir} BUILD_STATIC=no"
 
 do_install() {
 	oe_runmake install
Signature · 1 line
2.17.1
#6 lore raw

PATCH 6/21 maintainers: Update Ross' email address

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Update Ross' address to a valid one.

(cherry picked from commit 22e1605ce45482c49d06a7c56a46b71f76955e31)
---
 meta/conf/distro/include/maintainers.inc | 126 +++++++++++------------
 1 file changed, 63 insertions(+), 63 deletions(-)
meta/conf/distro/include/maintainers.inc +63 -63
index a429b70e9b..4570fac454 100644
@@ -28,9 +28,9 @@
 # Please keep this list in alphabetical order.
 #
 RECIPE_MAINTAINER_pn-acl = "Chen Qi <[email protected]>"
-RECIPE_MAINTAINER_pn-acpica = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-acpid = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-adwaita-icon-theme = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-acpica = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-acpid = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-adwaita-icon-theme = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-alsa-lib = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-alsa-plugins = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-alsa-state = "Tanu Kaskinen <[email protected]>"
@@ -96,15 +96,15 @@ RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <[email protected]
 RECIPE_MAINTAINER_pn-ccache = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao <[email protected]>"
-RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-clutter-gtk-1.0 = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-clutter-gtk-1.0 = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-cmake = "Pascal Bach <[email protected]>"
 RECIPE_MAINTAINER_pn-cmake-native = "Pascal Bach <[email protected]>"
-RECIPE_MAINTAINER_pn-cogl-1.0 = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-cogl-1.0 = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-connman = "Changhyeok Bae <[email protected]>"
-RECIPE_MAINTAINER_pn-connman-conf = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-connman-gnome = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-connman-conf = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-connman-gnome = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-consolekit = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-core-image-base = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-core-image-minimal = "Richard Purdie <[email protected]>"
@@ -135,8 +135,8 @@ RECIPE_MAINTAINER_pn-cryptodev-module = "Robert Yang <[email protected]>
 RECIPE_MAINTAINER_pn-cryptodev-tests = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-cups = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-curl = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-cve-update-db-native = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-cwautomacros = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-cve-update-db-native = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-cwautomacros = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-db = "Mark Hatle <[email protected]>"
 RECIPE_MAINTAINER_pn-dbus = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-dbus-glib = "Chen Qi <[email protected]>"
@@ -164,8 +164,8 @@ RECIPE_MAINTAINER_pn-dtc = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-dwarfsrcfiles = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-e2fsprogs = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-efivar = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-efibootmgr = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-efivar = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-efibootmgr = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-elfutils = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-ell = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-enchant2 = "Anuj Mittal <[email protected]>"
@@ -182,10 +182,10 @@ RECIPE_MAINTAINER_pn-flac = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-flex = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-font-util = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-fontconfig = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-formfactor = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-freetype = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-fribidi = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-fontconfig = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-formfactor = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-freetype = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-fribidi = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-fts = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-gawk = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-gcc = "Khem Raj <[email protected]>"
@@ -195,13 +195,13 @@ RECIPE_MAINTAINER_pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-gcc-runtime = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-gcc-sanitizers = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-gcc-source-9.3.0 = "Khem Raj <[email protected]>"
-RECIPE_MAINTAINER_pn-gconf = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-gconf = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-gcr = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-gdb = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-gdb-cross-${TARGET_ARCH} = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-gdbm = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-gdk-pixbuf = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-gdk-pixbuf = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-gettext = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-gettext-minimal-native = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-ghostscript = "Hongxu Jia <[email protected]>"
@@ -216,7 +216,7 @@ RECIPE_MAINTAINER_pn-glibc-scripts = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-glibc-testsuite = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-glide = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-gmp = "Khem Raj <[email protected]>"
-RECIPE_MAINTAINER_pn-gnome-desktop-testing = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-gnome-desktop-testing = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-gnu-config = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-gnu-efi = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-gnupg = "Hongxu Jia <[email protected]>"
@@ -252,7 +252,7 @@ RECIPE_MAINTAINER_pn-gstreamer1.0-plugins-ugly = "Anuj Mittal <anuj.mittal@intel
 RECIPE_MAINTAINER_pn-gstreamer1.0-python = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-gstreamer1.0-rtsp-server = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-gstreamer1.0-vaapi = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-gtk+3 = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-gtk+3 = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-gtk-doc = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-gzip = "Denys Dmytriyenko <[email protected]>"
 RECIPE_MAINTAINER_pn-harfbuzz = "Anuj Mittal <[email protected]>"
@@ -335,17 +335,17 @@ RECIPE_MAINTAINER_pn-libgcc-initial = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libgcrypt = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-libgfortran = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libgloss = "Alejandro Hernandez <[email protected]>"
-RECIPE_MAINTAINER_pn-libglu = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-libglu = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libgpg-error = "Hongxu Jia <[email protected]>"
-RECIPE_MAINTAINER_pn-libgudev = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-libical = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-libgudev = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-libical = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libice = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen <[email protected]>"
-RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-libinput = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-libinput = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libksba = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <[email protected]>"
@@ -449,7 +449,7 @@ RECIPE_MAINTAINER_pn-llvm = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-logrotate = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-lrzsz = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-lsb-release = "Hongxu Jia <[email protected]>"
-RECIPE_MAINTAINER_pn-lsof = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-lsof = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-ltp = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-lttng-modules = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-lttng-tools = "Richard Purdie <[email protected]>"
@@ -466,18 +466,18 @@ RECIPE_MAINTAINER_pn-makedevs = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-make-mod-scripts = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-man-db = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-man-pages = "Hongxu Jia <[email protected]>"
-RECIPE_MAINTAINER_pn-matchbox-config-gtk = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-matchbox-desktop = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-matchbox-keyboard = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-matchbox-panel-2 = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-matchbox-session = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-matchbox-session-sato = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-matchbox-terminal = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-matchbox-theme-sato = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-matchbox-wm = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-mc = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-mdadm = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-menu-cache = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-matchbox-config-gtk = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-matchbox-desktop = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-matchbox-keyboard = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-matchbox-panel-2 = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-matchbox-session = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-matchbox-session-sato = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-matchbox-terminal = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-matchbox-theme-sato = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-matchbox-wm = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-mc = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-mdadm = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-menu-cache = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-mesa = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-mesa-demos = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER_pn-mesa-gl = "Otavio Salvador <[email protected]>"
@@ -513,7 +513,7 @@ RECIPE_MAINTAINER_pn-nativesdk-buildtools-perl-dummy = "Richard Purdie <richard.
 RECIPE_MAINTAINER_pn-nativesdk-icecc-toolchain = "Joshua Watt <[email protected]>"
 RECIPE_MAINTAINER_pn-nativesdk-libtool = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-nativesdk-meson = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-nativesdk-packagegroup-sdk-host = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-nativesdk-packagegroup-sdk-host = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-nativesdk-qemu-helper = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-nativesdk-sdk-provides-dummy = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-newlib = "Alejandro Hernandez <[email protected]>"
@@ -527,7 +527,7 @@ RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-ninja = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-ofono = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-ofono = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis <[email protected]>"
 RECIPE_MAINTAINER_pn-openssh = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-openssl = "Alexander Kanavin <[email protected]>"
@@ -536,12 +536,12 @@ RECIPE_MAINTAINER_pn-opkg-arch-config = "Alejandro del Castillo <alejandro.delca
 RECIPE_MAINTAINER_pn-opkg-keyrings = "Alejandro del Castillo <[email protected]>"
 RECIPE_MAINTAINER_pn-opkg-utils = "Alejandro del Castillo <[email protected]>"
 RECIPE_MAINTAINER_pn-orc = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-os-release = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-os-release = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-ovmf = "Ricardo Neri <[email protected]>"
 RECIPE_MAINTAINER_pn-ovmf-shell-image = "Ricardo Neri <[email protected]>"
 RECIPE_MAINTAINER_pn-p11-kit = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-package-index = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-pango = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-package-index = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-pango = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-patch = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-patchelf = "Richard Purdie <[email protected]>"
@@ -550,13 +550,13 @@ RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-piglit = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-piglit = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-pixman = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-pkgconf = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-pkgconfig = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-pm-utils = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-pkgconf = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-pkgconfig = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-pm-utils = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-pointercal-xinput = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-pong-clock = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-popt = "Yi Zhao <[email protected]>"
@@ -568,7 +568,7 @@ RECIPE_MAINTAINER_pn-procps = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-pseudo = "Mark Hatle <[email protected]>"
 RECIPE_MAINTAINER_pn-psmisc = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-psplash = "Yi Zhao <[email protected]>"
-RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-pulseaudio = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <[email protected]>"
@@ -618,10 +618,10 @@ RECIPE_MAINTAINER_pn-rpcsvc-proto = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER_pn-rpm = "Mark Hatle <[email protected]>"
 RECIPE_MAINTAINER_pn-rsync = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-rt-tests = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-ruby = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-run-postinsts = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-ruby = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-run-postinsts = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-sato-screenshot = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-sato-screenshot = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-sbc = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-screen = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-sed = "Chen Qi <[email protected]>"
@@ -661,8 +661,8 @@ RECIPE_MAINTAINER_pn-systemd-systemctl-native = "Chen Qi <[email protected]>
 RECIPE_MAINTAINER_pn-systemtap = "Victor Kamensky <[email protected]>"
 RECIPE_MAINTAINER_pn-systemtap-native = "Victor Kamensky <[email protected]>"
 RECIPE_MAINTAINER_pn-systemtap-uprobes = "Victor Kamensky <[email protected]>"
-RECIPE_MAINTAINER_pn-sysvinit = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-sysvinit-inittab = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-sysvinit = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-sysvinit-inittab = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-taglib = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-tar = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-tcf-agent = "Anuj Mittal <[email protected]>"
@@ -678,12 +678,12 @@ RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-u-boot = "Marek Vasut <[email protected]>"
 RECIPE_MAINTAINER_pn-u-boot-tools = "Marek Vasut <[email protected]>"
-RECIPE_MAINTAINER_pn-udev-extraconf = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-unfs3 = "Ross Burton <[email protected]>"
-RECIPE_MAINTAINER_pn-unifdef = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-udev-extraconf = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-unfs3 = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-unifdef = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-uninative-tarball = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-unzip = "Denys Dmytriyenko <[email protected]>"
-RECIPE_MAINTAINER_pn-update-rc.d = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-update-rc.d = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-usbinit = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-usbutils = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-util-linux = "Chen Qi <[email protected]>"
@@ -696,11 +696,11 @@ RECIPE_MAINTAINER_pn-vim-tiny = "Tom Rini <[email protected]>"
 RECIPE_MAINTAINER_pn-virglrenderer = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-vte = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-vulkan-demos = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-vulkan-demos = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-vulkan-headers = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-vulkan-loader = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-vulkan-tools = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-waffle = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-waffle = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-watchdog = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-watchdog-config = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko <[email protected]>"
@@ -740,7 +740,7 @@ RECIPE_MAINTAINER_pn-xf86-video-intel = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xf86-video-vesa = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xf86-video-vmware = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xhost = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xinetd = "Ross Burton <[email protected]>"
+RECIPE_MAINTAINER_pn-xinetd = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-xinit = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xinput = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-xinput-calibrator = "Armin Kuster <[email protected]>"
Signature · 1 line
2.17.1
#7 lore raw

PATCH 7/21 logrotate: Drop obsolete setting/comment

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

The comment applies to an old version and the WORKDIR setting matches the default so drop it.

(cherry picked from commit 7cc4c0e7665111616c7e8a1dc512b8d9022ca664)
---
 meta/recipes-extended/logrotate/logrotate_3.15.1.bb | 7 -------
 1 file changed, 7 deletions(-)
meta/recipes-extended/logrotate/logrotate_3.15.1.bb +0 -7
index 7c7d51b39e..17f4bf4617 100644
@@ -9,13 +9,6 @@ DEPENDS="coreutils popt"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-# When updating logrotate to latest upstream, SRC_URI should point to
-# a proper release tarball from https://github.com/logrotate/logrotate/releases
-# and we have to take the snapshot for now because there is no such
-# tarball available for 3.9.1.
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "logrotate-(?P<pver>\d+(\.\d+)+).tar"
 
Signature · 1 line
2.17.1
#8 lore raw

PATCH 8/21 cairo: Do not try to remove nonexistent directories

In reply to Steve Sakoman

From: Peter Kjellerstedt <[email protected]>

Commit 0e1f8fa0 (bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target) changed the default PACKAGECONFIG for native and nativesdk so that it becomes empty unless "x11" is in DISTRO_FEATURES since "trace" was also removed (propbably unintentionally). This highlighted than an empty PACKAGECONFIG would lead to a build failure since /usr/bin is never created under these conditions, but the recipe still tried to remove it.

(cherry picked from commit 9bb2268677ac8f0c97433bf1f04555abe88028a9)
---
 meta/recipes-graphics/cairo/cairo_1.16.0.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-graphics/cairo/cairo_1.16.0.bb +4 -2
index b772c2ece2..8663dec404 100644
@@ -68,8 +68,10 @@ do_install_append () {
 	rm -rf ${D}${libdir}/cairo/cairo-sphinx*
 	rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr*
 	rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx*
-	rmdir -p --ignore-fail-on-non-empty ${D}${bindir}
-	rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo
+	[ ! -d ${D}${bindir} ] ||
+		rmdir -p --ignore-fail-on-non-empty ${D}${bindir}
+	[ ! -d ${D}${libdir}/cairo ] ||
+		rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/cairo
 }
 
 PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
Signature · 1 line
2.17.1
#12 lore raw

PATCH 9/21 oeqa/targetcontrol: Rework exception handling to avoid warnings

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

We're seeing:

WARNING: bitbake/lib/bb/cookerdata.py:136: ResourceWarning: unclosed file <_io.FileIO name='tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/testimage/qemurunner_log.20200601181912' mode='ab' closefd=True

which can only be caused by the qemu.stop() method not being called. Tweak the error handling to fix the blanket exception handler which is likely meaning this function isn't getting called.

(cherry picked from commit ee707090848d793e3b2d82dd3861ae22222682c0)
---
 meta/lib/oeqa/targetcontrol.py  | 5 ++++-
 meta/lib/oeqa/utils/commands.py | 5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)
meta/lib/oeqa/targetcontrol.py +4 -1
index 2aa548e1ad..7bbba6016b 100644
@@ -182,7 +182,10 @@ class QemuTarget(BaseTarget):
         return self.runner.is_alive()
 
     def stop(self):
-        self.runner.stop()
+        try:
+            self.runner.stop()
+        except:
+            pass
         self.logger.removeHandler(self.loggerhandler)
         self.connection = None
         self.ip = None
meta/lib/oeqa/utils/commands.py +1 -4
index f1679875dc..df373c4169 100644
@@ -351,10 +351,7 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None,
 
     finally:
         targetlogger.removeHandler(handler)
-        try:
-            qemu.stop()
-        except:
-            pass
+        qemu.stop()
 
 def updateEnv(env_file):
     """
Signature · 1 line
2.17.1
#13 lore raw

PATCH 10/21 cve-check: include epoch in product version output

In reply to Steve Sakoman

From: Ralph Siemsen <[email protected]>

In the generated cve.log files, include the epoch in the product version. This better matches how versions are displayed elsewhere, in particular the bb.warn("Found unpatched CVE...") that appears on the terminal when CVEs are found.

(cherry picked from commit e1c3c0b6e5b01304e2127f5058986697e82adf93)
---
 meta/classes/cve-check.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/cve-check.bbclass +1 -1
index 556ac6e67f..514897e8b8 100644
@@ -301,7 +301,7 @@ def cve_write_data(d, patched, unpatched, whitelisted, cve_data):
 
     for cve in sorted(cve_data):
         write_string += "PACKAGE NAME: %s\n" % d.getVar("PN")
-        write_string += "PACKAGE VERSION: %s\n" % d.getVar("PV")
+        write_string += "PACKAGE VERSION: %s%s\n" % (d.getVar("EXTENDPE"), d.getVar("PV"))
         write_string += "CVE: %s\n" % cve
         if cve in whitelisted:
             write_string += "CVE STATUS: Whitelisted\n"
Signature · 1 line
2.17.1
#14 lore raw

PATCH 11/21 cogl: point to correct HOMEPAGE

In reply to Steve Sakoman

From: Konrad Weihmann <[email protected]>

As the previousy set wasn't reachable anymore

(cherry picked from commit 3ae0aa1df25c8c7511950c6fc965955bdb205cd2)
---
 meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/cogl/cogl-1.0.inc +1 -1
index d8d06651da..1c5d0b79cb 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "Cogl is a small open source library for using 3D graphics \
 hardware for rendering. The API departs from the flat state machine style of \
 OpenGL and is designed to make it easy to write orthogonal components that \
 can render without stepping on each others toes."
-HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
+HOMEPAGE = "https://gitlab.gnome.org/GNOME/cogl"
 LICENSE = "MIT"
 
 inherit clutter features_check upstream-version-is-even gobject-introspection
Signature · 1 line
2.17.1
#15 lore raw

PATCH 12/21 ca-certificates: upgrade 20190110 -> 20200601

In reply to Steve Sakoman

From: Wang Mingyu <[email protected]>

-License-Update: format changed

(cherry picked from commit 0007f38b03bcb0bd561bd9181fbffc7dec47fe9a)
---
 ...a-certificates_20190110.bb => ca-certificates_20200601.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/ca-certificates/{ca-certificates_20190110.bb => ca-certificates_20200601.bb} (95%)
meta/recipes-support/ca-certificates/ca-certificates_20200601.bb renamed from meta/recipes-support/ca-certificates/ca-certificates_20190110.bb +2 -2
similarity index 95%
rename from meta/recipes-support/ca-certificates/ca-certificates_20190110.bb
rename to meta/recipes-support/ca-certificates/ca-certificates_20200601.bb
index ce3cb217a1..37ba51ce6a 100644
@@ -5,7 +5,7 @@ This derived from Debian's CA Certificates."
 HOMEPAGE = "http://packages.debian.org/sid/ca-certificates"
 SECTION = "misc"
 LICENSE = "GPL-2.0+ & MPL-2.0"
-LIC_FILES_CHKSUM = "file://debian/copyright;md5=aeb420429b1659507e0a5a1b123e8308"
+LIC_FILES_CHKSUM = "file://debian/copyright;md5=ae5b36b514e3f12ce1aa8e2ee67f3d7e"
 
 # This is needed to ensure we can run the postinst at image creation time
 DEPENDS = ""
@@ -14,7 +14,7 @@ DEPENDS_class-nativesdk = "openssl-native"
 # Need rehash from openssl and run-parts from debianutils
 PACKAGE_WRITE_DEPS += "openssl-native debianutils-native"
 
-SRCREV = "c28799b138b044c963d24c4a69659b6e5486e3be"
+SRCREV = "b3a8980b781bc9a370e42714a605cd4191bb6c0b"
 
 SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \
            file://0002-update-ca-certificates-use-SYSROOT.patch \
Signature · 1 line
2.17.1
#18 lore raw

PATCH 13/21 patchelf: Add patch to address corrupt shared library issue

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

patchelf can corrupt shared libraries if the program headers don't immediately follow the elf header. Add a patch submitted upstream to address this.

(cherry picked from commit e7811c787bbe2f5d49b3506309499acc27189988)
---
 .../patchelf/patchelf/fix-phdrs.patch         | 37 +++++++++++++++++++
 .../patchelf/patchelf_0.10.bb                 |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch
meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch new file +37 -0
new file mode 100644
index 0000000000..d087bd7855
@@ -0,0 +1,37 @@
+When running patchelf on some existing patchelf'd binaries to change to longer 
+RPATHS, ldd would report the binaries as invalid. The output of objdump -x on 
+those libraryies should show the top of the .dynamic section is getting trashed,
+something like:
+
+0x600000001 0x0000000000429000
+0x335000 0x0000000000335000
+0xc740 0x000000000000c740
+0x1000 0x0000000000009098
+SONAME libglib-2.0.so.0
+
+(which should be RPATH and DT_NEEDED entries)
+
+This was tracked down to the code which injects the PT_LOAD section.
+
+The issue is that if the program headers were previously relocated to the end 
+of the file which was how patchelf operated previously, the relocation code 
+wouldn't work properly on a second run as it now assumes they're located after 
+the elf header. This change forces them back to immediately follow the elf
+header which is where the code has made space for them.
+
+Upstream-Status: Submitted [https://github.com/NixOS/patchelf/pull/202]
+Signed-off-by: Richard Purdie <[email protected]>
+RP 2020/6/2
+
+Index: git/src/patchelf.cc
+===================================================================
+--- git.orig/src/patchelf.cc
++++ git/src/patchelf.cc
+@@ -762,6 +762,7 @@ void ElfFile<ElfFileParamNames>::rewrite
+     }
+ 
+     /* Add a segment that maps the replaced sections into memory. */
++    wri(hdr->e_phoff, sizeof(Elf_Ehdr));
+     phdrs.resize(rdi(hdr->e_phnum) + 1);
+     wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1);
+     Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1];
meta/recipes-devtools/patchelf/patchelf_0.10.bb +1 -0
index cc983e033a..e4a604ec70 100644
@@ -1,6 +1,7 @@
 SRC_URI = "https://nixos.org/releases/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2 \
            file://handle-read-only-files.patch \
            file://fix-adjusting-startPage.patch \
+           file://fix-phdrs.patch \
            "
 
 LICENSE = "GPLv3"
Signature · 1 line
2.17.1
#19 lore raw

PATCH 14/21 archiver: Fix test case for srpm archiver mode

In reply to Steve Sakoman

From: Paul Barker <[email protected]>

We can't assume that rpm packaging will always be enabled when running oe-selftest. In particular when using nodistro instead of poky this is not enabled by default.

(cherry picked from commit 23df3024664ec56dbbe8865ef3953d2c33a7a2cb)
---
 meta/lib/oeqa/selftest/cases/archiver.py | 1 +
 1 file changed, 1 insertion(+)
meta/lib/oeqa/selftest/cases/archiver.py +1 -0
index 606eaabcb0..bc5447d2a3 100644
@@ -126,6 +126,7 @@ class Archiver(OESelftestTestCase):
 
         features = 'INHERIT += "archiver"\n'
         features += 'ARCHIVER_MODE[srpm] = "1"\n'
+        features += 'PACKAGE_CLASSES = "package_rpm"\n'
         self.write_config(features)
 
         bitbake('-n core-image-sato')
Signature · 1 line
2.17.1
#20 lore raw

PATCH 15/21 oe-selftest: Allow overriding the build directory used for tests

In reply to Steve Sakoman

From: Paul Barker <[email protected]>

This may be useful if the parent directory of the original builddir is not writable, on a lower performance drive, etc.

(cherry picked from commit dab719e5f1964fd48e9a35e6b9db1508b5414540)
---
 meta/lib/oeqa/selftest/context.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
meta/lib/oeqa/selftest/context.py +8 -2
index 48ec5d419c..17f2a0cf6b 100644
@@ -22,18 +22,22 @@ from oeqa.core.exception import OEQAPreRun, OEQATestNotFound
 from oeqa.utils.commands import runCmd, get_bb_vars, get_test_layer
 
 class OESelftestTestContext(OETestContext):
-    def __init__(self, td=None, logger=None, machines=None, config_paths=None):
+    def __init__(self, td=None, logger=None, machines=None, config_paths=None, newbuilddir=None):
         super(OESelftestTestContext, self).__init__(td, logger)
 
         self.machines = machines
         self.custommachine = None
         self.config_paths = config_paths
+        self.newbuilddir = newbuilddir
 
     def setup_builddir(self, suffix, selftestdir, suite):
         builddir = os.environ['BUILDDIR']
         if not selftestdir:
             selftestdir = get_test_layer()
-        newbuilddir = builddir + suffix
+        if self.newbuilddir:
+            newbuilddir = os.path.join(self.newbuilddir, 'build' + suffix)
+        else:
+            newbuilddir = builddir + suffix
         newselftestdir = newbuilddir + "/meta-selftest"
 
         if os.path.exists(newbuilddir):
@@ -133,6 +137,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor):
                 action='append', default=None,
                 help='Exclude all (unhidden) tests that match any of the specified tag(s). (exclude applies before select)')
 
+        parser.add_argument('-B', '--newbuilddir', help='New build directory to use for tests.')
         parser.set_defaults(func=self.run)
 
     def _get_available_machines(self):
@@ -187,6 +192,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor):
         self.tc_kwargs['init']['config_paths']['builddir'] = builddir
         self.tc_kwargs['init']['config_paths']['localconf'] = os.path.join(builddir, "conf/local.conf")
         self.tc_kwargs['init']['config_paths']['bblayers'] = os.path.join(builddir, "conf/bblayers.conf")
+        self.tc_kwargs['init']['newbuilddir'] = args.newbuilddir
 
         def tag_filter(tags):
             if args.exclude_tags:
Signature · 1 line
2.17.1
#21 lore raw

PATCH 16/21 oe-selftest: Recursively patch test case paths

In reply to Steve Sakoman

From: Paul Barker <[email protected]>

This ensures that builddir is updated correctly to point to the new selftest build directory when we're given a list of test suites instead of a list of test cases.

(cherry picked from commit 56e211d0f3c6cb84f5982e5de00faeeed69c1912)
---
 meta/lib/oeqa/selftest/context.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
meta/lib/oeqa/selftest/context.py +12 -2
index 17f2a0cf6b..ba13732253 100644
@@ -10,6 +10,7 @@ import glob
 import sys
 import importlib
 import subprocess
+import unittest
 from random import choice
 
 import oeqa
@@ -60,9 +61,9 @@ class OESelftestTestContext(OETestContext):
 
         os.chdir(newbuilddir)
 
-        for t in suite:
+        def patch_test(t):
             if not hasattr(t, "tc"):
-                continue
+                return
             cp = t.tc.config_paths
             for p in cp:
                 if selftestdir in cp[p] and newselftestdir not in cp[p]:
@@ -70,6 +71,15 @@ class OESelftestTestContext(OETestContext):
                 if builddir in cp[p] and newbuilddir not in cp[p]:
                     cp[p] = cp[p].replace(builddir, newbuilddir)
 
+        def patch_suite(s):
+            for x in s:
+                if isinstance(x, unittest.TestSuite):
+                    patch_suite(x)
+                else:
+                    patch_test(x)
+
+        patch_suite(suite)
+
         return (builddir, newbuilddir)
 
     def prepareSuite(self, suites, processes):
Signature · 1 line
2.17.1
#22 lore raw

PATCH 17/21 qemu: force build type to production

In reply to Steve Sakoman

From: Joe Slater <[email protected]>

qemu will not build for -Og optimization because macros in lockable.h expect dead-code elimination. Override DEBUG_BUILD.

(cherry picked from commit ad404b2e51223625bd95f9a7da4c7a690c37bdfb)
---
 meta/recipes-devtools/qemu/qemu_4.2.0.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-devtools/qemu/qemu_4.2.0.bb +5 -0
index f0c1daabe1..9c76144749 100644
@@ -10,6 +10,11 @@ DEPENDS = "glib-2.0 zlib pixman bison-native"
 
 RDEPENDS_${PN}_class-target += "bash"
 
+# Does not compile for -Og because that level does not clean up dead-code.
+# See lockable.h.
+#
+DEBUG_BUILD = "0"
+
 EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}"
 EXTRA_OECONF_append_class-target_mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}"
 EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
Signature · 1 line
2.17.1
#23 lore raw

PATCH 18/21 db: do not install db_verify if 'verify' is not enabled

In reply to Steve Sakoman

From: Chen Qi <[email protected]>

On target, when running `db_verify /var/lib/rpm/Packages', we get the following error.

db_verify: BDB0571 library build did not include support for database verification

This is because db_verify is installed but 'verify' PACKAGECONFIG is not enabled. So fix it by not installing do_verify in such case.

(cherry picked from commit b5ffdb296f211403f987b5d5a724a94ee91dc80c)
---
 meta/recipes-support/db/db_5.3.28.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-support/db/db_5.3.28.bb +3 -0
index 3a0923ae36..318efcb61d 100644
@@ -109,6 +109,9 @@ do_install_append() {
 	fi
 
 	chown -R root:root ${D}
+	if ${@bb.utils.contains('PACKAGECONFIG', 'verify', 'false', 'true', d)}; then
+		rm -f ${D}${bindir}/db_verify
+	fi
 }
 
 INSANE_SKIP_${PN} = "dev-so"
Signature · 1 line
2.17.1
#24 lore raw

PATCH 19/21 linux-firmware: upgrade 20200421 -> 20200519

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

License-Update: added more entries to WHENCE, all redistributable

(cherry picked from commit f8d47014e453533b98e37c653177e9541e1deeda)
---
 ...linux-firmware_20200421.bb => linux-firmware_20200519.bb} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200421.bb => linux-firmware_20200519.bb} (99%)
meta/recipes-kernel/linux-firmware/linux-firmware_20200519.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb +2 -3
similarity index 99%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200519.bb
index fa0507a88c..fcad7df629 100644
@@ -125,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \
                     file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
                     file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \
-                    file://WHENCE;md5=cb9a66eff0464b55335d3a7374fbc51c \
+                    file://WHENCE;md5=c15cee50b1a59d27106a37c2929d5291 \
                     "
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -196,8 +196,7 @@ PE = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "229a93395f4033da68429f165a62b952"
-SRC_URI[sha256sum] = "6dd7cba25d694c031f65529b9027cc8faaffaddfae70a4e3b58c2e4a0af3bfa8"
+SRC_URI[sha256sum] = "584c49c58291136b966ceffb0a456a672c23d4d759bab8bf86cbbe28061e415e"
 
 inherit allarch
 
Signature · 1 line
2.17.1
#25 lore raw

PATCH 20/21 build-sysroots: add sysroot paths with native binaries to PATH

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

staging_populate_sysroot_dir() collects postinsts from the sysroot and executes them. These postinsts, in turn, may call binaries that are only available from the sysroot. This works fine with recipe-specific sysroots, as all necessary paths are already in PATH, but breaks down in this recipe which imitates the old global sysroot way but doesn't adjust the PATH to include the binary paths from global sysroot.

To reproduce the failure:

$ bitbake docbook-xml-dtd4-native
$ bitbake -c build_native_sysroot build-sysroots

...

Exception: subprocess.CalledProcessError: Command '/home/akanavin/build/tmp/sysroots/x86_64/usr/bin/postinst-docbook-xml-dtd4-native-xmlcatalog' returned non-zero exit status 127.

Subprocess output:
/home/akanavin/build/tmp/sysroots/x86_64/usr/bin/postinst-docbook-xml-dtd4-native-xmlcatalog: 5: /home/akanavin/build/tmp/sysroots/x86_64/usr/bin/postinst-docbook-xml-dtd4-native-xmlcatalog: xmlcatalog: not found /home/akanavin/build/tmp/sysroots/x86_64/usr/bin/postinst-docbook-xml-dtd4-native-xmlcatalog: 8: /home/akanavin/build/tmp/sysroots/x86_64/usr/bin/postinst-docbook-xml-dtd4-native-xmlcatalog: xmlcatalog: not found

(cherry picked from commit 6b5f7bda4204d45cd29670cefcd53dc5da031095)
---
 meta/recipes-core/meta/build-sysroots.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-core/meta/build-sysroots.bb +4 -0
index 7a712e2f38..ad22a75eb2 100644
@@ -20,6 +20,8 @@ deltask populate_sysroot
 python do_build_native_sysroot () {
     targetsysroot = d.getVar("STANDALONE_SYSROOT")
     nativesysroot = d.getVar("STANDALONE_SYSROOT_NATIVE")
+    import os
+    os.environ['PATH'] = "%s/bin:%s/usr/bin:%s" % (nativesysroot, nativesysroot, os.environ['PATH'])
     staging_populate_sysroot_dir(targetsysroot, nativesysroot, True, d)
 }
 do_build_native_sysroot[cleandirs] = "${STANDALONE_SYSROOT_NATIVE}"
@@ -29,6 +31,8 @@ addtask do_build_native_sysroot before do_build
 python do_build_target_sysroot () {
     targetsysroot = d.getVar("STANDALONE_SYSROOT")
     nativesysroot = d.getVar("STANDALONE_SYSROOT_NATIVE")
+    import os
+    os.environ['PATH'] = "%s/bin:%s/usr/bin:%s" % (nativesysroot, nativesysroot, os.environ['PATH'])
     staging_populate_sysroot_dir(targetsysroot, nativesysroot, False, d)
 }
 do_build_target_sysroot[cleandirs] = "${STANDALONE_SYSROOT}"
Signature · 1 line
2.17.1
#26 lore raw

PATCH 21/21 vim: _FORTIFY_SOURCE=2 be gone

In reply to Steve Sakoman

From: Joe Slater <[email protected]>

vim will abort in many places with this setting. Replace it with the benign _FORTIFY_SOURCE=1.

(cherry picked from commit 18129cbaeddb3278efe9963718556e3765f06c1e)
---
 meta/recipes-support/vim/vim_8.2.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-support/vim/vim_8.2.bb +5 -0
index 60946a181f..709b6ddb55 100644
@@ -8,3 +8,8 @@ BBCLASSEXTEND = "native"
 ALTERNATIVE_${PN}_append = " xxd"
 ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
 ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
+
+# We override the default in security_flags.inc because vim (not vim-tiny!) will abort
+# in many places for _FORTIFY_SOURCE=2.  Security flags become part of CC.
+#
+lcl_maybe_fortify = "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=1',d)}"
Signature · 1 line
2.17.1
#9 lore raw

Re: [OE-core][dunfell 08/21] cairo: Do not try to remove nonexistent directories

In reply to Steve Sakoman
Quoted 10 lines · Steve Sakoman

From: Peter Kjellerstedt <[email protected]>

Commit 0e1f8fa0 (bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target) changed the default PACKAGECONFIG for native and nativesdk so that it becomes empty unless "x11" is in DISTRO_FEATURES since "trace" was also removed (propbably unintentionally). This highlighted than an empty PACKAGECONFIG would lead to a build failure since /usr/bin is never created under these conditions, but the recipe still tried to remove it.
...

Isn't this a fix for a bug that is not in dunfell?

cu
Adrian

#17 lore raw

Re: [OE-core][dunfell 12/21] ca-certificates: upgrade 20190110 -> 20200601

Quoted 3 lines · Adrian Bunk

Please drop this patch:
https://bugs.debian.org/962596

Thanks for catching this. Will drop from the pull request.

Steve

Quoted 2 lines

Adrian

#10 lore raw

Re: [OE-core][dunfell 08/21] cairo: Do not try to remove nonexistent directories

In reply to Adrian Bunk
Quoted 13 lines · Adrian Bunk
Quoted 10 lines · Steve Sakoman

From: Peter Kjellerstedt <[email protected]>

Commit 0e1f8fa0 (bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target) changed the default PACKAGECONFIG for native and nativesdk so that it becomes empty unless "x11" is in DISTRO_FEATURES since "trace" was also removed (propbably unintentionally). This highlighted than an empty PACKAGECONFIG would lead to a build failure since /usr/bin is never created under these conditions, but the recipe still tried to remove it.
...

Quoted 1 line

Isn't this a fix for a bug that is not in dunfell?

My impression was that while the bitbake.conf change that highlighted the issue with an empty PACKAGECONFIG isn't in dunfell, the underlying bug that this change uncovered does exist in dunfell.

I realize it's not too likely that another layer would set an empty PACKAGECONFIG. But people often cut and paste from oe-core recipes so it's nice not to have known bugs ;-)

Steve

#11 lore raw

Re: [OE-core][dunfell 08/21] cairo: Do not try to remove nonexistent directories

Quoted 14 lines · Steve Sakoman
Quoted 13 lines · Adrian Bunk
Quoted 10 lines · Steve Sakoman

From: Peter Kjellerstedt <[email protected]>

Commit 0e1f8fa0 (bitbake.conf: propagate 'opengl' DISTRO_FEATURE to native/nativesdk from target) changed the default PACKAGECONFIG for native and nativesdk so that it becomes empty unless "x11" is in DISTRO_FEATURES since "trace" was also removed (propbably unintentionally). This highlighted than an empty PACKAGECONFIG would lead to a build failure since /usr/bin is never created under these conditions, but the recipe still tried to remove it.
...

Quoted 6 lines
Quoted 1 line

Isn't this a fix for a bug that is not in dunfell?

My impression was that while the bitbake.conf change that highlighted the issue with an empty PACKAGECONFIG isn't in dunfell, the underlying bug that this change uncovered does exist in dunfell.
...

I failed to reproduce the problem in dunfell, but the change looks harmless enough that adding it to dunfell it is unlikely to cause problems.

Quoted 1 line

Steve

cu
Adrian