Skip to contentSkip to conversation

Patch review

PATCH New Steve Sakoman 1 participant 26 messages May 10, 2021

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.

Of particular note this week are the last four patches in the series:

26f7657698 ovmf: update to 202002
28f6c91b8b ovmf: update to 202005
aaeb10db2a ovmf: update edk2-stable202005 -> edk2-stable202008 5b2ad70cd8 reproducible.py: add quilt-ptest and valgrind-ptest

These patches allow us to add Fedora 33 as a supported distribution. I've included them in my testing over the past few weeks and have encountered no issues with a-full and meta-oe tests (other than the intermittent reproducibility failures outlined in the final patch).

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2130

The following changes since commit 834a8e357bc999a0163e7c5bafbcc1a8816448d4:

license_image.bbclass: Fix symlink to generic license files (2021-05-03 04:56:23 -1000)

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 (5):
diffoscope: add native libraries to LD_LIBRARY_PATH Revert "oeqa: Set LD_LIBRARY_PATH when executing native commands"
ovmf: update to 202002
ovmf: update to 202005
ovmf: update edk2-stable202005 -> edk2-stable202008

Anatol Belski (1):
tar: Fix CVE-2021-20193

Bruce Ashfield (4):
linux-yocto/5.4: update to v5.4.114
linux-yocto/5.4: update to v5.4.116
perf: fix python-audit RDEPENDS
make-mod-scripts: add HOSTCXX definitions and gmp-native dependency

Christophe Chapuis (1):
rootfs.py: find .ko.gz and .ko.xz kernel modules as well

Jose Quaresma (1):
ptest-runner: libgcc must be installed for pthread_cancel to work

Joshua Watt (1):
classes/image: Use xargs to set file timestamps

Kai Uwe Broulik (1):
gstreamer1.0-plugins-good: on wayland qt5 needs qtwayland

Khem Raj (1):
cml1.bbclass: Return sorted list of cfg files

Lee Chee Yang (1):
binutils: fix CVE-2021-3487

Mark Hatle (1):
kernel.bbclass: Remove do_install[prefunc] no longer needed

Michael Opdenacker (1):
sanity.bbclass: mention CONNECTIVITY_CHECK_URIS in network failure
message

Richard Purdie (3):
yocto-uninative: Update to 3.1 which includes a patchelf fix pybootchart/draw: Avoid divide by zero error oeqa/qemurunner: Improve logging thread exit handling for qemu
shutdown test

Steve Sakoman (2):
lib/package_manager: Use shutil.copy instead of bb.utils.copyfile for
intercepts
reproducible.py: add quilt-ptest and valgrind-ptest

Yi Fan Yu (1):
libevent: Increase ptest timing tolerance 50 ms -> 100 ms

zhengruoqin (1):
wireless-regdb: upgrade 2020.11.20 -> 2021.04.21

 meta/classes/cml1.bbclass                     |   2 +-
 meta/classes/image.bbclass                    |   2 +-
 meta/classes/kernel.bbclass                   |   1 -
 meta/classes/sanity.bbclass                   |   9 +-
 meta/conf/distro/include/yocto-uninative.inc  |   8 +-
 meta/lib/oe/package_manager.py                |   2 +-
 meta/lib/oe/rootfs.py                         |   2 +-
 meta/lib/oeqa/selftest/cases/reproducible.py  |   2 +
 meta/lib/oeqa/selftest/cases/runqemu.py       |   9 +-
 meta/lib/oeqa/utils/commands.py               |   3 -
 meta/lib/oeqa/utils/qemurunner.py             |  12 +-
 ...ovmf-update-path-to-native-BaseTools.patch |   6 +-
 ...ile-adjust-to-build-in-under-bitbake.patch |  32 +++--
 .../0003-ovmf-enable-long-path-file.patch     |   6 +-
 .../ovmf/0004-ovmf-Update-to-latest.patch     |  20 +--
 meta/recipes-core/ovmf/ovmf_git.bb            |   6 +-
 .../binutils/binutils-2.34.inc                |   1 +
 .../binutils/binutils/CVE-2021-3487.patch     |  83 +++++++++++
 .../tar/tar/CVE-2021-20193.patch              | 133 ++++++++++++++++++
 meta/recipes-extended/tar/tar_1.32.bb         |   1 +
 .../linux/linux-yocto-rt_5.4.bb               |   6 +-
 .../linux/linux-yocto-tiny_5.4.bb             |   8 +-
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  |  22 +--
 .../make-mod-scripts/make-mod-scripts_1.0.bb  |   2 +
 meta/recipes-kernel/perf/perf.bb              |   2 +-
 ....11.20.bb => wireless-regdb_2021.04.21.bb} |   2 +-
 .../gstreamer1.0-plugins-good_1.16.3.bb       |   4 +-
 .../diffoscope/diffoscope_172.bb              |   1 +
 ...ncrease-default-timeval-tolerance-50.patch |  33 +++++
 .../libevent/libevent_2.1.11.bb               |   1 +
 .../ptest-runner/ptest-runner_2.4.0.bb        |   2 +
 scripts/pybootchartgui/pybootchartgui/draw.py |   2 +-
 32 files changed, 355 insertions(+), 70 deletions(-)
 create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2021-3487.patch
 create mode 100644 meta/recipes-extended/tar/tar/CVE-2021-20193.patch
 rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2020.11.20.bb => wireless-regdb_2021.04.21.bb} (94%)
 create mode 100644 meta/recipes-support/libevent/libevent/0002-test-regress.h-Increase-default-timeval-tolerance-50.patch
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/25 tar: Fix CVE-2021-20193

From: Anatol Belski <[email protected]>

---
 .../tar/tar/CVE-2021-20193.patch              | 133 ++++++++++++++++++
 meta/recipes-extended/tar/tar_1.32.bb         |   1 +
 2 files changed, 134 insertions(+)
 create mode 100644 meta/recipes-extended/tar/tar/CVE-2021-20193.patch
meta/recipes-extended/tar/tar/CVE-2021-20193.patch new file +133 -0
new file mode 100644
index 0000000000..89e8e20844
@@ -0,0 +1,133 @@
+From d9d4435692150fa8ff68e1b1a473d187cc3fd777 Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <[email protected]>
+Date: Sun, 17 Jan 2021 20:41:11 +0200
+Subject: Fix memory leak in read_header
+
+Bug reported in https://savannah.gnu.org/bugs/?59897
+
+* src/list.c (read_header): Don't return directly from the loop.
+Instead set the status and break.  Return the status.  Free
+next_long_name and next_long_link before returning.
+
+CVE: CVE-2021-20193
+Upstream-Status: Backport
+[https://git.savannah.gnu.org/cgit/tar.git/patch/?id=d9d4435692150fa8ff68e1b1a473d187cc3fd777]
+Signed-off-by: Anatol Belski <[email protected]>
+
+---
+ src/list.c | 40 ++++++++++++++++++++++++++++------------
+ 1 file changed, 28 insertions(+), 12 deletions(-)
+
+diff --git a/src/list.c b/src/list.c
+index e40a5c8..d7ef441 100644
+--- a/src/list.c
++++ b/src/list.c
+@@ -408,26 +408,27 @@ read_header (union block **return_block, struct tar_stat_info *info,
+ 	     enum read_header_mode mode)
+ {
+   union block *header;
+-  union block *header_copy;
+   char *bp;
+   union block *data_block;
+   size_t size, written;
+-  union block *next_long_name = 0;
+-  union block *next_long_link = 0;
++  union block *next_long_name = NULL;
++  union block *next_long_link = NULL;
+   size_t next_long_name_blocks = 0;
+   size_t next_long_link_blocks = 0;
+-
++  enum read_header status = HEADER_SUCCESS;
++  
+   while (1)
+     {
+-      enum read_header status;
+-
+       header = find_next_block ();
+       *return_block = header;
+       if (!header)
+-	return HEADER_END_OF_FILE;
++	{
++	  status = HEADER_END_OF_FILE;
++	  break;
++	}
+ 
+       if ((status = tar_checksum (header, false)) != HEADER_SUCCESS)
+-	return status;
++	break;
+ 
+       /* Good block.  Decode file size and return.  */
+ 
+@@ -437,7 +438,10 @@ read_header (union block **return_block, struct tar_stat_info *info,
+ 	{
+ 	  info->stat.st_size = OFF_FROM_HEADER (header->header.size);
+ 	  if (info->stat.st_size < 0)
+-	    return HEADER_FAILURE;
++	    {
++	      status = HEADER_FAILURE;
++	      break;
++	    }
+ 	}
+ 
+       if (header->header.typeflag == GNUTYPE_LONGNAME
+@@ -447,10 +451,14 @@ read_header (union block **return_block, struct tar_stat_info *info,
+ 	  || header->header.typeflag == SOLARIS_XHDTYPE)
+ 	{
+ 	  if (mode == read_header_x_raw)
+-	    return HEADER_SUCCESS_EXTENDED;
++	    {
++	      status = HEADER_SUCCESS_EXTENDED;
++	      break;
++	    }
+ 	  else if (header->header.typeflag == GNUTYPE_LONGNAME
+ 		   || header->header.typeflag == GNUTYPE_LONGLINK)
+ 	    {
++	      union block *header_copy;
+ 	      size_t name_size = info->stat.st_size;
+ 	      size_t n = name_size % BLOCKSIZE;
+ 	      size = name_size + BLOCKSIZE;
+@@ -517,7 +525,10 @@ read_header (union block **return_block, struct tar_stat_info *info,
+ 	      xheader_decode_global (&xhdr);
+ 	      xheader_destroy (&xhdr);
+ 	      if (mode == read_header_x_global)
+-		return HEADER_SUCCESS_EXTENDED;
++		{
++		  status = HEADER_SUCCESS_EXTENDED;
++		  break;
++		}
+ 	    }
+ 
+ 	  /* Loop!  */
+@@ -536,6 +547,7 @@ read_header (union block **return_block, struct tar_stat_info *info,
+ 	      name = next_long_name->buffer + BLOCKSIZE;
+ 	      recent_long_name = next_long_name;
+ 	      recent_long_name_blocks = next_long_name_blocks;
++	      next_long_name = NULL;
+ 	    }
+ 	  else
+ 	    {
+@@ -567,6 +579,7 @@ read_header (union block **return_block, struct tar_stat_info *info,
+ 	      name = next_long_link->buffer + BLOCKSIZE;
+ 	      recent_long_link = next_long_link;
+ 	      recent_long_link_blocks = next_long_link_blocks;
++	      next_long_link = NULL;
+ 	    }
+ 	  else
+ 	    {
+@@ -578,9 +591,12 @@ read_header (union block **return_block, struct tar_stat_info *info,
+ 	    }
+ 	  assign_string (&info->link_name, name);
+ 
+-	  return HEADER_SUCCESS;
++	  break;
+ 	}
+     }
++  free (next_long_name);
++  free (next_long_link);
++  return status;
+ }
+ 
+ #define ISOCTAL(c) ((c)>='0'&&(c)<='7')
+-- 
+cgit v1.2.1
+
meta/recipes-extended/tar/tar_1.32.bb +1 -0
index ebe6cb0dbd..3ae6d674a5 100644
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \
            file://musl_dirent.patch \
+           file://CVE-2021-20193.patch \
 "
 
 SRC_URI[md5sum] = "17917356fff5cb4bd3cd5a6c3e727b05"
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/25 binutils: fix CVE-2021-3487

In reply to Steve Sakoman

From: Lee Chee Yang <[email protected]>

drop changes to changelog file in the patch so it can be backport.

---
 .../binutils/binutils-2.34.inc                |  1 +
 .../binutils/binutils/CVE-2021-3487.patch     | 83 +++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2021-3487.patch
meta/recipes-devtools/binutils/binutils-2.34.inc +1 -0
index a586faf5ab..3e10279b1d 100644
@@ -47,5 +47,6 @@ SRC_URI = "\
      file://CVE-2020-16592.patch \
      file://CVE-2020-16598.patch \
      file://CVE-2021-20197.patch \
+     file://CVE-2021-3487.patch \
 "
 S  = "${WORKDIR}/git"
meta/recipes-devtools/binutils/binutils/CVE-2021-3487.patch new file +83 -0

83 lines not on this page · raw message

Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/25 yocto-uninative: Update to 3.1 which includes a patchelf fix

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

(cherry picked from commit 1d9d38eb6b3621fed58a217eeb4de1816e3e6487)
---
 meta/conf/distro/include/yocto-uninative.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/conf/distro/include/yocto-uninative.inc +4 -4
index a2a2dd18ec..05b79d14c3 100644
@@ -8,7 +8,7 @@
 
 UNINATIVE_MAXGLIBCVERSION = "2.33"
 
-UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/3.0/"
-UNINATIVE_CHECKSUM[aarch64] ?= "1c668909098c5b56132067adc69a249cb771f4560428e5822de903a12d97bf33"
-UNINATIVE_CHECKSUM[i686] ?= "e6cc2fc056234cffa6a2ff084cce27d544ea3f487a62b5e253351cefd4421900"
-UNINATIVE_CHECKSUM[x86_64] ?= "5ec5a9276046e7eceeac749a18b175667384e1f445cd4526300a41404d985a5b"
+UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/3.1/"
+UNINATIVE_CHECKSUM[aarch64] ?= "7fa12b9fe7a95934cc09beb0e8a25ff97179ef3105116015d32548eadd27b024"
+UNINATIVE_CHECKSUM[i686] ?= "bbfcdd48336800b5af97e294918c6586a0a8fa903f127f813b0bd5110de8c55c"
+UNINATIVE_CHECKSUM[x86_64] ?= "5d0611df544edff6428cef7d871257a91aa6ba1bd92f5365a2df8deb54b6b31e"
Signature · 1 line
2.25.1
#4 lore raw

PATCH 4/25 wireless-regdb: upgrade 2020.11.20 -> 2021.04.21

In reply to Steve Sakoman

From: zhengruoqin <[email protected]>

(cherry picked from commit df540a630f87c02898f7ce5703f63e9c7bd2c156)
---
 ...ireless-regdb_2020.11.20.bb => wireless-regdb_2021.04.21.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2020.11.20.bb => wireless-regdb_2021.04.21.bb} (94%)
meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.04.21.bb renamed from meta/recipes-kernel/wireless-regdb/wireless-regdb_2020.11.20.bb +1 -1
similarity index 94%
rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2020.11.20.bb
rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.04.21.bb
index b3567bca95..f79c0b29ea 100644
@@ -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] = "b4164490d82ff7b0086e812ac42ab27baf57be24324d4c0ee1c5dd6ba27f2a52"
+SRC_URI[sha256sum] = "9e4c02b2a9710df4dbdb327c39612e8cbbae6495987afeddaebab28c1ea3d8fa"
 
 inherit bin_package allarch
 
Signature · 1 line
2.25.1
#5 lore raw

PATCH 5/25 linux-yocto/5.4: update to v5.4.114

In reply to Steve Sakoman

From: Bruce Ashfield <[email protected]>

Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits:

a7eb81c1d11a Linux 5.4.114
3822683fd101 net: phy: marvell: fix detection of PHY on Topaz switches
cec3b778f70f ARM: 9071/1: uprobes: Don't hook on thumb instructions
4f0cda5e9e62 r8169: don't advertise pause in jumbo mode
c5934da725bb r8169: tweak max read request size for newer chips also in jumbo mtu mode 50b7a68664dc r8169: improve rtl_jumbo_config
cbbd3e2a2e7c r8169: fix performance regression related to PCIe max read request size 0243bb394186 r8169: simplify setting PCI_EXP_DEVCTL_NOSNOOP_EN
c667953d6433 r8169: remove fiddling with the PCIe max read request size
b14992c96274 arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems
871b569a3e67 ARM: footbridge: fix PCI interrupt mapping
9a7ac9afc8d7 gro: ensure frag0 meets IP header alignment
fde195c03bff ibmvnic: remove duplicate napi_schedule call in open function
c591bbaae545 ibmvnic: remove duplicate napi_schedule call in do_reset function
c6acd7d19124 ibmvnic: avoid calling napi_disable() twice
2bc14f5eca10 i40e: fix the panic when running bpf in xdpdrv mode
51edda8a6334 net: ip6_tunnel: Unregister catch-all devices
92f93a03cef0 net: sit: Unregister catch-all devices
4fcbb1fa2703 net: davicom: Fix regulator not turned off on failed probe
01fb1626b620 netfilter: nft_limit: avoid possible divide error in nft_limit_init
e65cd80558e5 net: macb: fix the restore of cmp registers
6449b405f99a netfilter: arp_tables: add pre_exit hook for table unregister
ce23be37ecac netfilter: bridge: add pre_exit hooks for ebtable unregistration
61ca5b653220 libnvdimm/region: Fix nvdimm_has_flush() to handle ND_REGION_ASYNC
4ce8e86d125d netfilter: conntrack: do not print icmpv6 as unknown via /proc
5f6c1a81713e scsi: libsas: Reset num_scatter if libata marks qc as NODATA
7779f84e4677 riscv: Fix spelling mistake "SPARSEMEM" to "SPARSMEM"
ec3bb712fb62 vfio/pci: Add missing range check in vfio_pci_mmap
9e8c5e3d8279 arm64: alternatives: Move length validation in alternative_{insn, endif} b7d15166c1d1 arm64: fix inline asm in load_unaligned_zeropad()
b9956950f23c readdir: make sure to verify directory entry for legacy interfaces too ff821c7ce913 dm verity fec: fix misaligned RS roots IO
804607635cc1 HID: wacom: set EV_KEY and EV_ABS only for non-HID_GENERIC type of devices b428063fb310 Input: i8042 - fix Pegatron C15B ID entry
995503dd6546 Input: s6sy761 - fix coordinate read bit shift
7a2ac9ed8cf6 virt_wifi: Return micros for BSS TSF values
bd7e90c82850 mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN
f666567a51fb pcnet32: Use pci_resource_len to validate PCI resource
9e249bc38a48 net: ieee802154: forbid monitor for add llsec seclevel
7a7899eaaeb8 net: ieee802154: stop dump llsec seclevels for monitors
fc5f9c33edb5 net: ieee802154: forbid monitor for del llsec devkey
63581374638b net: ieee802154: forbid monitor for add llsec devkey
0d5ee2ee9ab2 net: ieee802154: stop dump llsec devkeys for monitors
6c8caf78304f net: ieee802154: forbid monitor for del llsec dev
c993c05b9d48 net: ieee802154: forbid monitor for add llsec dev
f9d7088d385c net: ieee802154: stop dump llsec devs for monitors
178ddee28d53 net: ieee802154: forbid monitor for del llsec key
5d025404d513 net: ieee802154: forbid monitor for add llsec key
d8b4f3a9d732 net: ieee802154: stop dump llsec keys for monitors
e16998019358 scsi: scsi_transport_srp: Don't block target in SRP_PORT_LOST state
f0268d35305d ASoC: fsl_esai: Fix TDM slot setup for I2S mode
d60837aa64be drm/msm: Fix a5xx/a6xx timestamps
01e86da75c18 ARM: omap1: fix building with clang IAS
4f02dc4d360f ARM: keystone: fix integer overflow warning
f3183866b3da neighbour: Disregard DEAD dst in neigh_update
1cf8b48a4de2 ASoC: max98373: Added 30ms turn on/off time delay
47d04c039915 arc: kernel: Return -EFAULT if copy_to_user() fails
68bd0d8ab19e lockdep: Add a missing initialization hint to the "INFO: Trying to register non-static key" message 6ffc9f854d23 ARM: dts: Fix moving mmc devices with aliases for omap4 & 5
4609d27ca6e4 ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race
09db44ad36b0 dmaengine: dw: Make it dependent to HAS_IOMEM
5130cda3cb1f gpio: sysfs: Obey valid_mask
2dce5702ef05 Input: nspire-keypad - enable interrupts only when opened
6180d2274b17 net/sctp: fix race condition in sctp_destroy_sock
304c21786b01 scsi: qla2xxx: Fix fabric scan hang
ca0188d396cd scsi: qla2xxx: Fix stuck login session using prli_pend_timer
c393c7f77cf8 scsi: qla2xxx: Add a shadow variable to hold disc_state history of fcport ad66dc6d8830 scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure
8b5e82aea7b3 scsi: qla2xxx: Fix device connect issues in P2P configuration
8eed34d3c444 scsi: qla2xxx: Dual FCP-NVMe target port support
33beb0e6c244 Revert "scsi: qla2xxx: Fix stuck login session using prli_pend_timer" 94ac0a8866c4 Revert "scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure"
ab3bed80f9d3 Linux 5.4.113
94371b6c5553 xen/events: fix setting irq affinity
4ea6097986c4 perf map: Tighten snprintf() string precision to pass gcc check on some 32-bit arches d462247bb274 perf tools: Use %zd for size_t printf formats on 32-bit
2715a4c0dc34 perf tools: Use %define api.pure full instead of %pure-parser
799f02f0dfc4 driver core: Fix locking bug in deferred_probe_timeout_work_func()
cc59b872f2e1 netfilter: x_tables: fix compat match/target pad out-of-bound write
8119a2b42028 block: don't ignore REQ_NOWAIT for direct IO
2d71bffbe9a0 riscv,entry: fix misaligned base for excp_vect_table
90b71ae8e5cf idr test suite: Create anchor before launching throbber
b9299c2bf554 idr test suite: Take RCU read lock in idr_find_test_1
cde89079ce46 radix tree test suite: Register the main thread with the RCU library f5b60f26e36b block: only update parent bi_status when bio fail
5b8f89685a9a drm/tegra: dc: Don't set PLL clock to 0Hz
db162d8d7d08 gfs2: report "already frozen/thawed" errors
3c89c7240412 drm/imx: imx-ldb: fix out of bounds array access warning
e1ff1c6bbe4b KVM: arm64: Disable guest access to trace filter controls
2012f9f75444 KVM: arm64: Hide system instruction access to Trace registers
cc678e2f372e interconnect: core: fix error return code of icc_link_destroy()

(cherry picked from commit a24b8651365b333e903b317ad969ba8adfed28c4)
---
 .../linux/linux-yocto-rt_5.4.bb               |  6 ++---
 .../linux/linux-yocto-tiny_5.4.bb             |  8 +++----
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  | 22 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +3 -3
index 309f753c38..fd44e171eb 100644
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "324e77d816cf6434507ab29140beb24044009efa"
-SRCREV_meta ?= "d7fd0213b75ce9b6206f63dbdd435ab326598642"
+SRCREV_machine ?= "da52117f6cbb53b6242803d432e8649a964f0435"
+SRCREV_meta ?= "e335eb1ff7c2948e263b9d59f1664c5bf198e4cf"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.4.112"
+LINUX_VERSION ?= "5.4.114"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +4 -4
index 1edc632de7..3886388ea9 100644
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.4.112"
+LINUX_VERSION ?= "5.4.114"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine_qemuarm ?= "8463db325b93f0669446f68c19334cfe11ffb9c2"
-SRCREV_machine ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
-SRCREV_meta ?= "d7fd0213b75ce9b6206f63dbdd435ab326598642"
+SRCREV_machine_qemuarm ?= "06631306658b18d4e29f721a43479d90effc3fc2"
+SRCREV_machine ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
+SRCREV_meta ?= "e335eb1ff7c2948e263b9d59f1664c5bf198e4cf"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.4.bb +11 -11
index e907d363df..cb71881144 100644
@@ -12,16 +12,16 @@ KBRANCH_qemux86  ?= "v5.4/standard/base"
 KBRANCH_qemux86-64 ?= "v5.4/standard/base"
 KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "133328e5d558f6060a5633d71506a6b716bb4fc6"
-SRCREV_machine_qemuarm64 ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
-SRCREV_machine_qemumips ?= "eef7365804592f95bceefa143cdb3cc19e8c6b66"
-SRCREV_machine_qemuppc ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
-SRCREV_machine_qemuriscv64 ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
-SRCREV_machine_qemux86 ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
-SRCREV_machine_qemux86-64 ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
-SRCREV_machine_qemumips64 ?= "996fe040c8d8d01a9af6be42dae3844d127471bf"
-SRCREV_machine ?= "5f54b437b6502d3febee553100b2cb2a9e0c5f8a"
-SRCREV_meta ?= "d7fd0213b75ce9b6206f63dbdd435ab326598642"
+SRCREV_machine_qemuarm ?= "d62f2d60acebc640c2749532e1527d1f117003d6"
+SRCREV_machine_qemuarm64 ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
+SRCREV_machine_qemumips ?= "ec6cca9ea72879a0d06ce1243e952a42a3435607"
+SRCREV_machine_qemuppc ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
+SRCREV_machine_qemuriscv64 ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
+SRCREV_machine_qemux86 ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
+SRCREV_machine_qemux86-64 ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
+SRCREV_machine_qemumips64 ?= "fd8bb72df12890ec21b27b83e26492ba527ebea3"
+SRCREV_machine ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
+SRCREV_meta ?= "e335eb1ff7c2948e263b9d59f1664c5bf198e4cf"
 
 # remap qemuarm to qemuarma15 for the 5.4 kernel
 # KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.112"
+LINUX_VERSION ?= "5.4.114"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.25.1
#6 lore raw

PATCH 6/25 linux-yocto/5.4: update to v5.4.116

In reply to Steve Sakoman

From: Bruce Ashfield <[email protected]>

Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits:

370636ffbb86 Linux 5.4.116
e23967af130b bpf: Update selftests to reflect new error states ef4e68f0af04 bpf: Tighten speculative pointer arithmetic mask 4dc6e55e282f bpf: Move sanitize_val_alu out of op switch 876d1cec9369 bpf: Refactor and streamline bounds check into helper 4158e5fea3b1 bpf: Improve verifier error messages for users 15de0c537bf7 bpf: Rework ptr_limit into alu_limit and add common error path f7fbedc90909 bpf: Ensure off_reg has no mixed signed bounds for all types 4a163b1c7053 bpf: Move off_reg into sanitize_ptr_alu
19bfeb47e96b Linux 5.4.115
af7099bad495 USB: CDC-ACM: fix poison/unpoison imbalance d7fad2ce15bd net: hso: fix NULL-deref on disconnect regression 699017fe0de4 x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access b3962b4e8334 ia64: tools: remove duplicate definition of ia64_mf() on ia64 763cbe5e1ebb ia64: fix discontig.c section mismatches
3dce9c4bb546 csky: change a Kconfig symbol name to fix e1000 build error 892f6bc55746 cavium/liquidio: Fix duplicate argument
2ccca124620e xen-netback: Check for hotplug-status existence before watching 78687d6a3213 s390/entry: save the caller of psw_idle
026490fac496 net: geneve: check skb is large enough for IPv4/IPv6 header caaf9371ecad ARM: dts: Fix swapped mmc order for omap3 be60afbb9136 HID: wacom: Assign boolean values to a bool variable 116ee59ef886 HID: alps: fix error return code in alps_input_configured() a4e2b91cea52 HID: google: add don USB id
aefb6ac6ac11 perf auxtrace: Fix potential NULL pointer dereference 39638289595b perf/x86/kvm: Fix Broadwell Xeon stepping in isolation_ucodes[] 319a06e58ed7 perf/x86/intel/uncore: Remove uncore extra PCI dev HSWEP_PCI_PCU_3 82808cc02681 locking/qrwlock: Fix ordering in queued_write_lock_slowpath() c6eb92b37af1 arm64: dts: allwinner: Revert SD card CD GPIO for Pine64-LTS 37ee803d7ed7 pinctrl: lewisburg: Update number of pins in community dbb355960ef9 gpio: omap: Save and restore sysconfig
835c8d688e1e s390/ptrace: return -ENOSYS when invalid syscall is supplied

(cherry picked from commit 667352cc46429f3d8eca12cf93c26be2d26e5d74)
---
 .../linux/linux-yocto-rt_5.4.bb               |  6 ++---
 .../linux/linux-yocto-tiny_5.4.bb             |  8 +++----
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  | 22 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +3 -3
index fd44e171eb..79aff31770 100644
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "da52117f6cbb53b6242803d432e8649a964f0435"
-SRCREV_meta ?= "e335eb1ff7c2948e263b9d59f1664c5bf198e4cf"
+SRCREV_machine ?= "b62ae8bedb024e67e7c5cda51840454a4170c858"
+SRCREV_meta ?= "cf20a3c44f5ef181b16ed80e9c2683f76b1ead20"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "5.4.114"
+LINUX_VERSION ?= "5.4.116"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +4 -4
index 3886388ea9..e3750dd7f1 100644
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "5.4.114"
+LINUX_VERSION ?= "5.4.116"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine_qemuarm ?= "06631306658b18d4e29f721a43479d90effc3fc2"
-SRCREV_machine ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
-SRCREV_meta ?= "e335eb1ff7c2948e263b9d59f1664c5bf198e4cf"
+SRCREV_machine_qemuarm ?= "80bd6016a9bdaed4b66ddffffa8c8e62d7c1f8a6"
+SRCREV_machine ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85"
+SRCREV_meta ?= "cf20a3c44f5ef181b16ed80e9c2683f76b1ead20"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.4.bb +11 -11
index cb71881144..f2f0ac0b56 100644
@@ -12,16 +12,16 @@ KBRANCH_qemux86  ?= "v5.4/standard/base"
 KBRANCH_qemux86-64 ?= "v5.4/standard/base"
 KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "d62f2d60acebc640c2749532e1527d1f117003d6"
-SRCREV_machine_qemuarm64 ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
-SRCREV_machine_qemumips ?= "ec6cca9ea72879a0d06ce1243e952a42a3435607"
-SRCREV_machine_qemuppc ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
-SRCREV_machine_qemuriscv64 ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
-SRCREV_machine_qemux86 ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
-SRCREV_machine_qemux86-64 ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
-SRCREV_machine_qemumips64 ?= "fd8bb72df12890ec21b27b83e26492ba527ebea3"
-SRCREV_machine ?= "6d78e8ad5697bdad4bd76d0eeb44daca8cbe108d"
-SRCREV_meta ?= "e335eb1ff7c2948e263b9d59f1664c5bf198e4cf"
+SRCREV_machine_qemuarm ?= "e71df0530eefcac1b3248329e385bcefbad6336e"
+SRCREV_machine_qemuarm64 ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85"
+SRCREV_machine_qemumips ?= "07445052fdd15e60b30dc5ae9d162c2e6bba47d1"
+SRCREV_machine_qemuppc ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85"
+SRCREV_machine_qemuriscv64 ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85"
+SRCREV_machine_qemux86 ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85"
+SRCREV_machine_qemux86-64 ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85"
+SRCREV_machine_qemumips64 ?= "b36d79d6f2aaf9dadec352f611e7b9becf2b9a55"
+SRCREV_machine ?= "ea7a54fa402727f3c4bc4a1904d4a9590e7c8b85"
+SRCREV_meta ?= "cf20a3c44f5ef181b16ed80e9c2683f76b1ead20"
 
 # remap qemuarm to qemuarma15 for the 5.4 kernel
 # KMACHINE_qemuarm ?= "qemuarma15"
@@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-LINUX_VERSION ?= "5.4.114"
+LINUX_VERSION ?= "5.4.116"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
 DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.25.1
#7 lore raw

PATCH 7/25 ptest-runner: libgcc must be installed for pthread_cancel to work

In reply to Steve Sakoman

From: Jose Quaresma <[email protected]>

This only affects glibc systems and have been
found on runqemu core-image-minimal with gstreamer ptest-runner

STOP: ptest-runner
libgcc_s.so.1 must be installed for pthread_cancel to work Aborted

(cherry picked from commit 1cb679e6a4528a2cef16f65342d5e65adb14cb16)
---
 meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-support/ptest-runner/ptest-runner_2.4.0.bb +2 -0
index 8b9938f572..7290dc90e5 100644
@@ -27,3 +27,5 @@ do_compile () {
 do_install () {
 	install -D -m 0755 ${S}/ptest-runner ${D}${bindir}/ptest-runner
 }
+
+RDEPENDS_${PN}_append_libc-glibc = " libgcc"
Signature · 1 line
2.25.1
#8 lore raw

PATCH 8/25 kernel.bbclass: Remove do_install[prefunc] no longer needed

In reply to Steve Sakoman

From: Mark Hatle <[email protected]>

Prior work has refactored the do_install task multiple times, and any references to PKGV and PKGR (even indirect ones) have been removed.

(cherry picked from commit 36fe4db8ae827a93abe9fce6740459d215411965)
---
 meta/classes/kernel.bbclass | 1 -
 1 file changed, 1 deletion(-)
meta/classes/kernel.bbclass +0 -1
index 22b1224d79..518aaef724 100644
@@ -405,7 +405,6 @@ kernel_do_install() {
 	install -d ${D}${sysconfdir}/modules-load.d
 	install -d ${D}${sysconfdir}/modprobe.d
 }
-do_install[prefuncs] += "package_get_auto_pr"
 
 # Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile
 do_kernel_version_sanity_check() {
Signature · 1 line
2.25.1
#9 lore raw

PATCH 9/25 gstreamer1.0-plugins-good: on wayland qt5 needs qtwayland

In reply to Steve Sakoman

From: Kai Uwe Broulik <[email protected]>

The code in ext/qt/meson.build looks for the Qt5WaylandClient pkg-config file. Without this module, qmlglsink will not work with Wayland.
This can be tested by checking whether or not HAVE_QT_WAYLAND has been added to the cflags in the autogenerated ninja file.

Writen by:
Carlos Rafael Giani
https://lists.openembedded.org/g/openembedded-core/message/143574

(From OE-Core rev: ba2e0f647894b51d2f365b1d2eee7b673ddf8b7e)

(cherry picked from commit 41bba2b226ff5332561a644a2fd4a2c8b8d7d967)
---
 .../gstreamer/gstreamer1.0-plugins-good_1.16.3.bb             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.3.bb +3 -1
index 168bff4137..b3f17d4a4a 100644
@@ -34,6 +34,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
 X11ENABLEOPTS = "-Dximagesrc=enabled -Dximagesrc-xshm=enabled -Dximagesrc-xfixes=enabled -Dximagesrc-xdamage=enabled"
 X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled -Dximagesrc-xfixes=disabled -Dximagesrc-xdamage=disabled"
 
+QT5WAYLANDDEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+
 PACKAGECONFIG[bz2]        = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
 PACKAGECONFIG[cairo]      = "-Dcairo=enabled,-Dcairo=disabled,cairo"
 PACKAGECONFIG[dv1394]     = "-Ddv1394=enabled,-Ddv1394=disabled,libiec61883 libavc1394 libraw1394"
@@ -48,7 +50,7 @@ PACKAGECONFIG[libpng]     = "-Dpng=enabled,-Dpng=disabled,libpng"
 PACKAGECONFIG[libv4l2]    = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils"
 PACKAGECONFIG[mpg123]     = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123"
 PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio"
-PACKAGECONFIG[qt5]        = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native"
+PACKAGECONFIG[qt5]        = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}"
 PACKAGECONFIG[soup]       = "-Dsoup=enabled,-Dsoup=disabled,libsoup-2.4"
 PACKAGECONFIG[speex]      = "-Dspeex=enabled,-Dspeex=disabled,speex"
 PACKAGECONFIG[taglib]     = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"
Signature · 1 line
2.25.1
#10 lore raw

PATCH 10/25 pybootchart/draw: Avoid divide by zero error

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

When disk stats don't run frequenctly enough, we see divide by zero errors. The code already has a fallback path so ensure we use it for this case too.

[YOCTO #14360]

(cherry picked from commit b71d30aef5dc2c360432c0dd4147859dd303ea48)
---
 scripts/pybootchartgui/pybootchartgui/draw.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/pybootchartgui/pybootchartgui/draw.py +1 -1
index 53324b9f8b..29eb7505bc 100644
@@ -271,7 +271,7 @@ def draw_chart(ctx, color, fill, chart_bounds, data, proc_tree, data_range):
     # If data_range is given, scale the chart so that the value range in
     # data_range matches the chart bounds exactly.
     # Otherwise, scale so that the actual data matches the chart bounds.
-    if data_range:
+    if data_range and (data_range[1] - data_range[0]):
         yscale = float(chart_bounds[3]) / (data_range[1] - data_range[0])
         ybase = data_range[0]
     else:
Signature · 1 line
2.25.1
#11 lore raw

PATCH 11/25 rootfs.py: find .ko.gz and .ko.xz kernel modules as well

In reply to Steve Sakoman

From: Christophe Chapuis <[email protected]>

* with xz PACKAGECONFIG enabled in kmod and xz module compression enabled in kernel the do_rootfs task doesn't run depmod in the image, because it thinks there are no modules:
NOTE: No Kernel Modules found, not running depmod

(cherry picked from commit 9c13ce05eae0f126eb150e48709e9bd06e9280fa)
---
 meta/lib/oe/rootfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/rootfs.py +1 -1
index cd65e62030..23e156c47b 100644
@@ -304,7 +304,7 @@ class Rootfs(object, metaclass=ABCMeta):
     def _check_for_kernel_modules(self, modules_dir):
         for root, dirs, files in os.walk(modules_dir, topdown=True):
             for name in files:
-                found_ko = name.endswith(".ko")
+                found_ko = name.endswith((".ko", ".ko.gz", ".ko.xz"))
                 if found_ko:
                     return found_ko
         return False
Signature · 1 line
2.25.1
#12 lore raw

PATCH 12/25 cml1.bbclass: Return sorted list of cfg files

In reply to Steve Sakoman

From: Khem Raj <[email protected]>

Since these files are passed to merge_config.sh its better to use a sorted list, so we can be sure that this list is always fed in same order irrespective of python versions on host

(cherry picked from commit 3d949f286c29bcaaf4dfc0aaffd15f129d1bab2d)
---
 meta/classes/cml1.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/cml1.bbclass +1 -1
index 8ab240589a..e91452081c 100644
@@ -6,7 +6,7 @@ def find_cfgs(d):
         if s.endswith('.cfg'):
             sources_list.append(s)
 
-    return sources_list
+    return sorted(sources_list)
 
 cml1_do_configure() {
 	set -e
Signature · 1 line
2.25.1
#13 lore raw

PATCH 13/25 perf: fix python-audit RDEPENDS

In reply to Steve Sakoman

From: Bruce Ashfield <[email protected]>

When doing the perf python3 conversion, the audit-python RDEPENDS was caught up in the regex replacement and was incorrectly changed.

The audit recipe continues to produce a package called audit-python and it is that package we should have as a RDEPENDS.

(cherry picked from commit 7eccb9c0c2ea00685451c44cb8faa96c4a2272fd)
---
 meta/recipes-kernel/perf/perf.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/perf/perf.bb +1 -1
index 578b871e9e..b6f50583f7 100644
@@ -265,7 +265,7 @@ PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
 
 RDEPENDS_${PN} += "elfutils bash"
 RDEPENDS_${PN}-archive =+ "bash"
-RDEPENDS_${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python3', '', d)}"
+RDEPENDS_${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}"
 RDEPENDS_${PN}-perl =+ "bash perl perl-modules"
 RDEPENDS_${PN}-tests =+ "python3"
 
Signature · 1 line
2.25.1
#14 lore raw

PATCH 14/25 make-mod-scripts: add HOSTCXX definitions and gmp-native dependency

In reply to Steve Sakoman

From: Bruce Ashfield <[email protected]>

With kernel v5.8+ and gcc10 plugins, we can run into the following build error:

HOSTCXX -fPIC scripts/gcc-plugins/arm_ssp_per_task_plugin.o
In file included from /home/pokybuild/yocto-worker/qemuarm/build/build/tmp/work/qemuarm-poky-linux-gnueabi/make-mod-scripts/1.0-r0/recipe-sysroot-native/usr/bin/arm-poky-linux-gnueabi/../../lib/arm-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/10.1.0/plugin/include/gcc-plugin.h:28,
from
/home/pokybuild/yocto-worker/qemuarm/build/build/tmp/work-shared/qemuarm/kernel-source/scripts/gcc-plugins/gcc-common.h:7,
from
/home/pokybuild/yocto-worker/qemuarm/build/build/tmp/work-shared/qemuarm/kernel-source/scripts/gcc-plugins/arm_ssp_per_task_plugin.c:3:
/home/pokybuild/yocto-worker/qemuarm/build/build/tmp/work/qemuarm-poky-linux-gnueabi/make-mod-scripts/1.0-r0/recipe-sysroot-native/usr/bin/arm-poky-linux-gnueabi/../../lib/arm-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/10.1.0/plugin/include/system.h:687:10:
fatal error: gmp.h: No such file or directory
687 | #include <gmp.h>
| ^~~~~~~

(cherry picked from commit cb055446e0fe4771c8bd6122e79d43ef8db2e45b)
---
 meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +2 -0
index 87b7d240f5..b58fa9a603 100644
@@ -16,8 +16,10 @@ do_compile[depends] += "virtual/kernel:do_compile_kernelmodules"
 RDEPENDS_${PN}-dev = ""
 
 DEPENDS += "bc-native bison-native"
+DEPENDS += "gmp-native"
 
 EXTRA_OEMAKE = " HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}""
+EXTRA_OEMAKE += " HOSTCXX="${BUILD_CXX} ${BUILD_CXXFLAGS} ${BUILD_LDFLAGS}""
 
 # Build some host tools under work-shared.  CC, LD, and AR are probably
 # not used, but this is the historical way of invoking "make scripts".
Signature · 1 line
2.25.1
#15 lore raw

PATCH 15/25 diffoscope: add native libraries to LD_LIBRARY_PATH

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Reversal of global setting in previous commit necessitates a local fix, otherwise, this happens:

File "/home/pokybuild/yocto-worker/reproducible-debian/build/build-st-52142/tmp/work/x86_64-linux/diffoscope-native/172-r0/recipe-sysroot-native/usr/lib/python3.9/ctypes/__init__.py", line 392, in __getitem__
func = self._FuncPtr((name_or_ordinal, self))
AttributeError: nativepython3: undefined symbol: archive_errno

(cherry picked from commit 87884d9938829d5ae5d250f483c749e00cd83322)
---
 meta/recipes-support/diffoscope/diffoscope_172.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-support/diffoscope/diffoscope_172.bb +1 -0
index eb85d6c854..b26713c47f 100644
@@ -18,6 +18,7 @@ do_install_append_class-native() {
 	create_wrapper ${D}${bindir}/diffoscope \
 		MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \
 		RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \
+		LD_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
 		RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE}
 }
 
Signature · 1 line
2.25.1
#16 lore raw

PATCH 16/25 Revert "oeqa: Set LD_LIBRARY_PATH when executing native commands"

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

LD_LIBRARY_PATH leaks into host executables too, and breaks them as they are not uninative-enabled. E.g. on ubuntu 18.04 trying to run host bash with a sysroot that was built on Fedora 33:

akanavin@ubuntu1804-ty-3:/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/build-st-24341/tmp/work/x86_64-linux/gnupg-native/2.3.1-r0/recipe-sysroot-native$ LD_LIBRARY_PATH=./usr/lib /bin/bash
/bin/bash: ./usr/lib/libtinfo.so.5: no version information available (required by /bin/bash)
/bin/bash: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.33' not found (required by ./usr/lib/libtinfo.so.5)

This was seen e.g. here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/2090/steps/14/logs/stdio

(cherry picked from commit 0e9850486b74a3de934527ca1077df001d3a8d22)
---
 meta/lib/oeqa/utils/commands.py | 3 ---
 1 file changed, 3 deletions(-)
meta/lib/oeqa/utils/commands.py +0 -3
index a71c16ab14..024261410e 100644
@@ -174,11 +174,8 @@ def runCmd(command, ignore_status=False, timeout=None, assert_error=True, sync=T
     if native_sysroot:
         extra_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin" % \
                       (native_sysroot, native_sysroot, native_sysroot)
-        extra_libpaths = "%s/lib:%s/usr/lib" % \
-                         (native_sysroot, native_sysroot)
         nenv = dict(options.get('env', os.environ))
         nenv['PATH'] = extra_paths + ':' + nenv.get('PATH', '')
-        nenv['LD_LIBRARY_PATH'] = extra_libpaths + ':' + nenv.get('LD_LIBRARY_PATH', '')
         options['env'] = nenv
 
     cmd = Command(command, timeout=timeout, output_log=output_log, **options)
Signature · 1 line
2.25.1
#17 lore raw

PATCH 17/25 classes/image: Use xargs to set file timestamps

In reply to Steve Sakoman

From: Joshua Watt <[email protected]>

Instead of having find directly invoke touch for each file in the root file system, pass a list to xargs for batching. This significantly reduces the number of times the touch program is invoked and speeds up the do_image task time:

    PKG           TASK      ABSDIFF  RELDIFF  CPUTIME1 -> CPUTIME2
    my-image      do_image   -45.3s   -94.2%     48.1s -> 2.8s

    Cumulative cputime:
      -44.3s    -92.3%    00:48.1 (48.1s) -> 00:03.7 (3.7s)
(cherry picked from commit 15c65f90a3aa1e98c2beab2539403157df1fca08)
---
 meta/classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/image.bbclass +1 -1
index 79c487ea18..98513ddf08 100644
@@ -662,7 +662,7 @@ reproducible_final_image_task () {
         fi
         # Set mtime of all files to a reproducible value
         bbnote "reproducible_final_image_task: mtime set to $REPRODUCIBLE_TIMESTAMP_ROOTFS"
-        find  ${IMAGE_ROOTFS} -exec touch -h  --date=@$REPRODUCIBLE_TIMESTAMP_ROOTFS {} \;
+        find  ${IMAGE_ROOTFS} -print0 | xargs -0 touch -h  --date=@$REPRODUCIBLE_TIMESTAMP_ROOTFS
     fi
 }
 
Signature · 1 line
2.25.1
#18 lore raw

PATCH 18/25 sanity.bbclass: mention CONNECTIVITY_CHECK_URIS in network failure message

In reply to Steve Sakoman

From: Michael Opdenacker <[email protected]>

This expands the error message when a network failure is detected. It happens that some ISPs or networks block the default example.com domain. Therefore, instead of disabling network access, it lets the user know how to modify the test URL.

(cherry picked from commit 62c94bb925543c1e1c5af3c751913d9f06d9597d)
---
 meta/classes/sanity.bbclass | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
meta/classes/sanity.bbclass +6 -3
index 83bced2db3..2325ee2747 100644
@@ -392,9 +392,12 @@ def check_connectivity(d):
             msg = data.getVar('CONNECTIVITY_CHECK_MSG') or ""
             if len(msg) == 0:
                 msg = "%s.\n" % err
-                msg += "    Please ensure your host's network is configured correctly,\n"
-                msg += "    or set BB_NO_NETWORK = \"1\" to disable network access if\n"
-                msg += "    all required sources are on local disk.\n"
+                msg += "    Please ensure your host's network is configured correctly.\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.yoctoproject.org/\""
+                msg += "    You could also set BB_NO_NETWORK = \"1\" to disable network\n"
+                msg += "    access if all required sources are on local disk.\n"
             retval = msg
 
     return retval
Signature · 1 line
2.25.1
#19 lore raw

PATCH 19/25 libevent: Increase ptest timing tolerance 50 ms -> 100 ms

In reply to Steve Sakoman

From: Yi Fan Yu <[email protected]>

Adjusting the tolerance to a more reasonable time given the load on the AB and given the high amount(100) of events some of the tests like common_timeout generates.

[YOCTO #14163]

(cherry picked from commit 38b36d2b90d570149e63816e68f457aea28a5092)
---
 ...ncrease-default-timeval-tolerance-50.patch | 33 +++++++++++++++++++
 .../libevent/libevent_2.1.11.bb               |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-support/libevent/libevent/0002-test-regress.h-Increase-default-timeval-tolerance-50.patch
meta/recipes-support/libevent/libevent/0002-test-regress.h-Increase-default-timeval-tolerance-50.patch new file +33 -0
new file mode 100644
index 0000000000..0b20eda3c0
@@ -0,0 +1,33 @@
+From dff8fd27edb23bc1486809186c6a4fe1f75f2179 Mon Sep 17 00:00:00 2001
+From: Yi Fan Yu <[email protected]>
+Date: Thu, 22 Apr 2021 22:35:59 -0400
+Subject: [PATCH] test/regress.h: Increase default timeval tolerance 50 ms ->
+ 100 ms
+
+The default timeout tolerance is 50 ms,
+which causes intermittent failure in many the
+related tests in arm64 QEMU.
+
+See: https://bugzilla.yoctoproject.org/show_bug.cgi?id=14163
+(The root cause seems to be a heavy load)
+
+Upstream-Status: Submitted [https://github.com/libevent/libevent/pull/1157]
+
+Signed-off-by: Yi Fan Yu <[email protected]>
+---
+ test/regress.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/regress.h b/test/regress.h
+index f06a7669..829af4a7 100644
+--- a/test/regress.h
++++ b/test/regress.h
+@@ -127,7 +127,7 @@ int test_ai_eq_(const struct evutil_addrinfo *ai, const char *sockaddr_port,
+ 	tt_int_op(labs(timeval_msec_diff((tv1), (tv2)) - diff), <=, tolerance)
+ 
+ #define test_timeval_diff_eq(tv1, tv2, diff)				\
+-	test_timeval_diff_leq((tv1), (tv2), (diff), 50)
++	test_timeval_diff_leq((tv1), (tv2), (diff), 100)
+ 
+ long timeval_msec_diff(const struct timeval *start, const struct timeval *end);
+
meta/recipes-support/libevent/libevent_2.1.11.bb +1 -0
index 84e8fe183e..75f9979c5b 100644
@@ -15,6 +15,7 @@ SRC_URI = "https://github.com/libevent/libevent/releases/download/release-${PV}-
            file://Makefile-missing-test-dir.patch \
            file://run-ptest \
            file://0001-test-regress_dns.c-patch-out-tests-that-require-a-wo.patch \
+           file://0002-test-regress.h-Increase-default-timeval-tolerance-50.patch \
            "
 
 SRC_URI[md5sum] = "7f35cfe69b82d879111ec0d7b7b1c531"
Signature · 1 line
2.25.1
#20 lore raw

PATCH 20/25 oeqa/qemurunner: Improve logging thread exit handling for qemu shutdown test

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Rather than totally disabling the logging, inform it we're about to exit so we can log messages over the exit cleanly too. This aids debugging. It also avoids a race where the logging handler could still error whilst shutting down.

Also remove a race window by notificing the handler of the shutdown first, before triggering it. This removes a race window I watched in local testing.

(cherry picked from commit 0e19f31a1005f94105e1cef252abfffcef2aafad)
---
 meta/lib/oeqa/selftest/cases/runqemu.py |  9 ++++-----
 meta/lib/oeqa/utils/qemurunner.py       | 12 +++++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)
meta/lib/oeqa/selftest/cases/runqemu.py +4 -5
index 7e676bcb41..da22f77b27 100644
@@ -163,12 +163,11 @@ class QemuTest(OESelftestTestCase):
         bitbake(cls.recipe)
 
     def _start_qemu_shutdown_check_if_shutdown_succeeded(self, qemu, timeout):
+        # Allow the runner's LoggingThread instance to exit without errors
+        # (such as the exception "Console connection closed unexpectedly")
+        # as qemu will disappear when we shut it down
+        qemu.runner.allowexit()
         qemu.run_serial("shutdown -h now")
-        # Stop thread will stop the LoggingThread instance used for logging
-        # qemu through serial console, stop thread will prevent this code
-        # from facing exception (Console connection closed unexpectedly)
-        # when qemu was shutdown by the above shutdown command
-        qemu.runner.stop_thread()
         time_track = 0
         try:
             while True:
meta/lib/oeqa/utils/qemurunner.py +11 -1
index 77ec939ad7..410789b815 100644
@@ -467,6 +467,10 @@ class QemuRunner:
             self.thread.stop()
             self.thread.join()
 
+    def allowexit(self):
+        if self.thread:
+            self.thread.allowexit()
+
     def restart(self, qemuparams = None):
         self.logger.warning("Restarting qemu process")
         if self.runqemu.poll() is None:
@@ -560,6 +564,7 @@ class LoggingThread(threading.Thread):
         self.logger = logger
         self.readsock = None
         self.running = False
+        self.canexit = False
 
         self.errorevents = select.POLLERR | select.POLLHUP | select.POLLNVAL
         self.readevents = select.POLLIN | select.POLLPRI
@@ -593,6 +598,9 @@ class LoggingThread(threading.Thread):
         self.close_ignore_error(self.writepipe)
         self.running = False
 
+    def allowexit(self):
+        self.canexit = True
+
     def eventloop(self):
         poll = select.poll()
         event_read_mask = self.errorevents | self.readevents
@@ -649,7 +657,9 @@ class LoggingThread(threading.Thread):
             # happened. But for this code it counts as an
             # error since the connection shouldn't go away
             # until qemu exits.
-            raise Exception("Console connection closed unexpectedly")
+            if not self.canexit:
+                raise Exception("Console connection closed unexpectedly")
+            return ''
 
         return data
 
Signature · 1 line
2.25.1
#21 lore raw

PATCH 21/25 lib/package_manager: Use shutil.copy instead of bb.utils.copyfile for intercepts

In reply to Steve Sakoman

If the scripts/postinst-intercepts is owned by root/root then the copyfile() calls will fail due to chown issues. We don't care about ownership of these files so use shutil.copy() instead which won't perform any chown.

---
 meta/lib/oe/package_manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/package_manager.py +1 -1
index b0660411ea..db988d9247 100644
@@ -403,7 +403,7 @@ class PackageManager(object, metaclass=ABCMeta):
         bb.utils.remove(self.intercepts_dir, True)
         bb.utils.mkdirhier(self.intercepts_dir)
         for intercept in postinst_intercepts:
-            bb.utils.copyfile(intercept, os.path.join(self.intercepts_dir, os.path.basename(intercept)))
+            shutil.copy(intercept, os.path.join(self.intercepts_dir, os.path.basename(intercept)))
 
     @abstractmethod
     def _handle_intercept_failure(self, failed_script):
Signature · 1 line
2.25.1
#22 lore raw

PATCH 22/25 ovmf: update to 202002

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit c4301758f5a1560965ca5fb69eb1492adf351ed0)
---
 ...st.patch => 0001-ovmf-Update-to-latest.patch} | 16 ++++++++--------
 meta/recipes-core/ovmf/ovmf_git.bb               |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename meta/recipes-core/ovmf/ovmf/{0004-ovmf-Update-to-latest.patch => 0001-ovmf-Update-to-latest.patch} (85%)
meta/recipes-core/ovmf/ovmf/0001-ovmf-Update-to-latest.patch renamed from meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch +8 -8
similarity index 85%
rename from meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch
rename to meta/recipes-core/ovmf/ovmf/0001-ovmf-Update-to-latest.patch
index c10a39d95d..1d4273cdc1 100644
@@ -1,7 +1,7 @@
-From 94eff316b31b4d0348af28c77be5c00bc09fe8e7 Mon Sep 17 00:00:00 2001
+From 640a634936ba8eca4778470fb14c6eb9cfd19953 Mon Sep 17 00:00:00 2001
 From: Steve Langasek <[email protected]>
 Date: Sat, 10 Jun 2017 01:39:36 -0700
-Subject: [PATCH 4/5] ovmf: Update to latest
+Subject: [PATCH 1/2] ovmf: Update to latest
 
 Description: pass -fno-stack-protector to all GCC toolchains
  The upstream build rules inexplicably pass -fno-stack-protector only
@@ -15,12 +15,12 @@ Upstream-Status: Pending
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index ca0b122dbb..b0066c2ab8 100755
+index 2b17d3b297..4cd2567c2a 100755
 --- a/BaseTools/Conf/tools_def.template
 +++ b/BaseTools/Conf/tools_def.template
-@@ -1941,10 +1941,10 @@ DEFINE GCC_X64_RC_FLAGS            = -I binary -O elf64-x86-64        -B i386
- DEFINE GCC_ARM_RC_FLAGS            = -I binary -O elf32-littlearm     -B arm     --rename-section .data=.hii
- DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii
+@@ -1950,10 +1950,10 @@ DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B aarch64
+ # GCC Build Flag for included header file list generation
+ DEFINE GCC_DEPS_FLAGS              = -MMD -MF [email protected]
  
 -DEFINE GCC48_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
 +DEFINE GCC48_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-stack-protector -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
@@ -32,7 +32,7 @@ index ca0b122dbb..b0066c2ab8 100755
  DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
  DEFINE GCC48_IA32_X64_DLINK_FLAGS    = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive
  DEFINE GCC48_IA32_DLINK2_FLAGS       = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(GCC_DLINK2_FLAGS_COMMON)
-@@ -1953,7 +1953,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS        = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF
+@@ -1962,7 +1962,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS        = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF
  DEFINE GCC48_ASM_FLAGS               = DEF(GCC_ASM_FLAGS)
  DEFINE GCC48_ARM_ASM_FLAGS           = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
  DEFINE GCC48_AARCH64_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
@@ -42,5 +42,5 @@ index ca0b122dbb..b0066c2ab8 100755
  DEFINE GCC48_AARCH64_CC_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS)
  DEFINE GCC48_AARCH64_CC_XIPFLAGS     = DEF(GCC_AARCH64_CC_XIPFLAGS)
 -- 
-2.17.1
+2.24.0
 
meta/recipes-core/ovmf/ovmf_git.bb +4 -4
index 9667fa0c86..c089627822 100644
@@ -12,15 +12,15 @@ LIC_FILES_CHKSUM = "file://OvmfPkg/License.txt;md5=06357ddc23f46577c2aeaeaf7b776
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[secureboot] = ",,,"
 
-SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=git \
+SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
            file://0001-ovmf-update-path-to-native-BaseTools.patch \
            file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
            file://0003-ovmf-enable-long-path-file.patch \
-           file://0004-ovmf-Update-to-latest.patch \
+           file://0001-ovmf-Update-to-latest.patch \
         "
 
-PV = "edk2-stable201911"
-SRCREV = "bd85bf54c268204c7a698a96f3ccd96cd77952cd"
+PV = "edk2-stable202002"
+SRCREV = "4c0f6e349d32cf27a7104ddd3e729d6ebc88ea70"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
 
 inherit deploy
Signature · 1 line
2.25.1
#23 lore raw

PATCH 23/25 ovmf: update to 202005

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit f8bf6b5f9aedcc4490008000250e69f74529db75)
---
 meta/recipes-core/ovmf/ovmf_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/ovmf/ovmf_git.bb +2 -2
index c089627822..91c1b6ba14 100644
@@ -19,8 +19,8 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
            file://0001-ovmf-Update-to-latest.patch \
         "
 
-PV = "edk2-stable202002"
-SRCREV = "4c0f6e349d32cf27a7104ddd3e729d6ebc88ea70"
+PV = "edk2-stable202005"
+SRCREV = "ca407c7246bf405da6d9b1b9d93e5e7f17b4b1f9"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
 
 inherit deploy
Signature · 1 line
2.25.1
#24 lore raw

PATCH 24/25 ovmf: update edk2-stable202005 -> edk2-stable202008

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 61cc9acb54be09a12aac7c79f4b14e7e525d5596)
---
 ...ovmf-update-path-to-native-BaseTools.patch |  6 ++--
 ...ile-adjust-to-build-in-under-bitbake.patch | 32 ++++++++++++++-----
 .../0003-ovmf-enable-long-path-file.patch     |  6 ++--
 ...patch => 0004-ovmf-Update-to-latest.patch} | 16 +++++-----
 meta/recipes-core/ovmf/ovmf_git.bb            |  6 ++--
 5 files changed, 41 insertions(+), 25 deletions(-)
 rename meta/recipes-core/ovmf/ovmf/{0001-ovmf-Update-to-latest.patch => 0004-ovmf-Update-to-latest.patch} (77%)
meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch +3 -3
index 6ecb23b29f..c32963a807 100644
@@ -1,7 +1,7 @@
-From 0a8362cfb9f00870d70687475665b131dd82c947 Mon Sep 17 00:00:00 2001
+From 200ff35c6545b4ab85f5ea7a6096fbaec3d82f6d Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <[email protected]>
 Date: Thu, 9 Jun 2016 02:23:01 -0700
-Subject: [PATCH 1/5] ovmf: update path to native BaseTools
+Subject: [PATCH 1/4] ovmf: update path to native BaseTools
 
 BaseTools is a set of utilities to build EDK-based firmware. These utilities
 are used during the build process. Thus, they need to be built natively.
@@ -30,5 +30,5 @@ index 91b1442ade..1858dae31a 100755
    source edksetup.sh BaseTools
  else
 -- 
-2.17.1
+2.28.0
 
meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +24 -8
index f37ed018ab..c61a08f022 100644
@@ -1,7 +1,7 @@
-From a8bceaec1b16fffbf6810df05503d8ae9092b735 Mon Sep 17 00:00:00 2001
+From 667c0cf97dadc4f5994d26ec3984f559a05ec406 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <[email protected]>
 Date: Fri, 26 Jul 2019 17:34:26 -0400
-Subject: [PATCH 2/5] BaseTools: makefile: adjust to build in under bitbake
+Subject: [PATCH 2/4] BaseTools: makefile: adjust to build in under bitbake
 
 Prepend the build flags with those of bitbake. This is to build
 using the bitbake native sysroot include and library directories.
@@ -10,14 +10,14 @@ Signed-off-by: Ricardo Neri <[email protected]>
 Upstream-Status: Pending
 
 ---
- BaseTools/Source/C/Makefiles/header.makefile | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
 
 diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
-index 4e9b36d98b..eb03ee33fa 100644
+index 1c105ee7d4..d5eea3864e 100644
 --- a/BaseTools/Source/C/Makefiles/header.makefile
 +++ b/BaseTools/Source/C/Makefiles/header.makefile
-@@ -62,23 +62,23 @@ $(error Bad HOST_ARCH)
+@@ -69,35 +69,36 @@ $(error Bad HOST_ARCH)
  endif
  
  INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
@@ -33,19 +33,35 @@ index 4e9b36d98b..eb03ee33fa 100644
 +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
  -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
  else
+ ifeq ($(CXX), llvm)
+-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
++BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
+ -fno-delete-null-pointer-checks -Wall -Werror \
+ -Wno-deprecated-declarations -Wno-self-assign \
+ -Wno-unused-result -nostdlib -g
+ else
 -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
 +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
  -fno-delete-null-pointer-checks -Wall -Werror \
  -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \
  -Wno-unused-result -nostdlib -g
  endif
+ endif
+ ifeq ($(CXX), llvm)
+-BUILD_LFLAGS =
+-BUILD_CXXFLAGS = -Wno-deprecated-register -Wno-unused-result
++BUILD_LFLAGS = $(LDFLAGS)
++BUILD_CXXFLAGS += -Wno-deprecated-register -Wno-unused-result
+ else
 -BUILD_LFLAGS =
 -BUILD_CXXFLAGS = -Wno-unused-result
 +BUILD_LFLAGS = $(LDFLAGS)
 +BUILD_CXXFLAGS += -Wno-unused-result
- 
+ endif
++
  ifeq ($(HOST_ARCH), IA32)
  #
+ # Snow Leopard  is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults
 -- 
-2.17.1
+2.28.0
 
meta/recipes-core/ovmf/ovmf/0003-ovmf-enable-long-path-file.patch +3 -3
index ab1e7db31f..df1d159011 100644
@@ -1,7 +1,7 @@
-From 60a5f953f747e1e9e05a40157b651cba8ea57b91 Mon Sep 17 00:00:00 2001
+From e19481e5a64f8915ac118899b10c40d12c0f9daa Mon Sep 17 00:00:00 2001
 From: Dengke Du <[email protected]>
 Date: Mon, 11 Sep 2017 02:21:55 -0400
-Subject: [PATCH 3/5] ovmf: enable long path file
+Subject: [PATCH 3/4] ovmf: enable long path file
 
 Upstream-Status: Pending
 Signed-off-by: Dengke Du <[email protected]>
@@ -24,5 +24,5 @@ index e1cce985f7..d67d03c70c 100644
  #define MAX_UINT64 ((UINT64)0xFFFFFFFFFFFFFFFFULL)
  #define MAX_UINT32 ((UINT32)0xFFFFFFFF)
 -- 
-2.17.1
+2.28.0
 
meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch renamed from meta/recipes-core/ovmf/ovmf/0001-ovmf-Update-to-latest.patch +8 -8
similarity index 77%
rename from meta/recipes-core/ovmf/ovmf/0001-ovmf-Update-to-latest.patch
rename to meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch
index 1d4273cdc1..128438b201 100644
@@ -1,7 +1,7 @@
-From 640a634936ba8eca4778470fb14c6eb9cfd19953 Mon Sep 17 00:00:00 2001
+From ad06fcf1e08736e79221cd6863ff2e3c9254f261 Mon Sep 17 00:00:00 2001
 From: Steve Langasek <[email protected]>
 Date: Sat, 10 Jun 2017 01:39:36 -0700
-Subject: [PATCH 1/2] ovmf: Update to latest
+Subject: [PATCH 4/4] ovmf: Update to latest
 
 Description: pass -fno-stack-protector to all GCC toolchains
  The upstream build rules inexplicably pass -fno-stack-protector only
@@ -15,15 +15,15 @@ Upstream-Status: Pending
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 2b17d3b297..4cd2567c2a 100755
+index 933b3160fd..c2fbbf0c38 100755
 --- a/BaseTools/Conf/tools_def.template
 +++ b/BaseTools/Conf/tools_def.template
-@@ -1950,10 +1950,10 @@ DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B aarch64
+@@ -1952,10 +1952,10 @@ DEFINE GCC_RISCV64_RC_FLAGS        = -I binary -O elf64-littleriscv   -B riscv
  # GCC Build Flag for included header file list generation
  DEFINE GCC_DEPS_FLAGS              = -MMD -MF [email protected]
  
--DEFINE GCC48_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
-+DEFINE GCC48_ALL_CC_FLAGS            = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-stack-protector -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
+-DEFINE GCC48_ALL_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -ffunction-sections -fdata-sections -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
++DEFINE GCC48_ALL_CC_FLAGS            = DEF(GCC_ALL_CC_FLAGS) -ffunction-sections -fdata-sections -fno-stack-protector -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
  DEFINE GCC48_IA32_X64_DLINK_COMMON   = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20
 -DEFINE GCC48_IA32_CC_FLAGS           = DEF(GCC48_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables -Wno-address
 -DEFINE GCC48_X64_CC_FLAGS            = DEF(GCC48_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables -Wno-address
@@ -32,7 +32,7 @@ index 2b17d3b297..4cd2567c2a 100755
  DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
  DEFINE GCC48_IA32_X64_DLINK_FLAGS    = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive
  DEFINE GCC48_IA32_DLINK2_FLAGS       = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(GCC_DLINK2_FLAGS_COMMON)
-@@ -1962,7 +1962,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS        = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF
+@@ -1964,7 +1964,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS        = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF
  DEFINE GCC48_ASM_FLAGS               = DEF(GCC_ASM_FLAGS)
  DEFINE GCC48_ARM_ASM_FLAGS           = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
  DEFINE GCC48_AARCH64_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
@@ -42,5 +42,5 @@ index 2b17d3b297..4cd2567c2a 100755
  DEFINE GCC48_AARCH64_CC_FLAGS        = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS)
  DEFINE GCC48_AARCH64_CC_XIPFLAGS     = DEF(GCC_AARCH64_CC_XIPFLAGS)
 -- 
-2.24.0
+2.28.0
 
meta/recipes-core/ovmf/ovmf_git.bb +3 -3
index 91c1b6ba14..088e348bdc 100644
@@ -16,11 +16,11 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
            file://0001-ovmf-update-path-to-native-BaseTools.patch \
            file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
            file://0003-ovmf-enable-long-path-file.patch \
-           file://0001-ovmf-Update-to-latest.patch \
+           file://0004-ovmf-Update-to-latest.patch \
         "
 
-PV = "edk2-stable202005"
-SRCREV = "ca407c7246bf405da6d9b1b9d93e5e7f17b4b1f9"
+PV = "edk2-stable202008"
+SRCREV = "06dc822d045c2bb42e497487935485302486e151"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
 
 inherit deploy
Signature · 1 line
2.25.1
#25 lore raw

PATCH 25/25 reproducible.py: add quilt-ptest and valgrind-ptest

In reply to Steve Sakoman

Both don't seem to be reproducible with fedora 33

---
 meta/lib/oeqa/selftest/cases/reproducible.py | 2 ++
 1 file changed, 2 insertions(+)
meta/lib/oeqa/selftest/cases/reproducible.py +2 -0
index f5e3bff5a4..0e44ce4dbf 100644
@@ -54,12 +54,14 @@ exclude_packages = [
 	'piglit',
 	'pybootchartgui',
 	'qemu',
+	'quilt-ptest',
 	"rpm",
 	'rsync',
 	'ruby',
 	'stress-ng',
 	'systemd-bootchart',
 	'systemtap',
+	'valgrind-ptest',
 	'vim',
 	'webkitgtk',
 	]
Signature · 1 line
2.25.1