Re: [OE-core] The state of DKMS in the Yocto community

[Khem Raj]

On Mon, Dec 13, 2021 at 4:28 AM Alex Stewart  wrote:
>
> On 12/11/21 09:24, Bruce Ashfield wrote:
> > On Fri, Dec 10, 2021 at 3:58 PM Alex Stewart  wrote:
> >> Hey List,
> >>
> >> I'm trying to work out the mysterious state of DKMS in OE-Core.
> >>
> >> Our (NI) OE distributions rely heavily on DKMS to (un)install our
> >> ecosystem of kernel drivers at runtime across our product lines. To
> >> facilitate that, we authored a dkms_2.4.0.bb recipe [1] back in 2017,
> >> which we have carried out-of-stream since.
> >>
> >> We tried to upstream it, and the patched rev'ed a couple of times [2];
> >> but it seems to have never made it into a yocto release.
> >>
> >> Though some other recipes mention DKMS passingly, I don't see anywhere
> >> that OE-Core officially supports it. Nor does my googling reveal anyone
> >> else who uses DKMS. I find that a little hard to believe, though I
> >> understand that it's probably relatively rare in the embedded space.
> >>
> >>
> >> @all
> >> So does anyone else on the list use DKMS in their yocto distribution?
> >> Are you maintaining a DKMS recipe out-of-stream as well?
> >>
> >>
> >> @maintainers
> >> If NI upgraded our DKMS recipe to a more recent version than 2.4.0 and
> >> submitted it again to OE-Core, would you accept it? If not, we will move
> >> it to our own meta layer and accept that we are unique in this regard.
> > I used to have a DKMS recipe myself (at my previous employer), but
> > never submitted it, because generally speaking, there are better ways
> > to do things in OE.
> >
> > DKMS tends to avoid proper cross compilation (which of course we
> > already do), or is often used to distribute proprietary code (which we
> > don't want to encourage), or is avoiding the need to upstream the
> > module code (which we also don't want to encourage).  It also only
> > tends to be used on a subset of the architectures that have enough
> > memory/cpu to build on target, so by definition it is a bit more
> > niche.
>
> Yeah; I agree. In our case, we have several dozen drivers split across
> many product teams and largely distributing internally-controlled
> source. At this stage, it isn't feasible for us to build them all within
> OE - which is unfortunate.
>
> Many of those drivers are also required to support both our OE
> distribution, as well as a small matrix of supported generic Linux
> desktop OSes. So having them manage their own DKMS packages reduces the
> surface area for packaging errors.
>
> I don't expect that either of those considerations is common in the OE
> community.
>
> > We of course already have the ability to build modules on the target
> > (we have a test case in core that does just that), so what is in core
> > can support what DKMS needs to build on target.
>
> I'm not sure which test case you're referencing, do you have a link or
> could you expand on what you mean?
>
> > I don't see this as something that makes sense in oe-core (but maybe
> > I'm not fully understanding the case, and where the current support is
> > failing), but could of course be contributed to another layer.
>
> That's fair. Our use case is motivated more by an organizational failure
> than a failure of the OE tooling.
>
>
> @Khem
> You're maintaining the meta-oe layer; correct? Do you have any interest
> in a DKMS recipe?

I cant say how much maintenance work it is upfront. I have been bitten with some
hairy recipes e.g. kernel-selftest which need active maintenance for
which I might not
have time to do myself. However, looking at what Bruce explains, it
seems the value
add it not as much either, so I am less inclined to have it unless
there are others in
community who will find it useful and service it timely manner and
test it, keep it working
with all test combinations etc

>
> Thanks,
>
> --
> Alex Stewart
> Software Engineer - NI Real-Time OS
> NI (National Instruments)
>
> alex.stew...@ni.com
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159681): 
https://lists.openembedded.org/g/openembedded-core/message/159681
Mute This Topic: https://lists.openembedded.org/mt/87645999/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH v2] libcap: upgrade 2.61 -> 2.62

[wangmy]

Replace BUILD_GPERF with USE_GPERF since it is now reserved.

Signed-off-by: Wang Mingyu 
---
 .../recipes-support/libcap/{libcap_2.61.bb => libcap_2.62.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libcap/{libcap_2.61.bb => libcap_2.62.bb} (95%)

diff --git a/meta/recipes-support/libcap/libcap_2.61.bb 
b/meta/recipes-support/libcap/libcap_2.62.bb
similarity index 95%
rename from meta/recipes-support/libcap/libcap_2.61.bb
rename to meta/recipes-support/libcap/libcap_2.62.bb
index a3a6e10b89..e08cac7218 100644
--- a/meta/recipes-support/libcap/libcap_2.61.bb
+++ b/meta/recipes-support/libcap/libcap_2.62.bb
@@ -16,7 +16,7 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
 SRC_URI:append:class-nativesdk = " \

file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \
"
-SRC_URI[sha256sum] = 
"c1e29680f8bcc51b172e9a8eb9a7a4d7255a00a14301a7c2cf96d1febf7449a5"
+SRC_URI[sha256sum] = 
"190c5baac9bee06a129eae20d3e827de62f664fe3507f0bf6c50a9a59fbd83a2"
 
 UPSTREAM_CHECK_URI = 
"https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/;
 
@@ -32,7 +32,7 @@ EXTRA_OEMAKE = " \
   lib='${baselib}' \
   RAISE_SETFCAP=no \
   DYNAMIC=yes \
-  BUILD_GPERF=yes \
+  USE_GPERF=yes \
 "
 
 EXTRA_OEMAKE:append:class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}"
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159680): 
https://lists.openembedded.org/g/openembedded-core/message/159680
Mute This Topic: https://lists.openembedded.org/mt/87714767/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 17/17] license.bbclass: implement ast.NodeVisitor.visit_Constant

[Anuj Mittal]

From: Ross Burton 

Since Python 3.8 visit_Num(), visit_Str() and so on are all deprecated
and replaced with visit_Constant.  We can't yet remove the deprecated
functions until we require 3.8, but we can implement visit_Constant to
silence the deprecation warnings.

Signed-off-by: Ross Burton 
Signed-off-by: Anuj Mittal 
---
 meta/classes/license.bbclass | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 45d912741d..7a34e185c7 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -145,6 +145,10 @@ def find_license_files(d):
 find_license(node.s.replace("+", "").replace("*", ""))
 self.generic_visit(node)
 
+def visit_Constant(self, node):
+find_license(node.value.replace("+", "").replace("*", ""))
+self.generic_visit(node)
+
 def find_license(license_type):
 try:
 bb.utils.mkdirhier(gen_lic_dest)
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159679): 
https://lists.openembedded.org/g/openembedded-core/message/159679
Mute This Topic: https://lists.openembedded.org/mt/87712557/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 16/17] oe/license: implement ast.NodeVisitor.visit_Constant

[Anuj Mittal]

From: Ross Burton 

Since Python 3.8 visit_Num(), visit_Str() and so on are all deprecated
and replaced with visit_Constant.  We can't yet remove the deprecated
functions until we require 3.8, but we can implement visit_Constant to
silence the deprecation warnings.

Signed-off-by: Ross Burton 
Signed-off-by: Anuj Mittal 
---
 meta/lib/oe/license.py | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py
index 665d32ecbb..b5d378a549 100644
--- a/meta/lib/oe/license.py
+++ b/meta/lib/oe/license.py
@@ -74,6 +74,9 @@ class FlattenVisitor(LicenseVisitor):
 def visit_Str(self, node):
 self.licenses.append(node.s)
 
+def visit_Constant(self, node):
+self.licenses.append(node.value)
+
 def visit_BinOp(self, node):
 if isinstance(node.op, ast.BitOr):
 left = FlattenVisitor(self.choose_licenses)
@@ -227,6 +230,9 @@ class ListVisitor(LicenseVisitor):
 def visit_Str(self, node):
 self.licenses.add(node.s)
 
+def visit_Constant(self, node):
+self.licenses.add(node.value)
+
 def list_licenses(licensestr):
 """Simply get a list of all licenses mentioned in a license string.
Binary operators are not applied or taken into account in any way"""
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159678): 
https://lists.openembedded.org/g/openembedded-core/message/159678
Mute This Topic: https://lists.openembedded.org/mt/87712556/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 15/17] packagedata.py: silence a DeprecationWarning

[Anuj Mittal]

From: Mingli Yu 

Use regex strings (r’’) to silence below deprecation warning [1]:
 $ cat 
tmp/work/intel_x86_64-wrs-linux/linux-yocto/5.10.x+gitAUTOINC+917c420111_373c02c3ca-r0/temp/log.do_deploy
 [snip]
 /build/layers/oe-core/meta/lib/oe/packagedata.py:22: DeprecationWarning: 
invalid escape sequence \s
 r = re.compile("(^.+?):\s+(.*)")
 [snip]

[1] https://docs.python.org/3/library/re.html

Signed-off-by: Mingli Yu 
Signed-off-by: Anuj Mittal 
---
 meta/lib/oe/packagedata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index 02c81e5a52..212f048bc6 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -19,7 +19,7 @@ def read_pkgdatafile(fn):
 import re
 with open(fn, 'r') as f:
 lines = f.readlines()
-r = re.compile("(^.+?):\s+(.*)")
+r = re.compile(r"(^.+?):\s+(.*)")
 for l in lines:
 m = r.match(l)
 if m:
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159677): 
https://lists.openembedded.org/g/openembedded-core/message/159677
Mute This Topic: https://lists.openembedded.org/mt/87712555/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 14/17] uboot-sign: fix the concatenation when multiple U-BOOT configurations are specified

[Anuj Mittal]

From: Thomas Perrot 

Some BSPs, especially those of meta-freescale and meta-ti allow to build U-Boot
binaries using different configuration for a given target, for example:
- UBOOT_CONFIG ??= "tfa-secure-boot tfa"
- UBOOT_CONFIG ??= "nand sdcard spi nor"

When this is the case the public key wasn't concatenated to all U-Boot binaries
built.

Signed-off-by: Thomas Perrot 
Signed-off-by: Alexandre Belloni 
(cherry picked from commit dfd71ae3d102f3010c6117d774e9739a322930f6)
Signed-off-by: Anuj Mittal 
---
 meta/classes/uboot-sign.bbclass | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index fdf153248c..c39b30f43b 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -131,6 +131,20 @@ concat_dtb_helper() {
elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e 
"$deployed_uboot_dtb_binary" ]; then
cd ${DEPLOYDIR}
cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | 
tee ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
+
+   if [ -n "${UBOOT_CONFIG}" ]
+   then
+   for config in ${UBOOT_MACHINE}; do
+   i=$(expr $i + 1);
+   for type in ${UBOOT_CONFIG}; do
+   j=$(expr $j + 1);
+   if [ $j -eq $i ]
+   then
+   cp ${UBOOT_IMAGE} 
${B}/${CONFIG_B_PATH}/u-boot-$type.${UBOOT_SUFFIX}
+   fi
+   done
+   done
+   fi
else
bbwarn "Failure while adding public key to u-boot 
binary. Verified boot won't be available."
fi
@@ -205,7 +219,7 @@ install_helper() {
fi
 }
 
-# Install SPL dtb and u-boot nodtb to datadir, 
+# Install SPL dtb and u-boot nodtb to datadir,
 install_spl_helper() {
if [ -f "${SPL_DIR}/${SPL_DTB_BINARY}" ]; then
install -Dm 0644 ${SPL_DIR}/${SPL_DTB_BINARY} 
${D}${datadir}/${SPL_DTB_IMAGE}
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159676): 
https://lists.openembedded.org/g/openembedded-core/message/159676
Mute This Topic: https://lists.openembedded.org/mt/87712553/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 06/17] linux-yocto/5.10: update to v5.10.82

[Anuj Mittal]

From: Bruce Ashfield 

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

d5259a9ba699 Linux 5.10.82
d35250ec5a23 Revert "perf: Rework perf_event_exit_event()"
6718f79c40fd ALSA: hda: hdac_stream: fix potential locking issue in 
snd_hdac_stream_assign()
f751fb54f2bc ALSA: hda: hdac_ext_stream: fix potential locking issues
b3ef5051a758 x86/Kconfig: Fix an unused variable error in dell-smm-hwmon
2ec78af152e9 btrfs: update device path inode time instead of bd_inode
9febc9d8d2b4 fs: export an inode_update_time helper
cade5d7a2803 ice: Delete always true check of PF pointer
fe65cecd2758 usb: max-3421: Use driver data instead of maintaining a list of 
bound devices
6186c7b9bdfc ASoC: DAPM: Cover regression by kctl change notification fix
b17dd53cac76 selinux: fix NULL-pointer dereference when hashtab allocation fails
1ae0d59c4f5e RDMA/netlink: Add __maybe_unused to static inline in C file
40bc831ab5f6 hugetlbfs: flush TLBs correctly after huge_pmd_unshare
86ab0f8ff008 scsi: ufs: core: Fix task management completion timeout race
ddd4e46cff40 scsi: ufs: core: Fix task management completion
04c586a601dc drm/amdgpu: fix set scaling mode Full/Full aspect/Center not works 
on vga and dvi connectors
47901b77bf7d drm/i915/dp: Ensure sink rate values are always valid
82de15ca6b55 drm/nouveau: clean up all clients on device removal
c81c90fbf577 drm/nouveau: use drm_dev_unplug() during device removal
9221aff33edb drm/nouveau: Add a dedicated mutex for the clients list
65517975cb19 drm/udl: fix control-message timeout
3d68d6ee8314 drm/amd/display: Update swizzle mode enums
7b97b5776daa cfg80211: call cfg80211_stop_ap when switch from P2P_GO type
1ab297809de8 parisc/sticon: fix reverse colors
6adbc07ebcaf btrfs: fix memory ordering between normal and ordered work 
functions
6289b494b38e net: stmmac: socfpga: add runtime suspend/resume callback for 
stratix10 platform
5875f87e2fc9 udf: Fix crash after seekdir
6b43cf113a38 KVM: nVMX: don't use vcpu->arch.efer when checking host state on 
nested state load
cc73242889b5 block: Check ADMIN before NICE for IOPRIO_CLASS_RT
63e2f34abc22 s390/kexec: fix memory leak of ipl report buffer
b1cf0d2fc4e4 scsi: qla2xxx: Fix mailbox direction flags in 
qla2xxx_get_adapter_id()
08fd6df8eaaf powerpc/8xx: Fix pinned TLBs with CONFIG_STRICT_KERNEL_RWX
9c177eee116c x86/hyperv: Fix NULL deref in set_hv_tscchange_cb() if Hyper-V 
setup fails
b2e2fb64071a mm: kmemleak: slob: respect SLAB_NOLEAKTRACE flag
99032adf7d4b ipc: WARN if trying to remove ipc object which is absent
a7d91625863d tipc: check for null after calling kmemdup
f5995fcb75eb hexagon: clean up timer-regs.h
0854c9ff2151 hexagon: export raw I/O routines for modules
528971af64fc tun: fix bonding active backup with arp monitoring
af1d3c437eb5 arm64: vdso32: suppress error message for 'make mrproper'
97653ba562b9 net: stmmac: dwmac-rk: Fix ethernet on rk3399 based devices
4cebe23c032b s390/kexec: fix return code handling
d4fb80ae9830 perf/x86/intel/uncore: Fix IIO event constraints for Skylake Server
175135a5eacf perf/x86/intel/uncore: Fix filter_tid mask for CHA events on 
Skylake Server
84f64c7c52d6 pinctrl: qcom: sdm845: Enable dual edge errata
a8230fb74b54 KVM: PPC: Book3S HV: Use GLOBAL_TOC for kvmppc_h_set_dabr/xdabr()
4e6cce20fbc0 e100: fix device suspend/resume
34e54703fb0f NFC: add NCI_UNREG flag to eliminate the race
b2a60b4a0195 net: nfc: nci: Change the NCI close sequence
73a0d12114b4 NFC: reorder the logic in nfc_{un,}register_device
cb14b196d991 NFC: reorganize the functions in nci_request
41dc8dcb49d5 i40e: Fix display error code in dmesg
028ea7b090ec i40e: Fix creation of first queue by omitting it if is not power 
of two
69868d7a8853 i40e: Fix warning message and call stack during rmmod i40e driver
20645482d159 i40e: Fix ping is lost after configuring ADq on VF
6d64743045ca i40e: Fix changing previously set num_queue_pairs for PFs
f866513ead43 i40e: Fix NULL ptr dereference on VSI filter sync
071948856587 i40e: Fix correct max_pkt_size on VF RX queue
8e6bae950da9 net: virtio_net_hdr_to_skb: count transport header in UFO
1c4099dc0d6a net: dpaa2-eth: fix use-after-free in dpaa2_eth_remove
381a30f7e31c net: sched: act_mirred: drop dst for the direction from egress to 
ingress
a792e0128d23 scsi: core: sysfs: Fix hang when device state is set via sysfs
4b4302a02b7f net/mlx5: E-Switch, return error if encap isn't supported
68748ea4d122 net/mlx5: E-Switch, Change mode lock from mutex to rw semaphore
6190e1a2d41a net/mlx5: Lag, update tracker when state change event received
471c49289055 net/mlx5e: nullify cq->dbg pointer in mlx5_debug_cq_remove()
d1f8f1e04a61 platform/x86: hp_accel: Fix an error handling path in 
'lis3lv02d_probe()'
da16f907cb30 mips: lantiq: add support for clk_get_parent()
17dfbe1b2f4e mips: bcm63xx: add support for clk_get_parent()
34284b3a2f86 MIPS: generic/yamon-dt: fix uninitialized variable error
a61f90b2162d iavf: Fix for setting queues to 0
a8a1e601c2ea 

[OE-core] [honister][PATCH 13/17] cve-extra-exclusions: add db CVEs to exclusion list

[Anuj Mittal]

From: Steve Sakoman 

Since Oracle relicensed bdb, the open source community is slowly but surely 
replacing bdb with
supported and open source friendly alternatives. As a result these CVEs are 
unlikely to ever be fixed.

Signed-off-by: Steve Sakoman 
Signed-off-by: Richard Purdie 
(cherry picked from commit 679fc70f907fb221f4541ebf30c1610e937209b7)
Signed-off-by: Anuj Mittal 
---
 meta/conf/distro/include/cve-extra-exclusions.inc | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/cve-extra-exclusions.inc 
b/meta/conf/distro/include/cve-extra-exclusions.inc
index a6f52b5de7..e02a4d1fde 100644
--- a/meta/conf/distro/include/cve-extra-exclusions.inc
+++ b/meta/conf/distro/include/cve-extra-exclusions.inc
@@ -44,7 +44,14 @@ CVE_CHECK_WHITELIST += "CVE-2010-4756"
 # exposing this interface in an exploitable way
 CVE_CHECK_WHITELIST += "CVE-2020-29509 CVE-2020-29511"
 
-
+# db
+# Since Oracle relicensed bdb, the open source community is slowly but surely 
replacing bdb with
+# supported and open source friendly alternatives. As a result these CVEs are 
unlikely to ever be fixed.
+CVE_CHECK_WHITELIST += "CVE-2015-2583 CVE-2015-2624 CVE-2015-2626 
CVE-2015-2640 CVE-2015-2654 \
+CVE-2015-2656 CVE-2015-4754 CVE-2015-4764 CVE-2015-4774 CVE-2015-4775 
CVE-2015-4776 CVE-2015-4777 \
+CVE-2015-4778 CVE-2015-4779 CVE-2015-4780 CVE-2015-4781 CVE-2015-4782 
CVE-2015-4783 CVE-2015-4784 \
+CVE-2015-4785 CVE-2015-4786 CVE-2015-4787 CVE-2015-4788 CVE-2015-4789 
CVE-2015-4790 CVE-2016-0682 \
+CVE-2016-0689 CVE-2016-0692 CVE-2016-0694 CVE-2016-3418 CVE-2020-2981"
 
  CPE update pending 
 
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159675): 
https://lists.openembedded.org/g/openembedded-core/message/159675
Mute This Topic: https://lists.openembedded.org/mt/87712552/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 12/17] runqemu: check the qemu PID has been set before kill()ing it

[Anuj Mittal]

From: Ross Burton 

If runqemu is killed, check that we have a valid PID for the qemu before
sending a kill() to it.

[ YOCTO #14651 ]

Signed-off-by: Ross Burton 
Signed-off-by: Richard Purdie 
(cherry picked from commit 0f3afbd3a6a6bef668612f818517df7543c0a683)
Signed-off-by: Anuj Mittal 
---
 scripts/runqemu | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index c467b0eb19..66e035c9af 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1580,7 +1580,8 @@ def main():
 
 def sigterm_handler(signum, frame):
 logger.info("SIGTERM received")
-os.kill(config.qemupid, signal.SIGTERM)
+if config.qemupid:
+os.kill(config.qemupid, signal.SIGTERM)
 config.cleanup()
 # Deliberately ignore the return code of 'tput smam'.
 subprocess.call(["tput", "smam"])
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159674): 
https://lists.openembedded.org/g/openembedded-core/message/159674
Mute This Topic: https://lists.openembedded.org/mt/87712550/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 11/17] selftest/devtool: Check branch in git fetch

[Anuj Mittal]

From: Stefan Herbrechtsmeier 

The commit 'meta/scripts: Manual git url branch additions (dc53fe75cc)'
forget the url branch= parameter in the devtool git fetch test.

Signed-off-by: Stefan Herbrechtsmeier 
Signed-off-by: Richard Purdie 
(cherry picked from commit 1419168a58a5caf99e24ada08c9ab639344a78b4)
Signed-off-by: Anuj Mittal 
---
 meta/lib/oeqa/selftest/cases/devtool.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index d2b31af80e..a2b4d7f7d1 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -442,6 +442,7 @@ class DevtoolAddTests(DevtoolBase):
 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
 self.track_for_cleanup(tempdir)
 url = 'gitsm://git.yoctoproject.org/mraa'
+url_branch = '%s;branch=master' % url
 checkrev = 'ae127b19a50aa54255e4330ccfdd9a5d058e581d'
 testrecipe = 'mraa'
 srcdir = os.path.join(tempdir, testrecipe)
@@ -462,7 +463,7 @@ class DevtoolAddTests(DevtoolBase):
 checkvars = {}
 checkvars['S'] = '${WORKDIR}/git'
 checkvars['PV'] = '1.0+git${SRCPV}'
-checkvars['SRC_URI'] = url
+checkvars['SRC_URI'] = url_branch
 checkvars['SRCREV'] = '${AUTOREV}'
 self._test_recipe_contents(recipefile, checkvars, [])
 # Try with revision and version specified
@@ -481,7 +482,7 @@ class DevtoolAddTests(DevtoolBase):
 checkvars = {}
 checkvars['S'] = '${WORKDIR}/git'
 checkvars['PV'] = '1.5+git${SRCPV}'
-checkvars['SRC_URI'] = url
+checkvars['SRC_URI'] = url_branch
 checkvars['SRCREV'] = checkrev
 self._test_recipe_contents(recipefile, checkvars, [])
 
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159673): 
https://lists.openembedded.org/g/openembedded-core/message/159673
Mute This Topic: https://lists.openembedded.org/mt/87712549/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 10/17] recipetool: Set master branch only as fallback

[Anuj Mittal]

From: Stefan Herbrechtsmeier 

The commit 'meta/scripts: Manual git url branch additions (dc53fe75cc)'
sets the branch= parameter too early to master and thereby breaks the
-B/--srcbranch option.

ERROR: branch= parameter and -B/--srcbranch option cannot both be specified - 
use one or the other

Signed-off-by: Stefan Herbrechtsmeier 
Signed-off-by: Richard Purdie 
(cherry picked from commit 34ece8030e7a6a100b5e3e7b94e6c786c0e199a6)
Signed-off-by: Anuj Mittal 
---
 scripts/lib/recipetool/create.py | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index dbd118123b..63e7f0658b 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -389,9 +389,6 @@ def reformat_git_uri(uri):
 parms.update({('protocol', 'ssh')})
 elif (scheme == "http" or scheme == 'https' or scheme == 'ssh') and 
not ('protocol' in parms):
 parms.update({('protocol', scheme)})
-# We assume 'master' branch if not set
-if not 'branch' in parms:
-parms.update({('branch', 'master')})
 # Always append 'git://'
 fUrl = bb.fetch2.encodeurl(('git', host, path, user, pswd, parms))
 return fUrl
@@ -481,6 +478,9 @@ def create_recipe(args):
 storeTagName = params['tag']
 params['nobranch'] = '1'
 del params['tag']
+# Assume 'master' branch if not set
+if scheme in ['git', 'gitsm'] and 'branch' not in params and 
'nobranch' not in params:
+params['branch'] = 'master'
 fetchuri = bb.fetch2.encodeurl((scheme, network, path, user, passwd, 
params))
 
 tmpparent = tinfoil.config_data.getVar('BASE_WORKDIR')
@@ -530,10 +530,9 @@ def create_recipe(args):
 # Remove HEAD reference point and drop remote prefix
 get_branch = [x.split('/', 1)[1] for x in get_branch if not 
x.startswith('origin/HEAD')]
 if 'master' in get_branch:
-# If it is master, we do not need to append 'branch=master' as 
this is default.
 # Even with the case where get_branch has multiple objects, if 
'master' is one
 # of them, we should default take from 'master'
-srcbranch = ''
+srcbranch = 'master'
 elif len(get_branch) == 1:
 # If 'master' isn't in get_branch and get_branch contains only 
ONE object, then store result into 'srcbranch'
 srcbranch = get_branch[0]
@@ -546,8 +545,8 @@ def create_recipe(args):
 # Since we might have a value in srcbranch, we need to
 # recontruct the srcuri to include 'branch' in params.
 scheme, network, path, user, passwd, params = 
bb.fetch2.decodeurl(srcuri)
-if srcbranch:
-params['branch'] = srcbranch
+if scheme in ['git', 'gitsm']:
+params['branch'] = srcbranch or 'master'
 
 if storeTagName and scheme in ['git', 'gitsm']:
 # Check srcrev using tag and check validity of the tag
@@ -606,7 +605,7 @@ def create_recipe(args):
 splitline = line.split()
 if len(splitline) > 1:
 if splitline[0] == 'origin' and 
scriptutils.is_src_url(splitline[1]):
-srcuri = reformat_git_uri(splitline[1])
+srcuri = reformat_git_uri(splitline[1]) + 
';branch=master'
 srcsubdir = 'git'
 break
 
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159672): 
https://lists.openembedded.org/g/openembedded-core/message/159672
Mute This Topic: https://lists.openembedded.org/mt/87712548/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 09/17] kern-tools: bug fixes and kgit-gconfig

[Anuj Mittal]

From: Bruce Ashfield 

Bumping yocto-kernel-tools to version v0.3, which comprises the following 
commits:

90598a5 tools: Makefile: add missing install file
330f9fa kgit-config: fix file mode
22b55cd kgit-config: cleanup error message
1e2a233 kgit-config: fix the "not found" message
e7fcb9a kgit-config: trim trailing whitespace
3cd14ce kgit-config: BSP template and auto meta-data creation
e56620c tools: introduce kgit-config
969b888 buckets: update to v5.14+
d220b06 Kconfiglib: add support for bare 'modules' keyword

Signed-off-by: Bruce Ashfield 
Signed-off-by: Richard Purdie 
(cherry picked from commit 88439875530bf36e301dbba12de5cf0dc664ba51)
Signed-off-by: Anuj Mittal 
---
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb 
b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index ef035aed23..95983fe69b 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = 
"file://tools/kgit;beginline=5;endline=9;md5=9c30e971d435e249
 
 DEPENDS = "git-native"
 
-SRCREV = "d220b063852245fdd16b9731a395ace525f932d6"
-PR = "r12"
-PV = "0.2+git${SRCPV}"
+SRCREV = "90598a5fae1172e3f7782a1b02f7b7518efd32c8"
+PV = "0.3+git${SRCPV}"
 
 inherit native
 
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159671): 
https://lists.openembedded.org/g/openembedded-core/message/159671
Mute This Topic: https://lists.openembedded.org/mt/87712547/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 08/17] gcc: Add CVE-2021-37322 to the list of CVEs to ignore

[Anuj Mittal]

From: Richard Purdie 

The CVE applies to binutils 2.26 and not to gcc so ignore there.

Signed-off-by: Richard Purdie 
(cherry picked from commit fea2726663a3db03170c49fceaffc632c509aeea)
Signed-off-by: Anuj Mittal 
---
 meta/recipes-devtools/gcc/gcc-11.2.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-devtools/gcc/gcc-11.2.inc 
b/meta/recipes-devtools/gcc/gcc-11.2.inc
index 9fd30f52a8..cd1b022ff2 100644
--- a/meta/recipes-devtools/gcc/gcc-11.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-11.2.inc
@@ -117,3 +117,6 @@ EXTRA_OECONF_PATHS = "\
 --with-sysroot=/not/exist \
 --with-build-sysroot=${STAGING_DIR_TARGET} \
 "
+
+# Is a binutils 2.26 issue, not gcc
+CVE_CHECK_WHITELIST += "CVE-2021-37322"
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159670): 
https://lists.openembedded.org/g/openembedded-core/message/159670
Mute This Topic: https://lists.openembedded.org/mt/87712546/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 07/17] linux-yocto-rt/5.10: update to -rt56

[Anuj Mittal]

From: Bruce Ashfield 

Integrating the following commit(s) to linux-yocto-rt/5.10:

23f3ad608bc7 rcutorture: fixup merge from standard/base -stable
8612be3f3e2b Revert "rcutorture: Avoid problematic critical section nesting on 
RT"
9a6fb5667ac8 Linux 5.10.78-rt56
78c80dca8b1f irq_work: Also rcuwait for !IRQ_WORK_HARD_IRQ on PREEMPT_RT
e91d3b98e3b3 irq_work: Handle some irq_work in a per-CPU thread on PREEMPT_RT
bded6a156d4e irq_work: Allow irq_work_sync() to sleep if irq_work() no IRQ 
support.
747c881d3348 drm/i915/gt: Queue and wait for the irq_work item.
fa4ef0011e58 locking: Drop might_resched() from might_sleep_no_state_check()
f44d86bc5923 fscache: Use only one fscache_object_cong_wait.
2da5bc42a911 fscache: Use only one fscache_object_cong_wait.
53ecacfc9c68 mm: Disable NUMA_BALANCING_DEFAULT_ENABLED and 
TRANSPARENT_HUGEPAGE on PREEMPT_RT
03bdef3c5563 preempt: Move preempt_enable_no_resched() to the RT block
0def39751031 sched: Switch wait_task_inactive to HRTIMER_MODE_REL_HARD
60df07c6bd86 sched: Fix get_push_task() vs migrate_disable()
27f8594efeac mm, zsmalloc: Convert zsmalloc_handle.lock to spinlock_t
3fcbcd86a8eb Linux 5.10.78-rt55

Signed-off-by: Bruce Ashfield 
Signed-off-by: Richard Purdie 
(cherry picked from commit 29f8c47f1d61eb702bd9af72e81708ca66ca9c09)
Signed-off-by: Anuj Mittal 
---
 meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb   | 4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_5.10.bb  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb 
b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 977856376c..47f8ff27ee 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -11,8 +11,8 @@ python () {
 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to 
linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "d007a2fd6964323f58564a7362cb0293bc69c5bf"
-SRCREV_meta ?= "e2f792a996eb4ace257b7dd12d3890ce504741c3"
+SRCREV_machine ?= "23f3ad608bc75fc89f49a533ac4e5ed8deaa33b0"
+SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3"
 
 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.10;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb 
b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index d1309861d9..d9bec45691 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine:qemuarm ?= "01f85f09232df2aa45edd757150cb03e35f41f3b"
 SRCREV_machine ?= "f0a0ddc2f355d02a706454137d3dab7889fcf4d1"
-SRCREV_meta ?= "e2f792a996eb4ace257b7dd12d3890ce504741c3"
+SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb 
b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index c007768dc0..63d7670f80 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= 
"1bb9d730ac6630d3f41c2ef529fab09f12bcf07d"
 SRCREV_machine:qemux86-64 ?= "1bb9d730ac6630d3f41c2ef529fab09f12bcf07d"
 SRCREV_machine:qemumips64 ?= "690b09d3a24bafeff32bb06a72643be0c8fae9a7"
 SRCREV_machine ?= "1bb9d730ac6630d3f41c2ef529fab09f12bcf07d"
-SRCREV_meta ?= "e2f792a996eb4ace257b7dd12d3890ce504741c3"
+SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3"
 
 # remap qemuarm to qemuarma15 for the 5.8 kernel
 # KMACHINE:qemuarm ?= "qemuarma15"
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159669): 
https://lists.openembedded.org/g/openembedded-core/message/159669
Mute This Topic: https://lists.openembedded.org/mt/87712545/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 05/17] linux-yocto/5.14: update to v5.14.21

[Anuj Mittal]

From: Bruce Ashfield 

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

545728d9e085 Linux 5.14.21
999805aaf925 Revert "ACPI: scan: Release PM resources blocked by unused objects"
0750f769b958 thermal: Fix NULL pointer dereferences in of_thermal_ functions
50812034d105 perf/core: Avoid put_page() when GUP fails
ae2afdf82a00 PCI: Add MSI masking quirk for Nvidia ION AHCI
18c55aed17b2 PCI/MSI: Deal with devices lying about their MSI mask capability
f64af1735731 PCI/MSI: Destroy sysfs before freeing entries
f41389affe96 parisc/entry: fix trace test in syscall exit path
56249b445477 Bluetooth: btusb: Add support for TP-Link UB500 Adapter
dbaa485bc5a1 bootconfig: init: Fix memblock leak in xbc_make_cmdline()
6bb162d35d74 loop: Use blk_validate_block_size() to validate block size
e2d865b3109c block: Add a helper to validate the block size
5b9f31a3be76 fortify: Explicitly disable Clang support
87304542f264 KVM: Fix steal time asm constraints
02eafa8f1558 Revert "drm: fb_helper: fix CONFIG_FB dependency"
bd462930f7e5 Revert "drm: fb_helper: improve CONFIG_FB dependency"
ff7124b91f52 Linux 5.14.20
1b86960dc451 Revert "x86: Fix get_wchan() to support the ORC unwinder"
961913f45ff6 Revert "sched: Add wrapper for get_wchan() to keep task blocked"
b51c1a592faa Revert "x86: Fix __get_wchan() for !STACKTRACE"
0e62c60b3e7e Linux 5.14.19
c6d58e3e55f5 media: videobuf2-dma-sg: Fix buf->vb NULL pointer dereference
283fd7d9fdea media: videobuf2: always set buffer vb2 pointer
6a1968a2f2f6 x86/sev: Make the #VC exception stacks part of the default stacks 
storage
8c57c9ff7e88 x86/sev: Add an x86 version of cc_platform_has()
0e1cd02ff0d8 arch/cc: Introduce a function to check for confidential computing 
features
45a47382941d IMA: reject unknown hash algorithms in ima_get_hash_algo
a3c6e358fbe4 selftests/bpf: Fix also no-alu32 strobemeta selftest
49ed44184d0c selftests/x86/iopl: Adjust to the faked iopl CLI/STI usage
35207858385e mmc: moxart: Fix null pointer dereference on pointer host
c254f7893bc1 ath10k: fix invalid dma_addr_t token assignment
733aac9beea8 cifs: fix memory leak of smb3_fs_context_dup::server_hostname
4f2bf4fe6c0d media: vidtv: move kfree(dvb) to vidtv_bridge_dev_release()
af09862cb566 drm/amd/display: Look at firmware version to determine using dmub 
on dcn21
697103ad736a pinctrl: amd: Handle wake-up interrupt
03e1b25d4079 pinctrl: amd: Add irq field data
f80264b897b2 SUNRPC: Partial revert of commit 6f9f17287e78
7a914508ca2f PCI: aardvark: Fix PCIe Max Payload Size setting
f12fbf40bf63 PCI: Add PCI_EXP_DEVCTL_PAYLOAD_* macros
7005ee54fc09 drm/sun4i: Fix macros in sun8i_csc.h
a595cc219051 powerpc/85xx: fix timebase sync issue when CONFIG_HOTPLUG_CPU=n
0a6412029f7e powerpc/pseries/mobility: ignore ibm, platform-facilities updates
baf19ea102c3 powerpc/64s/interrupt: Fix check_return_regs_valid() false positive
251959e47018 powerpc/security: Use a mutex for interrupt exit code patching
0795f5e71d1d powerpc/powernv/prd: Unregister OPAL_MSG_PRD2 notifier during 
module unload
36859829b783 powerpc/32e: Ignore ESR in instruction storage interrupt handler
db56efa61734 powerpc/bpf: Fix write protecting JIT code
b3e0a9cb6a67 powerpc/vas: Fix potential NULL pointer dereference
0bc921b6db55 mtd: rawnand: au1550nd: Keep the driver compatible with on-die ECC 
engines
f5a84162f174 mtd: rawnand: plat_nand: Keep the driver compatible with on-die 
ECC engines
426c3bda4995 mtd: rawnand: orion: Keep the driver compatible with on-die ECC 
engines
26b77361800a mtd: rawnand: pasemi: Keep the driver compatible with on-die ECC 
engines
8d37b0ee8875 mtd: rawnand: gpio: Keep the driver compatible with on-die ECC 
engines
0c82481e3064 mtd: rawnand: mpc5121: Keep the driver compatible with on-die ECC 
engines
6ad70604565c mtd: rawnand: xway: Keep the driver compatible with on-die ECC 
engines
e4435dec6149 mtd: rawnand: ams-delta: Keep the driver compatible with on-die 
ECC engines
ab5fdf2c5a41 mtd: rawnand: fsmc: Fix use of SM ORDER
6e7363893639 remoteproc: imx_rproc: Fix rsc-table name
0f27656d5e26 remoteproc: imx_rproc: Fix ignoring mapping vdev regions
fce6586cd1d7 remoteproc: Fix the wrong default value of is_iomem
69dbe49b7eac remoteproc: elf_loader: Fix loading segment when is_iomem true
7d1ece44014b s390/cio: make ccw_device_dma_* more robust
60b9aef7f2eb s390/ap: Fix hanging ioctl caused by orphaned replies
9525ecf82f04 s390/tape: fix timer initialization in tape_std_assign()
efa70f3da72a s390/cio: check the subchannel validity for dev_busid
2ea358c095ad s390/cpumf: cpum_cf PMU displays invalid value after hotplug remove
e554c13dbe3c PM: sleep: Avoid calling put_device() under dpm_list_mtx
f36ada9c43db video: backlight: Drop maximum brightness override for brightness 
zero
c928e634b492 mfd: dln2: Add cell for initializing DLN2 ADC
8d55a5f82210 mm, oom: do not trigger out_of_memory from the #PF
dc6b83b8fef9 mm, oom: pagefault_out_of_memory: don't force global OOM for dying 
tasks

[OE-core] [honister][PATCH 03/17] bind: fix CVE-2021-25219

[Anuj Mittal]

From: Mingli Yu 

Backport patches to fix CVE-2021-25219.

(From OE-Core rev: 918660a2d4bc89a763a5934765ff6a1647709fcc)

Signed-off-by: Mingli Yu 
Signed-off-by: Anuj Mittal 
Signed-off-by: Richard Purdie 
(cherry picked from commit 729693f0c250aec7dfdb91a9bb4dd5420c7efbee)
Signed-off-by: Anuj Mittal 
---
 .../bind/bind-9.16.20/CVE-2021-25219-1.patch  | 76 +++
 .../bind/bind-9.16.20/CVE-2021-25219-2.patch  | 65 
 .../recipes-connectivity/bind/bind_9.16.20.bb |  2 +
 3 files changed, 143 insertions(+)
 create mode 100644 
meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-1.patch
 create mode 100644 
meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-2.patch

diff --git a/meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-1.patch 
b/meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-1.patch
new file mode 100644
index 00..f63c333264
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-1.patch
@@ -0,0 +1,76 @@
+From 011e9418ce9bb25675de6ac8d47536efedeeb312 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= 
+Date: Fri, 24 Sep 2021 09:35:11 +0200
+Subject: [PATCH] Disable lame-ttl cache
+
+The lame-ttl cache is implemented in ADB as per-server locked
+linked-list "indexed" with .  This list has to be walked
+every time there's a new query or new record added into the lame cache.
+Determined attacker can use this to degrade performance of the resolver.
+
+Resolver testing has shown that disabling the lame cache has little
+impact on the resolver performance and it's a minimal viable defense
+against this kind of attack.
+
+CVE: CVE-2021-25219
+
+Upstream-Status: Backport 
[https://gitlab.isc.org/isc-projects/bind9/-/commit/8fe18c0566c41228a568157287f5a44f96d37662]
+
+Signed-off-by: Mingli Yu 
+---
+ bin/named/config.c| 2 +-
+ bin/named/server.c| 7 +--
+ doc/arm/reference.rst | 6 +++---
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/bin/named/config.c b/bin/named/config.c
+index fa8473db7c..b6453b814e 100644
+--- a/bin/named/config.c
 b/bin/named/config.c
+@@ -151,7 +151,7 @@ options {\n\
+   fetches-per-server 0;\n\
+   fetches-per-zone 0;\n\
+   glue-cache yes;\n\
+-  lame-ttl 600;\n"
++  lame-ttl 0;\n"
+ #ifdef HAVE_LMDB
+   "   lmdb-mapsize 32M;\n"
+ #endif /* ifdef HAVE_LMDB */
+diff --git a/bin/named/server.c b/bin/named/server.c
+index 638703e8c2..35ad6a0b7f 100644
+--- a/bin/named/server.c
 b/bin/named/server.c
+@@ -4806,8 +4806,11 @@ configure_view(dns_view_t *view, dns_viewlist_t 
*viewlist, cfg_obj_t *config,
+   result = named_config_get(maps, "lame-ttl", );
+   INSIST(result == ISC_R_SUCCESS);
+   lame_ttl = cfg_obj_asduration(obj);
+-  if (lame_ttl > 1800) {
+-  lame_ttl = 1800;
++  if (lame_ttl > 0) {
++  cfg_obj_log(obj, named_g_lctx, ISC_LOG_WARNING,
++  "disabling lame cache despite lame-ttl > 0 as it "
++  "may cause performance issues");
++  lame_ttl = 0;
+   }
+   dns_resolver_setlamettl(view->resolver, lame_ttl);
+ 
+diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
+index 3bc4439745..fea854f3d1 100644
+--- a/doc/arm/reference.rst
 b/doc/arm/reference.rst
+@@ -3358,9 +3358,9 @@ Tuning
+ ^^
+ 
+ ``lame-ttl``
+-   This sets the number of seconds to cache a lame server indication. 0
+-   disables caching. (This is **NOT** recommended.) The default is
+-   ``600`` (10 minutes) and the maximum value is ``1800`` (30 minutes).
++   This is always set to 0. More information is available in the
++   `security advisory for CVE-2021-25219
++   `_.
+ 
+ ``servfail-ttl``
+This sets the number of seconds to cache a SERVFAIL response due to DNSSEC
+-- 
+2.17.1
+
diff --git a/meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-2.patch 
b/meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-2.patch
new file mode 100644
index 00..1217f7f186
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-2.patch
@@ -0,0 +1,65 @@
+From 117cf776a7add27ac6d236b4062258da0d068486 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= 
+Date: Mon, 15 Nov 2021 16:26:52 +0800
+Subject: [PATCH] Enable lame response detection even with disabled lame cache
+
+Previously, when lame cache would be disabled by setting lame-ttl to 0,
+it would also disable lame answer detection.  In this commit, we enable
+the lame response detection even when the lame cache is disabled.  This
+enables stopping answer processing early rather than going through the
+whole answer processing flow.
+
+CVE: CVE-2021-25219
+
+Upstream-Status: Backport 
[https://gitlab.isc.org/isc-projects/bind9/-/commit/e4931584a34bdd0a0d18e4d918fb853bf5296787]
+
+Signed-off-by: Mingli Yu 
+---
+ lib/dns/resolver.c | 23 ---
+ 1 

[OE-core] [honister][PATCH 04/17] python3: upgrade 3.9.7 -> 3.9.9

[Anuj Mittal]

Signed-off-by: Anuj Mittal 
---
 ...-detection-of-mips-architecture-for-.patch | 20 +--
 .../{python3_3.9.7.bb => python3_3.9.9.bb}|  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)
 rename meta/recipes-devtools/python/{python3_3.9.7.bb => python3_3.9.9.bb} 
(99%)

diff --git 
a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
 
b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
index c4fae09a5b..99968b81de 100644
--- 
a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
+++ 
b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
@@ -1,7 +1,8 @@
-From 1ad771d86728ee2ed30e202e9768d8d825f96467 Mon Sep 17 00:00:00 2001
+From d9eb634b3d2e6ba831e864c50f6a37c48edfc4f3 Mon Sep 17 00:00:00 2001
 From: Matthias Schoepfer 
 Date: Fri, 31 May 2019 15:34:34 +0200
 Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
+
  float
 
 When (cross) compiling for softfloat mips, __mips_hard_float will not be
@@ -13,18 +14,18 @@ to do this in a more autoconf/autotools manner.
 Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
 Signed-off-by: Matthias Schoepfer 
 
-%% original patch: 
0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
+
 ---
  configure.ac | 175 +++
  1 file changed, 21 insertions(+), 154 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ede710e..bc81b0b 100644
+index e2979a8..337182d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -710,160 +710,27 @@ fi
- MULTIARCH=$($CC --print-multiarch 2>/dev/null)
- AC_SUBST(MULTIARCH)
+@@ -728,160 +728,27 @@ then
+ fi
+ 
  
 -AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
 -cat >> conftest.c 

[OE-core] [honister][PATCH 02/17] openssh: fix CVE-2021-41617

[Anuj Mittal]

From: Changqing Li 

Signed-off-by: Changqing Li 
Signed-off-by: Anuj Mittal 
---
 .../openssh/openssh/CVE-2021-41617.patch  | 48 +++
 .../openssh/openssh_8.7p1.bb  |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 
meta/recipes-connectivity/openssh/openssh/CVE-2021-41617.patch

diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2021-41617.patch 
b/meta/recipes-connectivity/openssh/openssh/CVE-2021-41617.patch
new file mode 100644
index 00..bebde7f26d
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2021-41617.patch
@@ -0,0 +1,48 @@
+From 1f0707e8e78ef290fd0f229df3fcd2236f29db89 Mon Sep 17 00:00:00 2001
+From: Changqing Li 
+Date: Thu, 28 Oct 2021 11:11:05 +0800
+Subject: [PATCH] upstream: need initgroups() before setresgid(); reported by
+ anton@,
+
+ok deraadt@
+
+OpenBSD-Commit-ID: 6aa003ee658b316960d94078f2a16edbc25087ce
+
+CVE: CVE-2021-41617
+Upstream-Status: Backport 
[https://github.com/openssh/openssh-portable/commit/f3cbe43e28fe71427d41cfe3a17125b972710455
+https://github.com/openssh/openssh-portable/commit/bf944e3794eff5413f2df1ef37cddf96918c6bde]
+
+Signed-off-by: Changqing Li 
+---
+ misc.c | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/misc.c b/misc.c
+index d988ce3..33eca1c 100644
+--- a/misc.c
 b/misc.c
+@@ -56,6 +56,7 @@
+ #ifdef HAVE_PATHS_H
+ # include 
+ #include 
++#include 
+ #endif
+ #ifdef SSH_TUN_OPENBSD
+ #include 
+@@ -2629,6 +2630,13 @@ subprocess(const char *tag, const char *command,
+   }
+   closefrom(STDERR_FILENO + 1);
+ 
++  if (geteuid() == 0 &&
++  initgroups(pw->pw_name, pw->pw_gid) == -1) {
++  error("%s: initgroups(%s, %u): %s", tag,
++  pw->pw_name, (u_int)pw->pw_gid, strerror(errno));
++  _exit(1);
++  }
++
+   if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1) {
+   error("%s: setresgid %u: %s", tag, (u_int)pw->pw_gid,
+   strerror(errno));
+-- 
+2.17.1
+
diff --git a/meta/recipes-connectivity/openssh/openssh_8.7p1.bb 
b/meta/recipes-connectivity/openssh/openssh_8.7p1.bb
index 07cd6b74cd..d19833e56f 100644
--- a/meta/recipes-connectivity/openssh/openssh_8.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_8.7p1.bb
@@ -24,6 +24,7 @@ SRC_URI = 
"http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
file://sshd_check_keys \
file://add-test-support-for-busybox.patch \
+   file://CVE-2021-41617.patch \
"
 SRC_URI[sha256sum] = 
"7ca34b8bb24ae9e50f33792b7091b3841d7e1b440ff57bc9fabddf01e2ed1e24"
 
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159664): 
https://lists.openembedded.org/g/openembedded-core/message/159664
Mute This Topic: https://lists.openembedded.org/mt/87712537/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 01/17] ncurses: fix CVE-2021-39537

[Anuj Mittal]

From: Mingli Yu 

Backport patch [1] to fix CVE-2021-39537 [2].

[1] 
https://github.com/mirror/ncurses/commit/790a85dbd4a81d5f5d8dd02a44d84f01512ef443
[2] 
http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_captoinfo.c?rev=1.1=text/x-cvsweb-markup

Signed-off-by: Mingli Yu 
Signed-off-by: Anuj Mittal 
(cherry picked from commit 8fceb122a1c0240106342738de7d2484b48d9a6a)
Signed-off-by: Anuj Mittal 
---
 .../ncurses/files/CVE-2021-39537.patch| 65 +++
 meta/recipes-core/ncurses/ncurses_6.2.bb  |  1 +
 2 files changed, 66 insertions(+)
 create mode 100644 meta/recipes-core/ncurses/files/CVE-2021-39537.patch

diff --git a/meta/recipes-core/ncurses/files/CVE-2021-39537.patch 
b/meta/recipes-core/ncurses/files/CVE-2021-39537.patch
new file mode 100644
index 00..d63bf57e8d
--- /dev/null
+++ b/meta/recipes-core/ncurses/files/CVE-2021-39537.patch
@@ -0,0 +1,65 @@
+From e83ecbd26252bac163fc4377ef30edbd4acb0bad Mon Sep 17 00:00:00 2001
+From: Sven Joachim 
+Date: Mon, 1 Jun 2020 08:03:52 +0200
+Subject: [PATCH] Import upstream patch 20200531
+
+20200531
+   + correct configure version-check/warnng for g++ to allow for 10.x
+   + re-enable "bel" in konsole-base (report by Nia Huang)
+   + add linux-s entry (patch by Alexandre Montaron).
+   + drop long-obsolete convert_configure.pl
+   + add test/test_parm.c, for checking tparm changes.
+   + improve parameter-checking for tparm, adding function _nc_tiparm() to
+ handle the most-used case, which accepts only numeric parameters
+ (report/testcase by "puppet-meteor").
+   + use a more conservative estimate of the buffer-size in lib_tparm.c's
+ save_text() and save_number(), in case the sprintf() function
+ passes-through unexpected characters from a format specifier
+ (report/testcase by "puppet-meteor").
+   + add a check for end-of-string in cvtchar to handle a malformed
+ string in infotocap (report/testcase by "puppet-meteor").
+
+CVE: CVE-2021-39537
+
+Upstream-Status: Backport 
[https://github.com/mirror/ncurses/commit/790a85dbd4a81d5f5d8dd02a44d84f01512ef443]
+
+Signed-off-by: Mingli Yu 
+---
+ ncurses/tinfo/captoinfo.c|   11 +-
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/ncurses/tinfo/captoinfo.c b/ncurses/tinfo/captoinfo.c
+index 8b3b83d1..9362105a 100644
+--- a/ncurses/tinfo/captoinfo.c
 b/ncurses/tinfo/captoinfo.c
+@@ -98,7 +98,7 @@
+ #include 
+ #include 
+ 
+-MODULE_ID("$Id: captoinfo.c,v 1.98 2020/02/02 23:34:34 tom Exp $")
++MODULE_ID("$Id: captoinfo.c,v 1.99 2020/05/25 21:28:29 tom Exp $")
+ 
+ #if 0
+ #define DEBUG_THIS(p) DEBUG(9, p)
+@@ -216,12 +216,15 @@ cvtchar(register const char *sp)
+   }
+   break;
+ case '^':
++  len = 2;
+   c = UChar(*++sp);
+-  if (c == '?')
++  if (c == '?') {
+   c = 127;
+-  else
++  } else if (c == '\0') {
++  len = 1;
++  } else {
+   c &= 0x1f;
+-  len = 2;
++  }
+   break;
+ default:
+   c = UChar(*sp);
+-- 
+2.17.1
+
diff --git a/meta/recipes-core/ncurses/ncurses_6.2.bb 
b/meta/recipes-core/ncurses/ncurses_6.2.bb
index e7d7396a20..598c51b00b 100644
--- a/meta/recipes-core/ncurses/ncurses_6.2.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.2.bb
@@ -3,6 +3,7 @@ require ncurses.inc
 SRC_URI += "file://0001-tic-hang.patch \
file://0002-configure-reproducible.patch \

file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \
+   file://CVE-2021-39537.patch \
"
 # commit id corresponds to the revision in package version
 SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4"
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159663): 
https://lists.openembedded.org/g/openembedded-core/message/159663
Mute This Topic: https://lists.openembedded.org/mt/87712535/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [honister][PATCH 00/17] Review request

[Anuj Mittal]

Please review these changes for honister. No issues seen while testing
on autobuilder.

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

Thanks,

Anuj

The following changes since commit b8fa0c446ecb3f65d7c134426a07c6244959cdf7:

  libdrm: upgrade 2.4.108 -> 2.4.109 (2021-12-09 09:17:26 +0800)

are available in the Git repository at:

  git://push.openembedded.org/openembedded-core-contrib anujm/honister

Anuj Mittal (1):
  python3: upgrade 3.9.7 -> 3.9.9

Bruce Ashfield (4):
  linux-yocto/5.14: update to v5.14.21
  linux-yocto/5.10: update to v5.10.82
  linux-yocto-rt/5.10: update to -rt56
  kern-tools: bug fixes and kgit-gconfig

Changqing Li (1):
  openssh: fix CVE-2021-41617

Mingli Yu (3):
  ncurses: fix CVE-2021-39537
  bind: fix CVE-2021-25219
  packagedata.py: silence a DeprecationWarning

Richard Purdie (1):
  gcc: Add CVE-2021-37322 to the list of CVEs to ignore

Ross Burton (3):
  runqemu: check the qemu PID has been set before kill()ing it
  oe/license: implement ast.NodeVisitor.visit_Constant
  license.bbclass: implement ast.NodeVisitor.visit_Constant

Stefan Herbrechtsmeier (2):
  recipetool: Set master branch only as fallback
  selftest/devtool: Check branch in git fetch

Steve Sakoman (1):
  cve-extra-exclusions: add db CVEs to exclusion list

Thomas Perrot (1):
  uboot-sign: fix the concatenation when multiple U-BOOT configurations
are specified

 meta/classes/license.bbclass  |  4 +
 meta/classes/uboot-sign.bbclass   | 16 +++-
 .../distro/include/cve-extra-exclusions.inc   |  9 ++-
 meta/lib/oe/license.py|  6 ++
 meta/lib/oe/packagedata.py|  2 +-
 meta/lib/oeqa/selftest/cases/devtool.py   |  5 +-
 .../bind/bind-9.16.20/CVE-2021-25219-1.patch  | 76 +++
 .../bind/bind-9.16.20/CVE-2021-25219-2.patch  | 65 
 .../recipes-connectivity/bind/bind_9.16.20.bb |  2 +
 .../openssh/openssh/CVE-2021-41617.patch  | 48 
 .../openssh/openssh_8.7p1.bb  |  1 +
 .../ncurses/files/CVE-2021-39537.patch| 65 
 meta/recipes-core/ncurses/ncurses_6.2.bb  |  1 +
 meta/recipes-devtools/gcc/gcc-11.2.inc|  3 +
 ...-detection-of-mips-architecture-for-.patch | 20 +++--
 .../{python3_3.9.7.bb => python3_3.9.9.bb}|  2 +-
 .../kern-tools/kern-tools-native_git.bb   |  5 +-
 .../linux/linux-yocto-rt_5.10.bb  |  6 +-
 .../linux/linux-yocto-rt_5.14.bb  |  6 +-
 .../linux/linux-yocto-tiny_5.10.bb|  8 +-
 .../linux/linux-yocto-tiny_5.14.bb|  8 +-
 meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++---
 meta/recipes-kernel/linux/linux-yocto_5.14.bb | 26 +++
 scripts/lib/recipetool/create.py  | 15 ++--
 scripts/runqemu   |  3 +-
 25 files changed, 358 insertions(+), 68 deletions(-)
 create mode 100644 
meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-1.patch
 create mode 100644 
meta/recipes-connectivity/bind/bind-9.16.20/CVE-2021-25219-2.patch
 create mode 100644 
meta/recipes-connectivity/openssh/openssh/CVE-2021-41617.patch
 create mode 100644 meta/recipes-core/ncurses/files/CVE-2021-39537.patch
 rename meta/recipes-devtools/python/{python3_3.9.7.bb => python3_3.9.9.bb} 
(99%)

-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159662): 
https://lists.openembedded.org/g/openembedded-core/message/159662
Mute This Topic: https://lists.openembedded.org/mt/87712534/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [RFC PATCH] Implement functionality to exclude dirs from rootfs

[Richard Purdie]

On Mon, 2021-12-13 at 22:14 +0100, Peter Bergin wrote:
> With this patch trying to wake alive an old patch that never
> found its way in to oe-core last time [1]. The added function is to
> configure directories that shall be excluded when creating an image.
> 
> One use case is that some directories are located in a separate partition
> in the memory and mounted during boot sequence. For example configuration
> that shall be kept during upgrade of rootfs. Then files in those directories
> can be excluded from image and handled separate.
> 
> Is this functionality something that can be added to oe-core?
> If not, are there already a method to get this with current functionality.
> 
> [1] https://patchwork.openembedded.org/patch/147567/

The trouble is if we start taking patches like this, we're going to end up in a
mess as the interface here isn't great.

It is unclear from setting IMAGE_ROOTFS_EXCLUDE_PATH which image types this
would apply to. Doing this by a task specific flag is horrible, no other image
control does this. It is also unclear how you handle the situation if you have
two different tree locations you want to filter instead of one (possibly in
different image types) so this method simply doesn't scale.

When you get to this level of image complexity, you usually end up with using a
tool like wic. You also have the option of passing in extra parameters to
specific image creation types like tar to filter paths.

I'm not against adding something but we need a better interface for something to
be accepted in core. I don't know what that looks like but this isn't there in
my view.

Cheers,

Richard




-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159661): 
https://lists.openembedded.org/g/openembedded-core/message/159661
Mute This Topic: https://lists.openembedded.org/mt/87708023/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] Yocto Project Newcomer & Unassigned Bugs - Help Needed

[Stephen Jolley]

All,

 

The triage team is starting to try and collect up and classify bugs which a
newcomer to the project would be able to work on in a way which means people
can find them. They're being listed on the triage page under the appropriate
heading:

https://wiki.yoctoproject.org/wiki/Bug_Triage#Newcomer_Bugs  Also please
review:
https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded and
how to create a bugzilla account at:

https://bugzilla.yoctoproject.org/createaccount.cgi

The idea is these bugs should be straight forward for a person to help work
on who doesn't have deep experience with the project.  If anyone can help,
please take ownership of the bug and send patches!  If anyone needs
help/advice there are people on irc who can likely do so, or some of the
more experienced contributors will likely be happy to help too.

 

Also, the triage team meets weekly and does its best to handle the bugs
reported into the Bugzilla. The number of people attending that meeting has
fallen, as have the number of people available to help fix bugs. One of the
things we hear users report is they don't know how to help. We (the triage
team) are therefore going to start reporting out the currently 399
unassigned or newcomer bugs.

 

We're hoping people may be able to spare some time now and again to help out
with these.  Bugs are split into two types, "true bugs" where things don't
work as they should and "enhancements" which are features we'd want to add
to the system.  There are also roughly four different "priority" classes
right now, "3.4", "3.5, "3.99" and "Future", the more pressing/urgent issues
being in "3.4" and then "3.5".

 

Please review this link and if a bug is something you would be able to help
with either take ownership of the bug, or send me (sjolley.yp...@gmail.com
 ) an e-mail with the bug number you would
like and I will assign it to you (please make sure you have a Bugzilla
account).  The list is at:
https://wiki.yoctoproject.org/wiki/Bug_Triage_Archive#Unassigned_or_Newcomer
_Bugs

 

Thanks,

 

Stephen K. Jolley

Yocto Project Program Manager

*Cell:(208) 244-4460

* Email:  sjolley.yp...@gmail.com
 

 


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159660): 
https://lists.openembedded.org/g/openembedded-core/message/159660
Mute This Topic: https://lists.openembedded.org/mt/87709283/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [RFC PATCH] do_image: Implement IMAGE_ROOTFS_EXCLUDE_PATH feature.

[Peter Bergin]

From: Kristian Amlie 

This is a direct followup from the earlier 6602392db3d39 commit in
wic. It works more or less the same way: The variable specifies a list
of directories relative to the root of the rootfs, and these
directories will be excluded from the resulting rootfs image. If an
entry ends with a slash, only the contents are omitted, not the
directory itself.

Since the intended use of the variable is to exclude certain
directories from the rootfs, and then include said directories in
other partitions, it is not natural for this variable to be respected
for image creators that create multi partition images. These can turn
the feature off locally by defining:

  do_image_myfs[respect_exclude_path] = "0"

Specifically, "wic" and "multiubi" come with the feature disabled.

Signed-off-by: Kristian Amlie 
Signed-off-by: Peter Bergin 
---
 meta/classes/image.bbclass   | 84 +++-
 meta/classes/image_types.bbclass |  1 +
 meta/classes/image_types_wic.bbclass |  1 +
 3 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2b0ce4a988..1c2ddd274e 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -125,7 +125,8 @@ def rootfs_variables(d):
  
'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS',
 'IMAGE_LINGUAS_COMPLEMENTARY', 'IMAGE_LOCALES_ARCHIVE',
  
'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS',
  
'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS',
- 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 
'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 
'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'IMAGE_INSTALL_DEBUGFS']
+ 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 
'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 
'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'IMAGE_INSTALL_DEBUGFS',
+ 'IMAGE_ROOTFS_EXCLUDE_PATH']
 variables.extend(rootfs_command_variables(d))
 variables.extend(variable_depends(d))
 return " ".join(variables)
@@ -497,8 +498,9 @@ python () {
 d.setVarFlag(task, 'func', '1')
 d.setVarFlag(task, 'fakeroot', '1')
 
-d.appendVarFlag(task, 'prefuncs', ' ' + debug + ' set_image_size')
+d.appendVarFlag(task, 'prefuncs', ' ' + debug + ' set_image_size 
prepare_excluded_directories')
 d.prependVarFlag(task, 'postfuncs', 'create_symlinks ')
+d.appendVarFlag(task, 'postfuncs', ' cleanup_excluded_directories')
 d.appendVarFlag(task, 'subimages', ' ' + ' '.join(subimages))
 d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps))
 d.appendVarFlag(task, 'vardepsexclude', ' DATETIME DATE ' + ' 
'.join(vardepsexclude))
@@ -507,6 +509,84 @@ python () {
 bb.build.addtask(task, 'do_image_complete', after, d)
 }
 
+python prepare_excluded_directories() {
+exclude_var = d.getVar('IMAGE_ROOTFS_EXCLUDE_PATH')
+if not exclude_var:
+return
+
+taskname = d.getVar("BB_CURRENTTASK")
+
+if d.getVarFlag('do_%s' % taskname, 'respect_exclude_path') == '0':
+bb.debug(1, "'IMAGE_ROOTFS_EXCLUDE_PATH' is set but 
'respect_exclude_path' variable flag is 0 for this image type, so ignoring it")
+return
+
+import shutil
+from oe.path import copyhardlinktree
+
+exclude_list = exclude_var.split()
+
+rootfs_orig = d.getVar('IMAGE_ROOTFS')
+# We need a new rootfs directory we can delete files from. Copy to
+# workdir.
+new_rootfs = os.path.realpath(oe.path.join(d.getVar("WORKDIR"), 
"rootfs.%s" % taskname))
+
+if os.path.lexists(new_rootfs):
+shutil.rmtree(new_rootfs)
+
+copyhardlinktree(rootfs_orig, new_rootfs)
+
+for orig_path in exclude_list:
+path = orig_path
+if os.path.isabs(path):
+bb.fatal("IMAGE_ROOTFS_EXCLUDE_PATH: Must be relative: %s" % 
orig_path)
+
+full_path = os.path.realpath(oe.path.join(new_rootfs, path))
+
+# Disallow climbing outside of parent directory using '..',
+# because doing so could be quite disastrous (we will delete the
+# directory).
+if not full_path.startswith(new_rootfs):
+bb.fatal("'%s' points to a path outside the rootfs" % orig_path)
+
+if path.endswith(os.sep):
+# Delete content only.
+for entry in os.listdir(full_path):
+full_entry = oe.path.join(full_path, entry)
+if os.path.isdir(full_entry) and not 
os.path.islink(full_entry):
+shutil.rmtree(full_entry)
+else:
+

[OE-core] [RFC PATCH] Implement functionality to exclude dirs from rootfs

[Peter Bergin]

With this patch trying to wake alive an old patch that never
found its way in to oe-core last time [1]. The added function is to
configure directories that shall be excluded when creating an image.

One use case is that some directories are located in a separate partition
in the memory and mounted during boot sequence. For example configuration
that shall be kept during upgrade of rootfs. Then files in those directories
can be excluded from image and handled separate.

Is this functionality something that can be added to oe-core?
If not, are there already a method to get this with current functionality.

[1] https://patchwork.openembedded.org/patch/147567/


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159658): 
https://lists.openembedded.org/g/openembedded-core/message/159658
Mute This Topic: https://lists.openembedded.org/mt/87708023/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] libical: upgrade to 3.0.12

[Ross Burton]

Disable tests to save some build time as we can't install them.

Signed-off-by: Ross Burton 
---
 .../libical/{libical_3.0.11.bb => libical_3.0.12.bb} | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
 rename meta/recipes-support/libical/{libical_3.0.11.bb => libical_3.0.12.bb} 
(83%)

diff --git a/meta/recipes-support/libical/libical_3.0.11.bb 
b/meta/recipes-support/libical/libical_3.0.12.bb
similarity index 83%
rename from meta/recipes-support/libical/libical_3.0.11.bb
rename to meta/recipes-support/libical/libical_3.0.12.bb
index b16081e9e28..b2b2211b9b4 100644
--- a/meta/recipes-support/libical/libical_3.0.11.bb
+++ b/meta/recipes-support/libical/libical_3.0.12.bb
@@ -12,14 +12,13 @@ LIC_FILES_CHKSUM = 
"file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \
 "
 SECTION = "libs"
 
-SRC_URI = 
"https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
-"
-SRC_URI[sha256sum] = 
"1e6c5e10c5a48f7a40c68958055f0e2759d9ab3563aca17273fe35a5df7dbbf1"
+SRC_URI = 
"https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz;
+SRC_URI[sha256sum] = 
"35095a4cc1a061a3de0f332c2dc728226cf127fa0baa818e9f8856cee6d35830"
 UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases;
 
 inherit cmake pkgconfig
 
-DEPENDS:append:class-target = " libical-native"
+DEPENDS += "libical-native"
 
 PACKAGECONFIG ??= "icu glib"
 PACKAGECONFIG[bdb] = ",-DCMAKE_DISABLE_FIND_PACKAGE_BDB=True,db"
@@ -29,13 +28,16 @@ PACKAGECONFIG[icu] = 
",-DCMAKE_DISABLE_FIND_PACKAGE_ICU=True,icu"
 
 # No need to use perl-native, the host perl is sufficient.
 EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl"
+# Disable the test suite as we can't install it
+EXTRA_OECMAKE += "-DLIBICAL_BUILD_TESTING=false"
 # doc build fails with linker error (??) for libical-glib so disable it
 EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false"
 
+# Tell the cross-libical where the tool it needs to build is
 EXTRA_OECMAKE:append:class-target = " 
-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake"
 
 do_install:append () {
-# Remove build host references
+# Remove build host references 
(https://github.com/libical/libical/issues/532)
 sed -i \
-e 's,${STAGING_LIBDIR},${libdir},g' \
-e 's,${STAGING_INCDIR},${includedir},g' \
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159657): 
https://lists.openembedded.org/g/openembedded-core/message/159657
Mute This Topic: https://lists.openembedded.org/mt/87703272/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core][dunfell 16/18] cmake: FindGTest: Add target for gmock library

[Jasper Orschulko]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hi Eero,

my first reflex was to say, that I don't believe this to be necessary.
As you already said, these variables aren't documented and thus I'd
argue that you don't have to consider them for maintaining backwards
compatibility during backports. I personally see this as a bug on our
part and as a coincidence that our setup worked pre-patch.

However, I'm not sure WHY those two variables where actually used by us
or where they originated from. Going as far back as cmake 3.0, these
variables where never documented, however doing a quick search for
those reveals that they actually are used in other (older?) projects.
So I'm not quite sure how many other users might be affected by this.
Maybe we actually SHOULD keep supporting them for the LTS branch, just
in case?

- -- 
With best regards

Jasper Orschulko
DevOps Engineer

Tel. +49 30 58 58 14 265
Fax +49 30 58 58 14 999
jasper.orschu...@iris-sensing.com

• • • • • • • • • • • • • • • • • • • • • • • • • •

iris-GmbH
infrared & intelligent sensors
Schnellerstraße 1-5 | 12439 Berlin

https://iris-sensing.com/





On Mon, 2021-12-13 at 15:03 +0200, Eero Aaltonen wrote:
> On Fri, 2021-12-10 at 18:49 +, Jasper Orschulko wrote:
> > Hello everyone,
> > 
> > after some digging we identified the issue to be on our part.
> > We have been using "GTEST_LIBRARY" and "GTEST_MAIN_LIBRARY" in our
> > CMake scripts instead of "GTEST_LIBRARIES" and
> > "GTEST_MAIN_LIBRARIES",
> > as described in the cmake docs:
> > 
> https://cmake.org/cmake/help/v3.16/module/FindGTest.html#result-variables
> 
> Thank you for providing more details.
> 
> The gmock target can be backported to dunfell in an alternative way,
> by
> leaving out the
>     find_package(GTest QUIET NO_MODULE)
> 
> call and subsequent lines and letting the FindModule create all the
> definitions. This would leave also the undocumented variables intact,
> if that is desired.
> 
> This should be as simple as dropping the lines
> --
> # first specifically look for the CMake version of GTest
> find_package(GTest QUIET NO_MODULE)
> 
> # if we found the GTest cmake package then we are done, and
> # can print what we found and return.
> if(GTest_FOUND)
>     set(GTEST_FOUND ${GTest_FOUND})
>     FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTest HANDLE_COMPONENTS
> CONFIG_MODE)
> 
>     set(GTEST_LIBRARIES  GTest::gtest)
>     set(GTEST_MAIN_LIBRARIES GTest::gtest_main)
> 
>     __gtest_define_backwards_compatible_library_targets()
> 
>     return()
> endif()
> --
> 
-BEGIN PGP SIGNATURE-

iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmG3hbsACgkQYgqew07V
MNW6Gwf8DcYj0KlqNSLpB3tlsplI4Wac9mfxAd/g2BoKcyekRK2IArMJKzNDEhi6
GqKar0z3QgRZQrF54X63/MnhaqIypHef+8YyUPVVYhq+HUZSXc+6c3SjIdVBBJn8
G04/pxmoLybBvqMmFcP67qhFlojo7yW2viK8stdVZ49VwfE3XIq3fSxrqE6xQq1V
nOoZw5DRLqgCGpeB41OebYXE1bOIX3WOgk5Pzkuf4Iq9bLDoWg5zXSxw0djYCMZS
2E6kHIwJavEVKhmQoC2IpiPrZ4cJQ57JZvIR95HsFkG/C/N6sKXlJu2VLId+5xdb
IwUexGr3vUCXGqrUTWOZE6kxhdo74Q==
=/Myf
-END PGP SIGNATURE-

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159656): 
https://lists.openembedded.org/g/openembedded-core/message/159656
Mute This Topic: https://lists.openembedded.org/mt/87483225/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [oe][OE-core][Patch 0/2] implement applying patches from a directory

[Alexander Kanavin]

But you can use externalsrc to simply point to a custom source checkout, no?

Alex

On Mon, 13 Dec 2021 at 18:34, Max Krummenacher  wrote:

> On Fri, Dec 10, 2021 at 4:57 PM Richard Purdie
>  wrote:
> >
> > On Fri, 2021-12-10 at 14:04 +0100, Max Krummenacher wrote:
> > > The current developer manual [1] specifies that patches that are
> > > part of a directory which is given in SRC_URI are applied by
> > > the do_patch task. However that is not implemented in the
> > > current code.
> > >
> > > This patchset implements that, but deviates from what is
> > > documented. If the patches are applied I will send a patch
> > > for the documentation changing the relevant part to:
> > >
> > > ```
> > > If you have a directory full of patch files and you want to
> > > apply them all you can add the directory to SRC_URI and add
> > > the "apply=yes" parameter. This will apply ALL files in the
> > > directiory, including files in subdirectories.
> > > The patches will be applied sorted by their filename. Files
> > > from subdirectories will be sorted into the list at the
> > > position given by the subdirectory name.
> > >
> > >SRC_URI = " \
> > >git://path_to_repo/some_package \
> > >file://path_to_lots_of_patch_files;apply=yes \
> > >"
> > >
> > > In the previous example all the files in the directory holding
> > > the patch files would be applied as a patch.
> > > ```
> > >
> > > Max
> > >
> > > [1]
> https://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#ref-tasks-patch
> > >
> > > Max Krummenacher (2):
> > >   lib/oe/patch.py: apply patches from src_uri specified directories
> > >   lib/oe/recipeutils.py: follow changed method argument list
> > >
> >
> > Can I ask about the motivation here? Have you a use case you needed this
> to work
> > with or are you just making the code match the docs?
> >
> > I'm a little worried about adding features like this which aren't
> commonly used
> > and clearly haven't been needed for a while. Such changes really do need
> some
> > kind of test case and as Bruce mentions, ordering of patches patches in
> > directories is a concern, you did at least sort the listdir() output
> which is
> > good :)
> >
> > In the past when I've needed something like this, dumping "ls -1" into a
> file
> > and turning it into a SRC_URI hasn't been too hard even for long lists of
> > patches...
>
> I want to do continuous integration / testing in our upstreaming efforts
> to U-Boot/Kernel. So I would create a directory with any prerequisite
> patchsets and our mainlining patchsets which are on the ML but not yet
> in the repo and put the individual patches in the relevant directory.
>
> Should any work on the repo break any of the patches automated testing
> would then trigger us to rebase/change whatever needed.
> With the directory approach would take away the burden of fiddling
> with patch lists in SRC_URI.
>
> I assume there already is a test for do_patch in the current automated
> testing. I could integrate the recipe I used for testing this extension
> of the patch functionality.
>
> I used the "ls -1" approach in the past to make my life easier, I guess
> however that the directory approach would simplify things even more.
>
> Would a patchset with a test be acceptable?
>
> Cheers,
> Max
> >
> > Cheers,
> >
> > Richard
> >
>
> 
>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159655): 
https://lists.openembedded.org/g/openembedded-core/message/159655
Mute This Topic: https://lists.openembedded.org/mt/87635232/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [oe][OE-core][Patch 0/2] implement applying patches from a directory

[Max Krummenacher]

On Fri, Dec 10, 2021 at 4:57 PM Richard Purdie
 wrote:
>
> On Fri, 2021-12-10 at 14:04 +0100, Max Krummenacher wrote:
> > The current developer manual [1] specifies that patches that are
> > part of a directory which is given in SRC_URI are applied by
> > the do_patch task. However that is not implemented in the
> > current code.
> >
> > This patchset implements that, but deviates from what is
> > documented. If the patches are applied I will send a patch
> > for the documentation changing the relevant part to:
> >
> > ```
> > If you have a directory full of patch files and you want to
> > apply them all you can add the directory to SRC_URI and add
> > the "apply=yes" parameter. This will apply ALL files in the
> > directiory, including files in subdirectories.
> > The patches will be applied sorted by their filename. Files
> > from subdirectories will be sorted into the list at the
> > position given by the subdirectory name.
> >
> >SRC_URI = " \
> >git://path_to_repo/some_package \
> >file://path_to_lots_of_patch_files;apply=yes \
> >"
> >
> > In the previous example all the files in the directory holding
> > the patch files would be applied as a patch.
> > ```
> >
> > Max
> >
> > [1] 
> > https://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#ref-tasks-patch
> >
> > Max Krummenacher (2):
> >   lib/oe/patch.py: apply patches from src_uri specified directories
> >   lib/oe/recipeutils.py: follow changed method argument list
> >
>
> Can I ask about the motivation here? Have you a use case you needed this to 
> work
> with or are you just making the code match the docs?
>
> I'm a little worried about adding features like this which aren't commonly 
> used
> and clearly haven't been needed for a while. Such changes really do need some
> kind of test case and as Bruce mentions, ordering of patches patches in
> directories is a concern, you did at least sort the listdir() output which is
> good :)
>
> In the past when I've needed something like this, dumping "ls -1" into a file
> and turning it into a SRC_URI hasn't been too hard even for long lists of
> patches...

I want to do continuous integration / testing in our upstreaming efforts
to U-Boot/Kernel. So I would create a directory with any prerequisite
patchsets and our mainlining patchsets which are on the ML but not yet
in the repo and put the individual patches in the relevant directory.

Should any work on the repo break any of the patches automated testing
would then trigger us to rebase/change whatever needed.
With the directory approach would take away the burden of fiddling
with patch lists in SRC_URI.

I assume there already is a test for do_patch in the current automated
testing. I could integrate the recipe I used for testing this extension
of the patch functionality.

I used the "ls -1" approach in the past to make my life easier, I guess
however that the directory approach would simplify things even more.

Would a patchset with a test be acceptable?

Cheers,
Max
>
> Cheers,
>
> Richard
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159654): 
https://lists.openembedded.org/g/openembedded-core/message/159654
Mute This Topic: https://lists.openembedded.org/mt/87635232/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 10/10] selftest: skip virgl test on centos 8 entirely

[Steve Sakoman]

With the sdl frontend, qemu isn't able to even boot fully,
so let's skip the test early.

Signed-off-by: Steve Sakoman 
---
 meta/lib/oeqa/selftest/cases/runtime_test.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py 
b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 1c935da919..9e5c3f2878 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -179,6 +179,8 @@ class TestImage(OESelftestTestCase):
 self.skipTest('virgl isn\'t working with Debian 8')
 if distro and distro == 'centos-7':
 self.skipTest('virgl isn\'t working with Centos 7')
+if distro and distro == 'centos-8':
+self.skipTest('virgl isn\'t working with Centos 8')
 if distro and distro == 'opensuseleap-15.0':
 self.skipTest('virgl isn\'t working with Opensuse 15.0')
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159653): 
https://lists.openembedded.org/g/openembedded-core/message/159653
Mute This Topic: https://lists.openembedded.org/mt/87700022/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 09/10] selftest/devtool: Check branch in git fetch

[Steve Sakoman]

From: Stefan Herbrechtsmeier 

The commit 'meta/scripts: Manual git url branch additions (dc53fe75cc)'
forget the url branch= parameter in the devtool git fetch test.

Signed-off-by: Stefan Herbrechtsmeier 
Signed-off-by: Richard Purdie 
(cherry picked from commit 1419168a58a5caf99e24ada08c9ab639344a78b4)
Signed-off-by: Steve Sakoman 
---
 meta/lib/oeqa/selftest/cases/devtool.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index 713efd71bd..87e71632ab 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -442,6 +442,7 @@ class DevtoolAddTests(DevtoolBase):
 tempdir = tempfile.mkdtemp(prefix='devtoolqa')
 self.track_for_cleanup(tempdir)
 url = 'gitsm://git.yoctoproject.org/mraa'
+url_branch = '%s;branch=master' % url
 checkrev = 'ae127b19a50aa54255e4330ccfdd9a5d058e581d'
 testrecipe = 'mraa'
 srcdir = os.path.join(tempdir, testrecipe)
@@ -462,7 +463,7 @@ class DevtoolAddTests(DevtoolBase):
 checkvars = {}
 checkvars['S'] = '${WORKDIR}/git'
 checkvars['PV'] = '1.0+git${SRCPV}'
-checkvars['SRC_URI'] = url
+checkvars['SRC_URI'] = url_branch
 checkvars['SRCREV'] = '${AUTOREV}'
 self._test_recipe_contents(recipefile, checkvars, [])
 # Try with revision and version specified
@@ -481,7 +482,7 @@ class DevtoolAddTests(DevtoolBase):
 checkvars = {}
 checkvars['S'] = '${WORKDIR}/git'
 checkvars['PV'] = '1.5+git${SRCPV}'
-checkvars['SRC_URI'] = url
+checkvars['SRC_URI'] = url_branch
 checkvars['SRCREV'] = checkrev
 self._test_recipe_contents(recipefile, checkvars, [])
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159652): 
https://lists.openembedded.org/g/openembedded-core/message/159652
Mute This Topic: https://lists.openembedded.org/mt/87700014/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 08/10] recipetool: Set master branch only as fallback

[Steve Sakoman]

From: Stefan Herbrechtsmeier 

The commit 'meta/scripts: Manual git url branch additions (dc53fe75cc)'
sets the branch= parameter too early to master and thereby breaks the
-B/--srcbranch option.

ERROR: branch= parameter and -B/--srcbranch option cannot both be specified - 
use one or the other

Signed-off-by: Stefan Herbrechtsmeier 
Signed-off-by: Richard Purdie 
(cherry picked from commit 34ece8030e7a6a100b5e3e7b94e6c786c0e199a6)
Signed-off-by: Steve Sakoman 
---
 scripts/lib/recipetool/create.py | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 116bdfd697..5b6ac12a92 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -389,9 +389,6 @@ def reformat_git_uri(uri):
 parms.update({('protocol', 'ssh')})
 elif (scheme == "http" or scheme == 'https' or scheme == 'ssh') and 
not ('protocol' in parms):
 parms.update({('protocol', scheme)})
-# We assume 'master' branch if not set
-if not 'branch' in parms:
-parms.update({('branch', 'master')})
 # Always append 'git://'
 fUrl = bb.fetch2.encodeurl(('git', host, path, user, pswd, parms))
 return fUrl
@@ -481,6 +478,9 @@ def create_recipe(args):
 storeTagName = params['tag']
 params['nobranch'] = '1'
 del params['tag']
+# Assume 'master' branch if not set
+if scheme in ['git', 'gitsm'] and 'branch' not in params and 
'nobranch' not in params:
+params['branch'] = 'master'
 fetchuri = bb.fetch2.encodeurl((scheme, network, path, user, passwd, 
params))
 
 tmpparent = tinfoil.config_data.getVar('BASE_WORKDIR')
@@ -530,10 +530,9 @@ def create_recipe(args):
 # Remove HEAD reference point and drop remote prefix
 get_branch = [x.split('/', 1)[1] for x in get_branch if not 
x.startswith('origin/HEAD')]
 if 'master' in get_branch:
-# If it is master, we do not need to append 'branch=master' as 
this is default.
 # Even with the case where get_branch has multiple objects, if 
'master' is one
 # of them, we should default take from 'master'
-srcbranch = ''
+srcbranch = 'master'
 elif len(get_branch) == 1:
 # If 'master' isn't in get_branch and get_branch contains only 
ONE object, then store result into 'srcbranch'
 srcbranch = get_branch[0]
@@ -546,8 +545,8 @@ def create_recipe(args):
 # Since we might have a value in srcbranch, we need to
 # recontruct the srcuri to include 'branch' in params.
 scheme, network, path, user, passwd, params = 
bb.fetch2.decodeurl(srcuri)
-if srcbranch:
-params['branch'] = srcbranch
+if scheme in ['git', 'gitsm']:
+params['branch'] = srcbranch or 'master'
 
 if storeTagName and scheme in ['git', 'gitsm']:
 # Check srcrev using tag and check validity of the tag
@@ -606,7 +605,7 @@ def create_recipe(args):
 splitline = line.split()
 if len(splitline) > 1:
 if splitline[0] == 'origin' and 
scriptutils.is_src_url(splitline[1]):
-srcuri = reformat_git_uri(splitline[1])
+srcuri = reformat_git_uri(splitline[1]) + 
';branch=master'
 srcsubdir = 'git'
 break
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159651): 
https://lists.openembedded.org/g/openembedded-core/message/159651
Mute This Topic: https://lists.openembedded.org/mt/87700011/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 07/10] runqemu: check the qemu PID has been set before kill()ing it

[Steve Sakoman]

From: Ross Burton 

If runqemu is killed, check that we have a valid PID for the qemu before
sending a kill() to it.

[ YOCTO #14651 ]

Signed-off-by: Ross Burton 
Signed-off-by: Richard Purdie 
(cherry picked from commit 0f3afbd3a6a6bef668612f818517df7543c0a683)
Signed-off-by: Steve Sakoman 
---
 scripts/runqemu | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 10880ba6bb..51607f10e5 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1516,7 +1516,8 @@ def main():
 
 def sigterm_handler(signum, frame):
 logger.info("SIGTERM received")
-os.kill(config.qemupid, signal.SIGTERM)
+if config.qemupid:
+os.kill(config.qemupid, signal.SIGTERM)
 config.cleanup()
 # Deliberately ignore the return code of 'tput smam'.
 subprocess.call(["tput", "smam"])
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159650): 
https://lists.openembedded.org/g/openembedded-core/message/159650
Mute This Topic: https://lists.openembedded.org/mt/87700010/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 06/10] lttng-modules: do not search in non-existing folder during install

[Steve Sakoman]

From: Andrey Zhizhikin 

When CONFIG_TRACEPOINTS is not enabled in kernel config - module
compilation is skipped, which causes the ${D}/${nonarch_base_libdir} not
to be created.

This fails later in do_install:append() due to the fact that find
command in executed for non-existing folder.

Check for folder existence before find command in executed.

Signed-off-by: Andrey Zhizhikin 
Signed-off-by: Richard Purdie 
(cherry picked from commit de0aa1700ed4e6f04b0a233eb1f6d2ac598e7ed8)
Signed-off-by: Aníbal Limón 
Signed-off-by: Steve Sakoman 
---
 meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb 
b/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb
index 3fdc8094e9..3145f0298c 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.6.bb
@@ -39,7 +39,9 @@ EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'"
 
 do_install_append() {
# Delete empty directories to avoid QA failures if no modules were built
-   find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \;
+   if [ -d ${D}/${nonarch_base_libdir} ]; then
+   find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec 
rmdir {} \;
+   fi
 }
 
 python do_package_prepend() {
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159649): 
https://lists.openembedded.org/g/openembedded-core/message/159649
Mute This Topic: https://lists.openembedded.org/mt/8778/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 05/10] wic:direct.py: ignore invalid mountpoints during fstab update

[Steve Sakoman]

From: Markus Volk 

wic fstab-update creates invalid entries for partitons that are not supposed to
be mounted from userspace eg u-boot partitions.

The following lines were added to fstab on a rock-pi-4:
/dev/mmcblk1p1 loader1 vfat defaults 0 0
/dev/mmcblk1p2 reserved1 vfat defaults 0 0
/dev/mmcblk1p3 reserved2 vfat defaults 0 0
/dev/mmcblk1p4 loader2 vfat defaults 0 0
/dev/mmcblk1p5 atf vfat defaults 0 0
/dev/mmcblk1p6 /boot vfat defaults 0 0

With this patch only valid entries should be added
/dev/mmcblk1p6 /boot vfat defaults 0 0

Signed-off-by: MarkusVolk 
Signed-off-by: Richard Purdie 
(cherry picked from commit 7aa678ce804c21dc1dc51b9be442671bc33c4041)
Signed-off-by: Steve Sakoman 
---
 scripts/lib/wic/plugins/imager/direct.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py 
b/scripts/lib/wic/plugins/imager/direct.py
index 7e1c1c03ab..2505c13fce 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -115,7 +115,7 @@ class DirectPlugin(ImagerPlugin):
 updated = False
 for part in self.parts:
 if not part.realnum or not part.mountpoint \
-   or part.mountpoint == "/":
+   or part.mountpoint == "/" or not 
part.mountpoint.startswith('/'):
 continue
 
 if part.use_uuid:
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159648): 
https://lists.openembedded.org/g/openembedded-core/message/159648
Mute This Topic: https://lists.openembedded.org/mt/8775/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 04/10] busybox: Fix multiple security issues in awk

[Steve Sakoman]

From: Sana Kazi 

CVE-2021-423xx-awk.patch fixes below listed CVEs for busybox:
CVE-2021-42378, CVE-2021-42379, CVE-2021-42380, CVE-2021-42381,
CVE-2021-42382, CVE-2021-42384, CVE-2021-42385, CVE-2021-42386

Signed-off-by: Sana Kazi 
Signed-off-by: Ranjitsinh Rathod 
Signed-off-by: Ranjitsinh Rathod 
Signed-off-by: Steve Sakoman 
---
 meta/recipes-core/busybox/busybox_1.31.1.bb   |   1 +
 .../busybox/files/CVE-2021-423xx-awk.patch| 215 ++
 2 files changed, 216 insertions(+)
 create mode 100644 meta/recipes-core/busybox/files/CVE-2021-423xx-awk.patch

diff --git a/meta/recipes-core/busybox/busybox_1.31.1.bb 
b/meta/recipes-core/busybox/busybox_1.31.1.bb
index 14ac710f3b..38b448b3e1 100644
--- a/meta/recipes-core/busybox/busybox_1.31.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.31.1.bb
@@ -54,6 +54,7 @@ SRC_URI = 
"https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://0001-mktemp-add-tmpdir-option.patch \
file://CVE-2021-42374.patch \
file://CVE-2021-42376.patch \
+   file://CVE-2021-423xx-awk.patch \
"
 SRC_URI_append_libc-musl = " file://musl.cfg "
 
diff --git a/meta/recipes-core/busybox/files/CVE-2021-423xx-awk.patch 
b/meta/recipes-core/busybox/files/CVE-2021-423xx-awk.patch
new file mode 100644
index 00..7e3d47b88c
--- /dev/null
+++ b/meta/recipes-core/busybox/files/CVE-2021-423xx-awk.patch
@@ -0,0 +1,215 @@
+From a21708eb8d07b4a6dbc1d3e4ace4c5721515a84c Mon Sep 17 00:00:00 2001
+From: Sana Kazi 
+Date: Wed, 8 Dec 2021 12:25:34 +0530
+Subject: [PATCH] busybox: Fix multiple security issues in awk
+
+Description: fix multiple security issues in awk
+Origin: backported awk.c from busybox 1.34.1
+
+CVE: CVE-2021-42378
+CVE: CVE-2021-42379
+CVE: CVE-2021-42380
+CVE: CVE-2021-42381
+CVE: CVE-2021-42382
+CVE: CVE-2021-42384
+CVE: CVE-2021-42385
+CVE: CVE-2021-42386
+
+Upstream-Status: Backport 
[https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/busybox/1:1.30.1-6ubuntu3.1/busybox_1.30.1-6ubuntu3.1.debian.tar.xz]
+
+Comment: Refreshed first hunk and removed few hunks as they are already 
present in source.
+
+Signed-off-by: Sana Kazi 
+Signed-off-by: Ranjitsinh Rathod 
+
+---
+ editors/awk.c | 80 ++-
+ 1 file changed, 60 insertions(+), 20 deletions(-)
+
+diff --git a/editors/awk.c b/editors/awk.c
+index d25508e..4e4f282 100644
+--- a/editors/awk.c
 b/editors/awk.c
+@@ -272,7 +272,8 @@ typedef struct tsplitter_s {
+ /* if previous token class is CONCAT1 and next is CONCAT2, concatenation */
+ /* operator is inserted between them */
+ #define   TC_CONCAT1 (TC_VARIABLE | TC_ARRTERM | TC_SEQTERM \
+-   | TC_STRING | TC_NUMBER | TC_UOPPOST)
++   | TC_STRING | TC_NUMBER | TC_UOPPOST \
++   | TC_LENGTH)
+ #define   TC_CONCAT2 (TC_OPERAND | TC_UOPPRE)
+ 
+ #define   OF_RES1 0x01
+@@ -404,7 +405,7 @@ static const char tokenlist[] ALIGN1 =
+ 
+ #define OC_B  OC_BUILTIN
+ 
+-static const uint32_t tokeninfo[] = {
++static const uint32_t tokeninfo[] ALIGN4 = {
+   0,
+   0,
+   OC_REGEXP,
+@@ -1070,8 +1071,10 @@ static uint32_t next_token(uint32_t expected)
+   const uint32_t *ti;
+ 
+   if (t_rollback) {
++  debug_printf_parse("%s: using rolled-back token\n", __func__);
+   t_rollback = FALSE;
+   } else if (concat_inserted) {
++  debug_printf_parse("%s: using concat-inserted token\n", 
__func__);
+   concat_inserted = FALSE;
+   t_tclass = save_tclass;
+   t_info = save_info;
+@@ -1200,7 +1203,11 @@ static uint32_t next_token(uint32_t expected)
+   goto readnext;
+ 
+   /* insert concatenation operator when needed */
+-  if ((ltclass & TC_CONCAT1) && (tc & TC_CONCAT2) && (expected & 
TC_BINOP)) {
++  debug_printf_parse("%s: %x %x %x concat_inserted?\n", __func__,
++  (ltclass & TC_CONCAT1), (tc & TC_CONCAT2), (expected & 
TC_BINOP));
++  if ((ltclass & TC_CONCAT1) && (tc & TC_CONCAT2) && (expected & 
TC_BINOP)
++   && !(ltclass == TC_LENGTH && tc == TC_SEQSTART) /* but not for 
"length(..." */
++  ) {
+   concat_inserted = TRUE;
+   save_tclass = tc;
+   save_info = t_info;
+@@ -1208,6 +1215,7 @@ static uint32_t next_token(uint32_t expected)
+   t_info = OC_CONCAT | SS | P(35);
+   }
+ 
++  debug_printf_parse("%s: t_tclass=tc=%x\n", __func__, t_tclass);
+   t_tclass = tc;
+   }
+   ltclass = t_tclass;
+@@ -1218,6 +1226,7 @@ static uint32_t next_token(uint32_t expected)
+   EMSG_UNEXP_EOS : EMSG_UNEXP_TOKEN);
+   }
+ 
++  debug_printf_parse("%s: returning, ltclass:%x t_double:%f\n", __func__, 
ltclass, t_double);
+   return 

[OE-core][dunfell 03/10] gcc: Add CVE-2021-37322 to the list of CVEs to ignore

[Steve Sakoman]

From: Richard Purdie 

The CVE applies to binutils 2.26 and not to gcc so ignore there.

Signed-off-by: Richard Purdie 
Signed-off-by: Tim Orling 
Signed-off-by: Steve Sakoman 
---
 meta/recipes-devtools/gcc/gcc-9.3.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-devtools/gcc/gcc-9.3.inc 
b/meta/recipes-devtools/gcc/gcc-9.3.inc
index 235576e627..c171f673e9 100644
--- a/meta/recipes-devtools/gcc/gcc-9.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-9.3.inc
@@ -124,3 +124,6 @@ EXTRA_OECONF_PATHS = "\
 --with-sysroot=/not/exist \
 --with-build-sysroot=${STAGING_DIR_TARGET} \
 "
+
+# Is a binutils 2.26 issue, not gcc
+CVE_CHECK_WHITELIST += "CVE-2021-37322"
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159646): 
https://lists.openembedded.org/g/openembedded-core/message/159646
Mute This Topic: https://lists.openembedded.org/mt/8772/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 02/10] libgcrypt: solve CVE-2021-33560 and CVE-2021-40528

[Steve Sakoman]

From: Marta Rybczynska 

This change fixes patches for two issues reported in a research
paper [1]: a side channel attack (*) and a cross-configuration
attack (**).

In this commit we add a fix for (*) that wasn't marked as a CVE
initially upstream. A fix of (**) previosly available in OE
backports is in fact fixing CVE-2021-40528, not CVE-2021-33560
as marked in the commit message.

We commit the accual fix for CVE-2021-33560 and rename the
existing fix with the correct CVE-2021-40528.

For details of the mismatch and the timeline see [2] (fix of the
documentation) and [3] (the related ticket upstream).

[1] https://eprint.iacr.org/2021/923.pdf
[2] https://dev.gnupg.org/rCb118681ebc4c9ea4b9da79b0f9541405a64f4c13
[3] https://dev.gnupg.org/T5328#149606

Signed-off-by: Marta Rybczynska 
Signed-off-by: Steve Sakoman 
---
 .../libgcrypt/files/CVE-2021-33560.patch  | 138 +++---
 .../libgcrypt/files/CVE-2021-40528.patch  | 109 ++
 .../libgcrypt/libgcrypt_1.8.5.bb  |   1 +
 3 files changed, 163 insertions(+), 85 deletions(-)
 create mode 100644 meta/recipes-support/libgcrypt/files/CVE-2021-40528.patch

diff --git a/meta/recipes-support/libgcrypt/files/CVE-2021-33560.patch 
b/meta/recipes-support/libgcrypt/files/CVE-2021-33560.patch
index c0d00485e6..bf26486d8b 100644
--- a/meta/recipes-support/libgcrypt/files/CVE-2021-33560.patch
+++ b/meta/recipes-support/libgcrypt/files/CVE-2021-33560.patch
@@ -1,109 +1,77 @@
-From 707c3c5c511ee70ad0e39ec613471f665305fbea Mon Sep 17 00:00:00 2001
+From e8b7f10be275bcedb5fc05ed4837a89bfd605c61 Mon Sep 17 00:00:00 2001
 From: NIIBE Yutaka 
-Date: Fri, 21 May 2021 11:15:07 +0900
-Subject: [PATCH] cipher: Fix ElGamal encryption for other implementations.
+Date: Tue, 13 Apr 2021 10:00:00 +0900
+Subject: [PATCH] cipher: Hardening ElGamal by introducing exponent blinding
+ too.
 
-* cipher/elgamal.c (gen_k): Remove support of smaller K.
-(do_encrypt): Never use smaller K.
-(sign): Folllow the change of gen_k.
+* cipher/elgamal.c (do_encrypt): Also do exponent blinding.
 
 --
 
-Cherry-pick master commit of:
-   632d80ef30e13de6926d503aa697f92b5dbfbc5e
+Base blinding had been introduced with USE_BLINDING.  This patch add
+exponent blinding as well to mitigate side-channel attack on mpi_powm.
 
-This change basically reverts encryption changes in two commits:
-
-   74386120dad6b3da62db37f7044267c8ef34689b
-   78531373a342aeb847950f404343a05e36022065
-
-Use of smaller K for ephemeral key in ElGamal encryption is only good,
-when we can guarantee that recipient's key is generated by our
-implementation (or compatible).
-
-For detail, please see:
-
-Luca De Feo, Bertram Poettering, Alessandro Sorniotti,
-"On the (in)security of ElGamal in OpenPGP";
-in the proceedings of  CCS'2021.
-
-CVE-id: CVE-2021-33560
 GnuPG-bug-id: 5328
-Suggested-by: Luca De Feo, Bertram Poettering, Alessandro Sorniotti
 Signed-off-by: NIIBE Yutaka 
 
 Upstream-Status: Backport
 CVE: CVE-2021-33560
-Signed-off-by: Armin Kuster 
+Signed-off-by: Marta Rybczynska 
 ---
- cipher/elgamal.c | 24 ++--
- 1 file changed, 6 insertions(+), 18 deletions(-)
+ cipher/elgamal.c | 20 +---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
 
 diff --git a/cipher/elgamal.c b/cipher/elgamal.c
-index 4eb52d62..ae7a631e 100644
+index 4eb52d62..9835122f 100644
 --- a/cipher/elgamal.c
 +++ b/cipher/elgamal.c
-@@ -66,7 +66,7 @@ static const char *elg_names[] =
- 
+@@ -522,8 +522,9 @@ do_encrypt(gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, 
ELG_public_key *pkey )
+ static void
+ decrypt (gcry_mpi_t output, gcry_mpi_t a, gcry_mpi_t b, ELG_secret_key *skey )
+ {
+-  gcry_mpi_t t1, t2, r;
++  gcry_mpi_t t1, t2, r, r1, h;
+   unsigned int nbits = mpi_get_nbits (skey->p);
++  gcry_mpi_t x_blind;
  
- static int test_keys (ELG_secret_key *sk, unsigned int nbits, int nodie);
--static gcry_mpi_t gen_k (gcry_mpi_t p, int small_k);
-+static gcry_mpi_t gen_k (gcry_mpi_t p);
- static gcry_err_code_t generate (ELG_secret_key *sk, unsigned nbits,
-  gcry_mpi_t **factors);
- static int  check_secret_key (ELG_secret_key *sk);
-@@ -189,11 +189,10 @@ test_keys ( ELG_secret_key *sk, unsigned int nbits, int 
nodie )
+   mpi_normalize (a);
+   mpi_normalize (b);
+@@ -534,20 +535,33 @@ decrypt (gcry_mpi_t output, gcry_mpi_t a, gcry_mpi_t b, 
ELG_secret_key *skey )
  
- /
-  * Generate a random secret exponent k from prime p, so that k is
-- * relatively prime to p-1.  With SMALL_K set, k will be selected for
-- * better encryption performance - this must never be used signing!
-+ * relatively prime to p-1.
-  */
- static gcry_mpi_t
--gen_k( gcry_mpi_t p, int small_k )
-+gen_k( gcry_mpi_t p )
- {
-   gcry_mpi_t k = mpi_alloc_secure( 0 );
-   gcry_mpi_t temp = mpi_alloc( mpi_get_nlimbs(p) );
-@@ -202,18 +201,7 @@ gen_k( gcry_mpi_t p, int small_k )
-   unsigned int nbits, nbytes;
-   char *rndbuf = NULL;
+   t2 = 

[OE-core][dunfell 01/10] cve-extra-exclusions: add db CVEs to exclusion list

[Steve Sakoman]

Since Oracle relicensed bdb, the open source community is slowly but surely 
replacing bdb with
supported and open source friendly alternatives. As a result these CVEs are 
unlikely to ever be fixed.

Signed-off-by: Steve Sakoman 
Signed-off-by: Richard Purdie 
(cherry picked from commit 679fc70f907fb221f4541ebf30c1610e937209b7)
Signed-off-by: Steve Sakoman 
---
 meta/conf/distro/include/cve-extra-exclusions.inc | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/cve-extra-exclusions.inc 
b/meta/conf/distro/include/cve-extra-exclusions.inc
index a6f52b5de7..e02a4d1fde 100644
--- a/meta/conf/distro/include/cve-extra-exclusions.inc
+++ b/meta/conf/distro/include/cve-extra-exclusions.inc
@@ -44,7 +44,14 @@ CVE_CHECK_WHITELIST += "CVE-2010-4756"
 # exposing this interface in an exploitable way
 CVE_CHECK_WHITELIST += "CVE-2020-29509 CVE-2020-29511"
 
-
+# db
+# Since Oracle relicensed bdb, the open source community is slowly but surely 
replacing bdb with
+# supported and open source friendly alternatives. As a result these CVEs are 
unlikely to ever be fixed.
+CVE_CHECK_WHITELIST += "CVE-2015-2583 CVE-2015-2624 CVE-2015-2626 
CVE-2015-2640 CVE-2015-2654 \
+CVE-2015-2656 CVE-2015-4754 CVE-2015-4764 CVE-2015-4774 CVE-2015-4775 
CVE-2015-4776 CVE-2015-4777 \
+CVE-2015-4778 CVE-2015-4779 CVE-2015-4780 CVE-2015-4781 CVE-2015-4782 
CVE-2015-4783 CVE-2015-4784 \
+CVE-2015-4785 CVE-2015-4786 CVE-2015-4787 CVE-2015-4788 CVE-2015-4789 
CVE-2015-4790 CVE-2016-0682 \
+CVE-2016-0689 CVE-2016-0692 CVE-2016-0694 CVE-2016-3418 CVE-2020-2981"
 
  CPE update pending 
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159644): 
https://lists.openembedded.org/g/openembedded-core/message/159644
Mute This Topic: https://lists.openembedded.org/mt/8765/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core][dunfell 00/10] Patch review

[Steve Sakoman]

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

Passed a-full on autobuilder:

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

with the exception of a known autobuilder intermittent issue which passed 
on subsequent retest:

https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/2924

The following changes since commit f788765e1b9832d0da8ec4ce49aa85864b0e:

  README.OE-Core.md: update URLs (2021-12-06 04:48:48 -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

Andrey Zhizhikin (1):
  lttng-modules: do not search in non-existing folder during install

Markus Volk (1):
  wic:direct.py: ignore invalid mountpoints during fstab update

Marta Rybczynska (1):
  libgcrypt: solve CVE-2021-33560 and CVE-2021-40528

Richard Purdie (1):
  gcc: Add CVE-2021-37322 to the list of CVEs to ignore

Ross Burton (1):
  runqemu: check the qemu PID has been set before kill()ing it

Sana Kazi (1):
  busybox: Fix multiple security issues in awk

Stefan Herbrechtsmeier (2):
  recipetool: Set master branch only as fallback
  selftest/devtool: Check branch in git fetch

Steve Sakoman (2):
  cve-extra-exclusions: add db CVEs to exclusion list
  selftest: skip virgl test on centos 8 entirely

 .../distro/include/cve-extra-exclusions.inc   |   9 +-
 meta/lib/oeqa/selftest/cases/devtool.py   |   5 +-
 meta/lib/oeqa/selftest/cases/runtime_test.py  |   2 +
 meta/recipes-core/busybox/busybox_1.31.1.bb   |   1 +
 .../busybox/files/CVE-2021-423xx-awk.patch| 215 ++
 meta/recipes-devtools/gcc/gcc-9.3.inc |   3 +
 .../lttng/lttng-modules_2.11.6.bb |   4 +-
 .../libgcrypt/files/CVE-2021-33560.patch  | 138 +--
 .../libgcrypt/files/CVE-2021-40528.patch  | 109 +
 .../libgcrypt/libgcrypt_1.8.5.bb  |   1 +
 scripts/lib/recipetool/create.py  |  15 +-
 scripts/lib/wic/plugins/imager/direct.py  |   2 +-
 scripts/runqemu   |   3 +-
 13 files changed, 408 insertions(+), 99 deletions(-)
 create mode 100644 meta/recipes-core/busybox/files/CVE-2021-423xx-awk.patch
 create mode 100644 meta/recipes-support/libgcrypt/files/CVE-2021-40528.patch

-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159643): 
https://lists.openembedded.org/g/openembedded-core/message/159643
Mute This Topic: https://lists.openembedded.org/mt/8763/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [RFC PATCH v2 1/3] recipetool: Separate licenses with & operator

[Stefan Herbrechtsmeier]

From: Stefan Herbrechtsmeier 

Separate licenses with & operator since it should be satisfied most use
cases and it is a reasonable assumption that all the licenses apply.
Furthermore flat, split and sort the licenses to minimize license string
changes.

Separate package licenses with & operator:
-LICENSE:${PN} = "MIT ISC"
+LICENSE:${PN} = "ISC & MIT"

Respect | and brackets in LICENSE:
-LICENSE = "BSD-3-Clause & (ISC & | & MIT)"
+LICENSE = "BSD-3-Clause & (ISC | MIT)"

Sort licenses:
-LICENSE = "MIT & BSD-3-Clause & ISC"
+LICENSE = "BSD-3-Clause & ISC & MIT"

Remove duplicates:
-LICENSE = "MIT & ISC & MIT"
+LICENSE = "ISC & MIT"

Signed-off-by: Stefan Herbrechtsmeier 
---

(no changes since v1)

 meta/lib/oeqa/selftest/cases/recipetool.py |  4 +--
 scripts/lib/recipetool/create.py   | 39 +-
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 439e41597c..95e4753976 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -426,7 +426,7 @@ class RecipetoolCreateTests(RecipetoolBase):
 checkvars = {}
 checkvars['SUMMARY'] = 'Node Server Example'
 checkvars['HOMEPAGE'] = 
'https://github.com/savoirfairelinux/node-server-example#readme'
-checkvars['LICENSE'] = set(['MIT', 'ISC', 'Unknown'])
+checkvars['LICENSE'] = 'BSD-3-Clause & ISC & MIT & Unknown'
 urls = []
 
urls.append('npm://registry.npmjs.org/;package=@savoirfairelinux/node-server-example;version=${PV}')
 urls.append('npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json')
@@ -483,7 +483,7 @@ class RecipetoolCreateTests(RecipetoolBase):
 result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri))
 self.assertTrue(os.path.isfile(recipefile))
 checkvars = {}
-checkvars['LICENSE'] = set(['PSF', '&', 'BSD-3-Clause', 'GPL'])
+checkvars['LICENSE'] = 'BSD-3-Clause & GPL & PSF'
 checkvars['LIC_FILES_CHKSUM'] = 
'file://COPYING.txt;md5=35a23d42b615470583563132872c97d6'
 checkvars['SRC_URI'] = 
'https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-${PV}.tar.gz'
 checkvars['SRC_URI[md5sum]'] = 'c53768d63db3873b7d452833553469de'
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 406c97f1c5..8e8a621b4f 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -919,6 +919,22 @@ def split_value(value):
 else:
 return value
 
+def fixup_license(value):
+# Ensure licenses with OR starts and ends with brackets
+if '|' in value:
+return '(' + value + ')'
+return value
+
+def tidy_licenses(value):
+"""Flat, split and sort licenses"""
+from oe.license import flattened_licenses
+def _choose(a, b):
+str_a, str_b  = sorted((" & ".join(a), " & ".join(b)), 
key=str.casefold)
+return ["(%s | %s)" % (str_a, str_b)]
+if not isinstance(value, str):
+value = " & ".join(value)
+return sorted(list(set(flattened_licenses(value, _choose))), 
key=str.casefold)
+
 def handle_license_vars(srctree, lines_before, handled, extravalues, d):
 lichandled = [x for x in handled if x[0] == 'license']
 if lichandled:
@@ -932,10 +948,13 @@ def handle_license_vars(srctree, lines_before, handled, 
extravalues, d):
 lines = []
 if licvalues:
 for licvalue in licvalues:
-if not licvalue[0] in licenses:
-licenses.append(licvalue[0])
+license = licvalue[0]
+lics = tidy_licenses(fixup_license(license))
+lics = [lic for lic in lics if lic not in licenses]
+if len(lics):
+licenses.extend(lics)
 lic_files_chksum.append('file://%s;md5=%s' % (licvalue[1], 
licvalue[2]))
-if licvalue[0] == 'Unknown':
+if license == 'Unknown':
 lic_unknown.append(licvalue[1])
 if lic_unknown:
 lines.append('#')
@@ -944,9 +963,7 @@ def handle_license_vars(srctree, lines_before, handled, 
extravalues, d):
 for licfile in lic_unknown:
 lines.append('#   %s' % licfile)
 
-extra_license = split_value(extravalues.pop('LICENSE', []))
-if '&' in extra_license:
-extra_license.remove('&')
+extra_license = tidy_licenses(extravalues.pop('LICENSE', ''))
 if extra_license:
 if licenses == ['Unknown']:
 licenses = extra_license
@@ -987,7 +1004,7 @@ def handle_license_vars(srctree, lines_before, handled, 
extravalues, d):
 lines.append('# instead of &. If there is any doubt, check the 
accompanying documentation')
 lines.append('# to determine which situation is applicable.')
 
-lines.append('LICENSE = "%s"' % ' & '.join(licenses))
+lines.append('LICENSE = 

[OE-core] [RFC PATCH v2 3/3] selftest: recipetool: Add test for handle_license_vars function

[Stefan Herbrechtsmeier]

From: Stefan Herbrechtsmeier 

Signed-off-by: Stefan Herbrechtsmeier 
---

(no changes since v1)

 meta/lib/oeqa/selftest/cases/recipetool.py | 62 ++
 1 file changed, 62 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 1c73b2c5e0..5330d73cbf 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -592,6 +592,68 @@ class RecipetoolTests(RecipetoolBase):
 with open(srcfile, 'w') as fh:
 fh.writelines(plugincontent)
 
+def test_recipetool_handle_license_vars(self):
+from create import handle_license_vars
+from unittest.mock import Mock
+
+commonlicdir = get_bb_var('COMMON_LICENSE_DIR')
+
+d = bb.tinfoil.TinfoilDataStoreConnector
+d.getVar = Mock(return_value=commonlicdir)
+
+srctree = tempfile.mkdtemp(prefix='recipetoolqa')
+self.track_for_cleanup(srctree)
+
+# Multiple licenses
+licenses = ['MIT', 'ISC', 'BSD-3-Clause', 'Apache-2.0']
+for licence in licenses:
+shutil.copy(os.path.join(commonlicdir, licence), 
os.path.join(srctree, 'LICENSE.' + licence))
+# Duplicate license
+shutil.copy(os.path.join(commonlicdir, 'MIT'), os.path.join(srctree, 
'LICENSE'))
+
+extravalues = {
+# Duplicate and missing licenses
+'LICENSE': 'Zlib & BSD-2-Clause & Zlib',
+'LIC_FILES_CHKSUM': [
+'file://README.md;md5=0123456789abcdef0123456789abcd'
+]
+}
+lines_before = []
+handled = []
+licvalues = handle_license_vars(srctree, lines_before, handled, 
extravalues, d)
+expected_lines_before = [
+'# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are 
best guesses - it is',
+'# your responsibility to verify that the values are complete and 
correct.',
+'# NOTE: Original package / source metadata indicates license is: 
BSD-2-Clause & Zlib',
+'#',
+'# NOTE: multiple licenses have been detected; they have been 
separated with &',
+'# in the LICENSE value for now since it is a reasonable 
assumption that all',
+'# of the licenses apply. If instead there is a choice between the 
multiple',
+'# licenses then you should change the value to separate the 
licenses with |',
+'# instead of &. If there is any doubt, check the accompanying 
documentation',
+'# to determine which situation is applicable.',
+'LICENSE = "Apache-2.0 & BSD-2-Clause & BSD-3-Clause & ISC & MIT & 
Zlib"',
+'LIC_FILES_CHKSUM = 
"file://LICENSE;md5=0835ade698e0bcf8506ecda2f7b4f302 \\\n'
+'
file://LICENSE.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \\\n'
+'
file://LICENSE.ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d \\\n'
+'
file://LICENSE.Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \\\n'
+'
file://LICENSE.BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \\\n'
+'
file://README.md;md5=0123456789abcdef0123456789abcd"',
+''
+]
+self.assertEqual(lines_before, expected_lines_before)
+expected_licvalues = [
+('MIT', 'LICENSE', '0835ade698e0bcf8506ecda2f7b4f302'),
+('MIT', 'LICENSE.MIT', '0835ade698e0bcf8506ecda2f7b4f302'),
+('ISC', 'LICENSE.ISC', 'f3b90e78ea0cffb20bf5cca7947a896d'),
+('Apache-2.0', 'LICENSE.Apache-2.0', 
'89aea4e17d99a7cacdbeed46a0096b10'),
+('BSD-3-Clause', 'LICENSE.BSD-3-Clause', 
'550794465ba0ec5312d6919e203a55f9')
+]
+self.assertEqual(handled, [('license', expected_licvalues)])
+self.assertEqual(extravalues, {})
+self.assertEqual(licvalues, expected_licvalues)
+
+
 def test_recipetool_split_pkg_licenses(self):
 from create import split_pkg_licenses
 licvalues = [
-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159642): 
https://lists.openembedded.org/g/openembedded-core/message/159642
Mute This Topic: https://lists.openembedded.org/mt/87699203/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [RFC PATCH v2 2/3] selftest: recipetool: Add test for split_pkg_licenses function

[Stefan Herbrechtsmeier]

From: Stefan Herbrechtsmeier 

Signed-off-by: Stefan Herbrechtsmeier 
---

(no changes since v1)

 meta/lib/oeqa/selftest/cases/recipetool.py | 64 ++
 1 file changed, 64 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 95e4753976..1c73b2c5e0 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -541,9 +541,13 @@ class RecipetoolTests(RecipetoolBase):
 
 @classmethod
 def setUpClass(cls):
+import sys
+
 super(RecipetoolTests, cls).setUpClass()
 bb_vars = get_bb_vars(['BBPATH'])
 cls.bbpath = bb_vars['BBPATH']
+libpath = os.path.join(get_bb_var('COREBASE'), 'scripts', 'lib', 
'recipetool')
+sys.path.insert(0, libpath)
 
 def _copy_file_with_cleanup(self, srcfile, basedstdir, *paths):
 dstdir = basedstdir
@@ -588,6 +592,66 @@ class RecipetoolTests(RecipetoolBase):
 with open(srcfile, 'w') as fh:
 fh.writelines(plugincontent)
 
+def test_recipetool_split_pkg_licenses(self):
+from create import split_pkg_licenses
+licvalues = [
+# Duplicate licenses
+('BSD-2-Clause', 'x/COPYING', None),
+('BSD-2-Clause', 'x/LICENSE', None),
+# Multiple licenses
+('MIT', 'x/a/LICENSE.MIT', None),
+('ISC', 'x/a/LICENSE.ISC', None),
+# Alternative licenses
+('(MIT | ISC)', 'x/b/LICENSE', None),
+# Alternative licenses without brackets
+('MIT | BSD-2-Clause', 'x/c/LICENSE', None),
+# Multi licenses with alternatives
+('MIT', 'x/d/COPYING', None),
+('MIT | BSD-2-Clause', 'x/d/LICENSE', None),
+# Multi licenses with alternatives and brackets
+('Apache-2.0 & ((MIT | ISC) & BSD-3-Clause)', 'x/e/LICENSE', None)
+]
+packages = {
+'${PN}': '',
+'a': 'x/a',
+'b': 'x/b',
+'c': 'x/c',
+'d': 'x/d',
+'e': 'x/e',
+'f': 'x/f',
+'g': 'x/g',
+}
+fallback_licenses = {
+# Ignored
+'a': 'BSD-3-Clause',
+# Used
+'f': 'BSD-3-Clause'
+}
+outlines = []
+outlicenses = split_pkg_licenses(licvalues, packages, outlines, 
fallback_licenses)
+expected_outlicenses = {
+'${PN}': ['BSD-2-Clause'],
+'a': ['ISC', 'MIT'],
+'b': ['(ISC | MIT)'],
+'c': ['(BSD-2-Clause | MIT)'],
+'d': ['(BSD-2-Clause | MIT)', 'MIT'],
+'e': ['(ISC | MIT)', 'Apache-2.0', 'BSD-3-Clause'],
+'f': ['BSD-3-Clause'],
+'g': ['Unknown']
+}
+self.assertEqual(outlicenses, expected_outlicenses)
+expected_outlines = [
+'LICENSE:${PN} = "BSD-2-Clause"',
+'LICENSE:a = "ISC & MIT"',
+'LICENSE:b = "(ISC | MIT)"',
+'LICENSE:c = "(BSD-2-Clause | MIT)"',
+'LICENSE:d = "(BSD-2-Clause | MIT) & MIT"',
+'LICENSE:e = "(ISC | MIT) & Apache-2.0 & BSD-3-Clause"',
+'LICENSE:f = "BSD-3-Clause"',
+'LICENSE:g = "Unknown"'
+]
+self.assertEqual(outlines, expected_outlines)
+
 
 class RecipetoolAppendsrcBase(RecipetoolBase):
 def _try_recipetool_appendsrcfile(self, testrecipe, newfile, destfile, 
options, expectedlines, expectedfiles):
-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159640): 
https://lists.openembedded.org/g/openembedded-core/message/159640
Mute This Topic: https://lists.openembedded.org/mt/87699201/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] libcap: upgrade 2.61 -> 2.62

[Alexander Kanavin]

No need to remove: it can be replaced with USE_GPERF, as the error message
is saying.

Alex

On Mon, 13 Dec 2021 at 14:20, wangmy  wrote:

> Remove set of BUILD_GPERF since it is now reserved.
>
> Signed-off-by: Wang Mingyu 
> ---
>  meta/recipes-support/libcap/{libcap_2.61.bb => libcap_2.62.bb} | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>  rename meta/recipes-support/libcap/{libcap_2.61.bb => libcap_2.62.bb}
> (95%)
>
> diff --git a/meta/recipes-support/libcap/libcap_2.61.bb
> b/meta/recipes-support/libcap/libcap_2.62.bb
> similarity index 95%
> rename from meta/recipes-support/libcap/libcap_2.61.bb
> rename to meta/recipes-support/libcap/libcap_2.62.bb
> index a3a6e10b89..7492ad816d 100644
> --- a/meta/recipes-support/libcap/libcap_2.61.bb
> +++ b/meta/recipes-support/libcap/libcap_2.62.bb
> @@ -16,7 +16,7 @@ SRC_URI =
> "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
>  SRC_URI:append:class-nativesdk = " \
>
> file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \
> "
> -SRC_URI[sha256sum] =
> "c1e29680f8bcc51b172e9a8eb9a7a4d7255a00a14301a7c2cf96d1febf7449a5"
> +SRC_URI[sha256sum] =
> "190c5baac9bee06a129eae20d3e827de62f664fe3507f0bf6c50a9a59fbd83a2"
>
>  UPSTREAM_CHECK_URI = "
> https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/;
>
> @@ -32,7 +32,6 @@ EXTRA_OEMAKE = " \
>lib='${baselib}' \
>RAISE_SETFCAP=no \
>DYNAMIC=yes \
> -  BUILD_GPERF=yes \
>  "
>
>  EXTRA_OEMAKE:append:class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}"
> --
> 2.25.1
>
>
> 
>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159639): 
https://lists.openembedded.org/g/openembedded-core/message/159639
Mute This Topic: https://lists.openembedded.org/mt/87697026/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] The state of DKMS in the Yocto community

[Richard Purdie]

On Fri, 2021-12-10 at 14:58 -0600, Alex Stewart wrote:
> Hey List,
> 
> I'm trying to work out the mysterious state of DKMS in OE-Core.
> 
> Our (NI) OE distributions rely heavily on DKMS to (un)install our 
> ecosystem of kernel drivers at runtime across our product lines. To 
> facilitate that, we authored a dkms_2.4.0.bb recipe [1] back in 2017, 
> which we have carried out-of-stream since.
> 
> We tried to upstream it, and the patched rev'ed a couple of times [2]; 
> but it seems to have never made it into a yocto release.
> 
> Though some other recipes mention DKMS passingly, I don't see anywhere 
> that OE-Core officially supports it. Nor does my googling reveal anyone 
> else who uses DKMS. I find that a little hard to believe, though I 
> understand that it's probably relatively rare in the embedded space.
> 
> 
> @all
> So does anyone else on the list use DKMS in their yocto distribution? 
> Are you maintaining a DKMS recipe out-of-stream as well?
> 
> 
> @maintainers
> If NI upgraded our DKMS recipe to a more recent version than 2.4.0 and 
> submitted it again to OE-Core, would you accept it? If not, we will move 
> it to our own meta layer and accept that we are unique in this regard.
> 
> 
> [1] 
> https://github.com/ni/openembedded-core/commit/5789a27b68d95f3840bb8c4cb0d7b28d538c9a50
> 
> [2] https://lists.openembedded.org/g/openembedded-core/message/100680

Speaking for OE-Core, I don't think DKMS belongs there. I must admit I'd
forgotten what it was at first but then the memories came back.

I realise why it exists but it doesn't really model best practises or encourages
the behaviour we ideally want to see so I don't think it is a good fit for core.

Whether it might be accepted or makes sense elsewhere isn't for me to say.

Cheers,

Richard


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159638): 
https://lists.openembedded.org/g/openembedded-core/message/159638
Mute This Topic: https://lists.openembedded.org/mt/87645999/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] The state of DKMS in the Yocto community

[Bruce Ashfield]

On Mon, Dec 13, 2021 at 7:28 AM Alex Stewart  wrote:
>
> On 12/11/21 09:24, Bruce Ashfield wrote:
> > On Fri, Dec 10, 2021 at 3:58 PM Alex Stewart  wrote:
> >> Hey List,
> >>
> >> I'm trying to work out the mysterious state of DKMS in OE-Core.
> >>
> >> Our (NI) OE distributions rely heavily on DKMS to (un)install our
> >> ecosystem of kernel drivers at runtime across our product lines. To
> >> facilitate that, we authored a dkms_2.4.0.bb recipe [1] back in 2017,
> >> which we have carried out-of-stream since.
> >>
> >> We tried to upstream it, and the patched rev'ed a couple of times [2];
> >> but it seems to have never made it into a yocto release.
> >>
> >> Though some other recipes mention DKMS passingly, I don't see anywhere
> >> that OE-Core officially supports it. Nor does my googling reveal anyone
> >> else who uses DKMS. I find that a little hard to believe, though I
> >> understand that it's probably relatively rare in the embedded space.
> >>
> >>
> >> @all
> >> So does anyone else on the list use DKMS in their yocto distribution?
> >> Are you maintaining a DKMS recipe out-of-stream as well?
> >>
> >>
> >> @maintainers
> >> If NI upgraded our DKMS recipe to a more recent version than 2.4.0 and
> >> submitted it again to OE-Core, would you accept it? If not, we will move
> >> it to our own meta layer and accept that we are unique in this regard.
> > I used to have a DKMS recipe myself (at my previous employer), but
> > never submitted it, because generally speaking, there are better ways
> > to do things in OE.
> >
> > DKMS tends to avoid proper cross compilation (which of course we
> > already do), or is often used to distribute proprietary code (which we
> > don't want to encourage), or is avoiding the need to upstream the
> > module code (which we also don't want to encourage).  It also only
> > tends to be used on a subset of the architectures that have enough
> > memory/cpu to build on target, so by definition it is a bit more
> > niche.
>
> Yeah; I agree. In our case, we have several dozen drivers split across
> many product teams and largely distributing internally-controlled
> source. At this stage, it isn't feasible for us to build them all within
> OE - which is unfortunate.
>
> Many of those drivers are also required to support both our OE
> distribution, as well as a small matrix of supported generic Linux
> desktop OSes. So having them manage their own DKMS packages reduces the
> surface area for packaging errors.
>
> I don't expect that either of those considerations is common in the OE
> community.
>
> > We of course already have the ability to build modules on the target
> > (we have a test case in core that does just that), so what is in core
> > can support what DKMS needs to build on target.
>
> I'm not sure which test case you're referencing, do you have a link or
> could you expand on what you mean?

I was just referring to the kernel-devsrc package, and that it supports
both eSDK and on-target compilation of kernel modules. We have a
hello-mod that is part of the oe-tests (it is copied to the target, built
and insmod'd).

So we know that the actual build will work on the target and that all
the dependencies are in place. We just don't have any wrapping
framework around the build.

Cheers,

Bruce

>
> > I don't see this as something that makes sense in oe-core (but maybe
> > I'm not fully understanding the case, and where the current support is
> > failing), but could of course be contributed to another layer.
>
> That's fair. Our use case is motivated more by an organizational failure
> than a failure of the OE tooling.
>
>
> @Khem
> You're maintaining the meta-oe layer; correct? Do you have any interest
> in a DKMS recipe?
>
> Thanks,
>
> --
> Alex Stewart
> Software Engineer - NI Real-Time OS
> NI (National Instruments)
>
> alex.stew...@ni.com
>
>
> 
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159637): 
https://lists.openembedded.org/g/openembedded-core/message/159637
Mute This Topic: https://lists.openembedded.org/mt/87645999/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [PATCH] [OE-core] [PATCH] less: upgrade 590 -> 598

[Konrad Weihmann]

On 13.12.21 23:30, zhengruoqin wrote:

Changelog between version 590 and version 598:
=
Add the --header option.
Add the --no-number-headers option.
Add the --status-line option.
Add the --redraw-on-quit option.
Add the --search-options option.
Add 'H' color type to set color of header lines.
Add #version conditional to lesskey.
Add += syntax to variable section in lesskey files.
Allow option name in -- command to end with '=' in addition to '\n'.
Add $HOME/.config to possible locations of lesskey file.
Add $XDG_STATE_HOME and $HOME/.local/state to possible locations of history 
file.
Don't read or write history file in secure mode.
Fix display of multibyte and double-width chars in prompt.
Fix ESC-BACKSPACE command when BACKSPACE key does not send 0x08.
Add more \k codes to lesskey format.
Fix bug when empty file is modified while viewing it.
Fix bug when parsing a malformed lesskey file.
Fix bug scrolling history when --incsearch is set.
Fix buffer overflow when invoking lessecho with more than 63 -m/-n options.
Fix display bugs with --header.
Fix bug restoring color at end of highlighted text.
Fix bug in parsing lesskey file.

Signed-off-by: Zheng Ruoqin 
---
  meta/recipes-extended/less/{less_590.bb => less_598.bb} | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
  rename meta/recipes-extended/less/{less_590.bb => less_598.bb} (87%)

diff --git a/meta/recipes-extended/less/less_590.bb 
b/meta/recipes-extended/less/less_598.bb
similarity index 87%
rename from meta/recipes-extended/less/less_590.bb
rename to meta/recipes-extended/less/less_598.bb
index 5d0d0a5afe..574efff365 100644
--- a/meta/recipes-extended/less/less_590.bb
+++ b/meta/recipes-extended/less/less_598.bb
@@ -20,7 +20,7 @@ SECTION = "console/utils"
  #
  
  LICENSE = "GPLv3+ | BSD-2-Clause"

-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \


Could you please highlight why the LICENSE checksum changed as part of 
the commit message - apart from that thanks for the changelog, which is 
indeed very helpful



  file://LICENSE;md5=ba01d0cab7f62f7f2204c7780ff6a87d \
  "
  DEPENDS = "ncurses"
@@ -28,7 +28,7 @@ DEPENDS = "ncurses"
  SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
  "
  
-SRC_URI[sha256sum] = "6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10"

+SRC_URI[sha256sum] = 
"64e0eb24534ac70d15ff3a36c8853f7a48196aa230d2a104707fc4ff1a45e982"
  
  UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html;
  







-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159636): 
https://lists.openembedded.org/g/openembedded-core/message/159636
Mute This Topic: https://lists.openembedded.org/mt/87697195/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] rt-tests: upgrade 2.2 -> 2.3

[zhengruoqin]

Signed-off-by: Zheng Ruoqin 
---
 .../0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch  | 2 +-
 meta/recipes-rt/rt-tests/rt-tests.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
 
b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
index 1e8ff4619b..43c2a2f33b 100644
--- 
a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
+++ 
b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
@@ -19,7 +19,7 @@ index ec5d693..ab8a8de 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,6 +1,6 @@
- VERSION = 2.2
+ VERSION = 2.3
 -CC = $(CROSS_COMPILE)gcc
 -AR = $(CROSS_COMPILE)ar
 +CC ?= $(CROSS_COMPILE)gcc
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc 
b/meta/recipes-rt/rt-tests/rt-tests.inc
index 71227307c3..e519dfdc61 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,5 +1,5 @@
-SRCREV = "75c16956e32817dfb0d5cb7379e731061e16593f"
-PV = "2.2"
+SRCREV = "338843c1ee157ae5d990c6f544f66b447b24fa8b"
+PV = "2.3"
 PE = "1"
 
 SRC_URI = 
"git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main"
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159635): 
https://lists.openembedded.org/g/openembedded-core/message/159635
Mute This Topic: https://lists.openembedded.org/mt/87697213/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] vte: upgrade 0.66.0 -> 0.66.2

[zhengruoqin]

Signed-off-by: Zheng Ruoqin 
---
 meta/recipes-support/vte/{vte_0.66.0.bb => vte_0.66.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/vte/{vte_0.66.0.bb => vte_0.66.2.bb} (95%)

diff --git a/meta/recipes-support/vte/vte_0.66.0.bb 
b/meta/recipes-support/vte/vte_0.66.2.bb
similarity index 95%
rename from meta/recipes-support/vte/vte_0.66.0.bb
rename to meta/recipes-support/vte/vte_0.66.2.bb
index 6676b7feeb..86674cc939 100644
--- a/meta/recipes-support/vte/vte_0.66.0.bb
+++ b/meta/recipes-support/vte/vte_0.66.2.bb
@@ -21,7 +21,7 @@ inherit gnomebase gtk-doc features_check 
upstream-version-is-even gobject-intros
 # vapigen.m4 is required when vala is not present (but the one from vala 
should be used normally)
 SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
 
file://0001-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch"
-SRC_URI[archive.sha256sum] = 
"d0813ac00fb1d74d88851e765f755d496c83e097097358ea1baadb38b37b7b33"
+SRC_URI[archive.sha256sum] = 
"e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159634): 
https://lists.openembedded.org/g/openembedded-core/message/159634
Mute This Topic: https://lists.openembedded.org/mt/87697209/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] stress-ng: upgrade 0.13.07 -> 0.13.08

[zhengruoqin]

0001-Do-not-preserve-ownership-when-installing-example-jo.patch
removed since it is included in 0.13.08

Signed-off-by: Zheng Ruoqin 
---
 ...ownership-when-installing-example-jo.patch | 24 ---
 ...ess-ng_0.13.07.bb => stress-ng_0.13.08.bb} |  6 ++---
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 
meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
 rename meta/recipes-extended/stress-ng/{stress-ng_0.13.07.bb => 
stress-ng_0.13.08.bb} (80%)

diff --git 
a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
 
b/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
deleted file mode 100644
index 107b83d20b..00
--- 
a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f14d9d8184753dfbff99d7a51939145355627dcd Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin 
-Date: Tue, 30 Jul 2019 18:38:03 +0200
-Subject: [PATCH] Do not preserve ownership when installing example jobs
-
-Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/162]
-Signed-off-by: Alexander Kanavin 
-

- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 91d8ed4..72d0ca0 100644
 a/Makefile
-+++ b/Makefile
-@@ -502,6 +502,6 @@ else
-   cp stress-ng.1 ${DESTDIR}${MANDIR}
- endif
-   mkdir -p ${DESTDIR}${JOBDIR}
--  cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
-+  cp -r example-jobs/*.job ${DESTDIR}${JOBDIR}
-   mkdir -p ${DESTDIR}${BASHDIR}
-   cp bash-completion/stress-ng ${DESTDIR}${BASHDIR}
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.13.07.bb 
b/meta/recipes-extended/stress-ng/stress-ng_0.13.08.bb
similarity index 80%
rename from meta/recipes-extended/stress-ng/stress-ng_0.13.07.bb
rename to meta/recipes-extended/stress-ng/stress-ng_0.13.08.bb
index b96d16fa7b..f7197a27fa 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.13.07.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.13.08.bb
@@ -5,10 +5,8 @@ HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme;
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = 
"git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \
-   
file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \
-   "
-SRCREV = "924a37f50f73207fa230ae27a63897c77ff8e6cc"
+SRC_URI = 
"git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master"
+SRCREV = "0af163e0e378e5c62abb9328a27b653289c05679"
 S = "${WORKDIR}/git"
 
 DEPENDS = "coreutils-native"
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159633): 
https://lists.openembedded.org/g/openembedded-core/message/159633
Mute This Topic: https://lists.openembedded.org/mt/87697198/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[PATCH] [OE-core] [PATCH] less: upgrade 590 -> 598

[zhengruoqin]

Changelog between version 590 and version 598:
=
Add the --header option.
Add the --no-number-headers option.
Add the --status-line option.
Add the --redraw-on-quit option.
Add the --search-options option.
Add 'H' color type to set color of header lines.
Add #version conditional to lesskey.
Add += syntax to variable section in lesskey files.
Allow option name in -- command to end with '=' in addition to '\n'.
Add $HOME/.config to possible locations of lesskey file.
Add $XDG_STATE_HOME and $HOME/.local/state to possible locations of history 
file.
Don't read or write history file in secure mode.
Fix display of multibyte and double-width chars in prompt.
Fix ESC-BACKSPACE command when BACKSPACE key does not send 0x08.
Add more \k codes to lesskey format.
Fix bug when empty file is modified while viewing it.
Fix bug when parsing a malformed lesskey file.
Fix bug scrolling history when --incsearch is set.
Fix buffer overflow when invoking lessecho with more than 63 -m/-n options.
Fix display bugs with --header.
Fix bug restoring color at end of highlighted text.
Fix bug in parsing lesskey file.

Signed-off-by: Zheng Ruoqin 
---
 meta/recipes-extended/less/{less_590.bb => less_598.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/less/{less_590.bb => less_598.bb} (87%)

diff --git a/meta/recipes-extended/less/less_590.bb 
b/meta/recipes-extended/less/less_598.bb
similarity index 87%
rename from meta/recipes-extended/less/less_590.bb
rename to meta/recipes-extended/less/less_598.bb
index 5d0d0a5afe..574efff365 100644
--- a/meta/recipes-extended/less/less_590.bb
+++ b/meta/recipes-extended/less/less_598.bb
@@ -20,7 +20,7 @@ SECTION = "console/utils"
 #
 
 LICENSE = "GPLv3+ | BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
 file://LICENSE;md5=ba01d0cab7f62f7f2204c7780ff6a87d \
 "
 DEPENDS = "ncurses"
@@ -28,7 +28,7 @@ DEPENDS = "ncurses"
 SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
  "
 
-SRC_URI[sha256sum] = 
"6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10"
+SRC_URI[sha256sum] = 
"64e0eb24534ac70d15ff3a36c8853f7a48196aa230d2a104707fc4ff1a45e982"
 
 UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html;
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159632): 
https://lists.openembedded.org/g/openembedded-core/message/159632
Mute This Topic: https://lists.openembedded.org/mt/87697195/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] glib-networking: upgrade 2.70.0 -> 2.70.1

[zhengruoqin]

Changelog:

 - Fix crashes when handshake is cancelled (#97, #176)
 - OpenSSL: fix spurious certificate expired verification errors (#179)
 - GnuTLS: Fix tests on 32-bit systems (!188, Simon McVittie)
 - GnuTLS: Fix crash when invalid priority string is forced (!189)

Signed-off-by: Zheng Ruoqin 
---
 .../{glib-networking_2.70.0.bb => glib-networking_2.70.1.bb}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/glib-networking/{glib-networking_2.70.0.bb => 
glib-networking_2.70.1.bb} (93%)

diff --git a/meta/recipes-core/glib-networking/glib-networking_2.70.0.bb 
b/meta/recipes-core/glib-networking/glib-networking_2.70.1.bb
similarity index 93%
rename from meta/recipes-core/glib-networking/glib-networking_2.70.0.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.70.1.bb
index fc700e03b7..f020e16068 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.70.0.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.70.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SECTION = "libs"
 DEPENDS = "glib-2.0"
 
-SRC_URI[archive.sha256sum] = 
"66b408e7afa86c582fe38963db56133869ab4b57d34e48ec56aba621940d6f35"
+SRC_URI[archive.sha256sum] = 
"2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc"
 
 PACKAGECONFIG ??= "openssl ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', 
'', d)}"
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159631): 
https://lists.openembedded.org/g/openembedded-core/message/159631
Mute This Topic: https://lists.openembedded.org/mt/87697187/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] mpg123: upgrade 1.29.2 -> 1.29.3

[wangmy]

Changelog:

libmpg123: Catch more NULL pointer arguments in LFS wrappers
(most prominently: mpg123_feedseek(), bug 328).

mpg123:
-Fix regression that did _not_ enable --remote-err on -s anymore.
-Fix typos in man page.
-Drop mixed-up value limits on remote control SEQ command.
 It is up to you if you want to distort your sound.
-Add note about equalizer frequency bands to man page.
-build: add BUILD_PROGRAMS option to ports/cmake

Signed-off-by: Wang Mingyu 
---
 .../mpg123/{mpg123_1.29.2.bb => mpg123_1.29.3.bb}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.29.2.bb => mpg123_1.29.3.bb} 
(96%)

diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.29.2.bb 
b/meta/recipes-multimedia/mpg123/mpg123_1.29.3.bb
similarity index 96%
rename from meta/recipes-multimedia/mpg123/mpg123_1.29.2.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.29.3.bb
index ba09e1c619..6e0dc1beff 100644
--- a/meta/recipes-multimedia/mpg123/mpg123_1.29.2.bb
+++ b/meta/recipes-multimedia/mpg123/mpg123_1.29.3.bb
@@ -10,7 +10,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2;
-SRC_URI[sha256sum] = 
"9071214ebdfc1b6ed0c0a85d530010bbb8ebc044cfe5ae5930e83f7e6b7937e6"
+SRC_URI[sha256sum] = 
"963885d8cc77262f28b77187c7d189e32195e64244de2530b798ddf32183e847"
 
 UPSTREAM_CHECK_REGEX = "mpg123-(?P\d+(\.\d+)+)\.tar"
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159630): 
https://lists.openembedded.org/g/openembedded-core/message/159630
Mute This Topic: https://lists.openembedded.org/mt/87697028/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] libical: upgrade 3.0.11 -> 3.0.12

[wangmy]

Change log :
===
Fix a libicalval crash in cleanVObject
METHOD:DECLINECOUNTER must have DTEND or DURATION
Handle if DTEND and DURATION are both missing
Improved FindICU (copied from official CMake. see files in cmake/Kitware)
Buildsystem fixes (especially for the Ninja generator)
Built-in timezones updated to tzdata2021e

Signed-off-by: Wang Mingyu 
---
 .../libical/{libical_3.0.11.bb => libical_3.0.12.bb}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/libical/{libical_3.0.11.bb => libical_3.0.12.bb} 
(95%)

diff --git a/meta/recipes-support/libical/libical_3.0.11.bb 
b/meta/recipes-support/libical/libical_3.0.12.bb
similarity index 95%
rename from meta/recipes-support/libical/libical_3.0.11.bb
rename to meta/recipes-support/libical/libical_3.0.12.bb
index b16081e9e2..fe5e58cbfb 100644
--- a/meta/recipes-support/libical/libical_3.0.11.bb
+++ b/meta/recipes-support/libical/libical_3.0.12.bb
@@ -14,7 +14,7 @@ SECTION = "libs"
 
 SRC_URI = 
"https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
 "
-SRC_URI[sha256sum] = 
"1e6c5e10c5a48f7a40c68958055f0e2759d9ab3563aca17273fe35a5df7dbbf1"
+SRC_URI[sha256sum] = 
"35095a4cc1a061a3de0f332c2dc728226cf127fa0baa818e9f8856cee6d35830"
 UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases;
 
 inherit cmake pkgconfig
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159629): 
https://lists.openembedded.org/g/openembedded-core/message/159629
Mute This Topic: https://lists.openembedded.org/mt/87697027/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] libcap: upgrade 2.61 -> 2.62

[wangmy]

Remove set of BUILD_GPERF since it is now reserved.

Signed-off-by: Wang Mingyu 
---
 meta/recipes-support/libcap/{libcap_2.61.bb => libcap_2.62.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-support/libcap/{libcap_2.61.bb => libcap_2.62.bb} (95%)

diff --git a/meta/recipes-support/libcap/libcap_2.61.bb 
b/meta/recipes-support/libcap/libcap_2.62.bb
similarity index 95%
rename from meta/recipes-support/libcap/libcap_2.61.bb
rename to meta/recipes-support/libcap/libcap_2.62.bb
index a3a6e10b89..7492ad816d 100644
--- a/meta/recipes-support/libcap/libcap_2.61.bb
+++ b/meta/recipes-support/libcap/libcap_2.62.bb
@@ -16,7 +16,7 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
 SRC_URI:append:class-nativesdk = " \

file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \
"
-SRC_URI[sha256sum] = 
"c1e29680f8bcc51b172e9a8eb9a7a4d7255a00a14301a7c2cf96d1febf7449a5"
+SRC_URI[sha256sum] = 
"190c5baac9bee06a129eae20d3e827de62f664fe3507f0bf6c50a9a59fbd83a2"
 
 UPSTREAM_CHECK_URI = 
"https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/;
 
@@ -32,7 +32,6 @@ EXTRA_OEMAKE = " \
   lib='${baselib}' \
   RAISE_SETFCAP=no \
   DYNAMIC=yes \
-  BUILD_GPERF=yes \
 "
 
 EXTRA_OEMAKE:append:class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}"
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159628): 
https://lists.openembedded.org/g/openembedded-core/message/159628
Mute This Topic: https://lists.openembedded.org/mt/87697026/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] python3-cython: upgrade 0.29.24 -> 0.29.25

[wangmy]

Changelog:

Bugs fixed
--
* Several incompatibilities with CPython 3.11 were resolved.
  (Github issues #4411, #4414, #4415, #4416, #4420, #4428, #4473, #4479, #4480)

* Some C compiler warnings were resolved.
  (Github issue #4439)

* C++ "std::move()" should only be used automatically in MSVC versions that 
support it.
  (Github issue #4191)

 * The "Py_hash_t" type failed to accept arbitrary "index" values.
   (Github issue #2752)

* Avoid copying unaligned 16-bit values since some platforms require them to be 
aligned.
  Use memcpy() instead to let the C compiler decide how to do it.
  (Github issue #4343)

* Cython crashed on invalid truthiness tests on C++ types without "operator 
bool".
  (Github issue #4348)

* The declaration of "PyUnicode_CompareWithASCIIString()" in "cpython.unicode" 
was incorrect.
  (Github issue #4344)

Signed-off-by: Wang Mingyu 
---
 meta/recipes-devtools/python/python-cython.inc  | 2 +-
 .../{python3-cython_0.29.24.bb => python3-cython_0.29.25.bb}| 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-cython_0.29.24.bb => 
python3-cython_0.29.25.bb} (100%)

diff --git a/meta/recipes-devtools/python/python-cython.inc 
b/meta/recipes-devtools/python/python-cython.inc
index 5a8ec2a0ff..93d6fdf13b 100644
--- a/meta/recipes-devtools/python/python-cython.inc
+++ b/meta/recipes-devtools/python/python-cython.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = 
"file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa"
 PYPI_PACKAGE = "Cython"
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[sha256sum] = 
"cdf04d07c3600860e8c2ebaad4e8f52ac3feb212453c1764a49ac08c827e8443"
+SRC_URI[sha256sum] = 
"a87cbe3756e7c464acf3e9420d8741e62d3b2eace0846cb39f664ad378aab284"
 UPSTREAM_CHECK_REGEX = "Cython-(?P.*)\.tar"
 
 inherit pypi
diff --git a/meta/recipes-devtools/python/python3-cython_0.29.24.bb 
b/meta/recipes-devtools/python/python3-cython_0.29.25.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-cython_0.29.24.bb
rename to meta/recipes-devtools/python/python3-cython_0.29.25.bb
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159627): 
https://lists.openembedded.org/g/openembedded-core/message/159627
Mute This Topic: https://lists.openembedded.org/mt/87696955/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [RFC PATCH 1/3] recipetool: Separate licenses with & operator

[Alexander Kanavin]

I mean that by reading the patch and the commit message it is not clear
what problem is being fixed. It needs to be explained by showing what
happens when there is no patch, and what happens when there is.

Alex

On Mon, 13 Dec 2021 at 14:01, Stefan Herbrechtsmeier <
stefan.herbrechtsmeier-...@weidmueller.com> wrote:

> Am 13.12.2021 um 14:00 schrieb Stefan Herbrechtsmeier via
> lists.openembedded.org:
> >
> >
> > Am 13.12.2021 um 13:57 schrieb Alexander Kanavin:
> >> On Mon, 13 Dec 2021 at 13:38, Stefan Herbrechtsmeier
> >>  >> > wrote:
> >>
> >> From: Stefan Herbrechtsmeier <
> stefan.herbrechtsme...@weidmueller.com
> >> >
> >>
> >> Separate licenses with & operator since it should be satisfied
> >> most use
> >> cases and it is a reasonable assumption that all the licenses apply.
> >> Furthermore flat, split and sort the licenses to minimize license
> >> string
> >> changes.
> >>
> >>
> >> I think this is better explained with an example. What did not work
> >> before, and what works with this change?
> >
> > Do you mean something like:
> >
> > -LICENSE = "MIT ISC Unknown"
> > +LICENSE = "BSD-3-Clause & ISC & MIT & Unknown"
>
> Sorry I mean:
>
> -LICENSE = "MIT ISC Unknown"
> +LICENSE = "ISC & MIT & Unknown"
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159626): 
https://lists.openembedded.org/g/openembedded-core/message/159626
Mute This Topic: https://lists.openembedded.org/mt/87696347/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core][dunfell 16/18] cmake: FindGTest: Add target for gmock library

[Eero Aaltonen]

On Fri, 2021-12-10 at 18:49 +, Jasper Orschulko wrote:
> Hello everyone,
> 
> after some digging we identified the issue to be on our part.
> We have been using "GTEST_LIBRARY" and "GTEST_MAIN_LIBRARY" in our
> CMake scripts instead of "GTEST_LIBRARIES" and
> "GTEST_MAIN_LIBRARIES",
> as described in the cmake docs:
> 
https://cmake.org/cmake/help/v3.16/module/FindGTest.html#result-variables

Thank you for providing more details.

The gmock target can be backported to dunfell in an alternative way, by
leaving out the
find_package(GTest QUIET NO_MODULE)

call and subsequent lines and letting the FindModule create all the
definitions. This would leave also the undocumented variables intact,
if that is desired.

This should be as simple as dropping the lines
--
# first specifically look for the CMake version of GTest
find_package(GTest QUIET NO_MODULE)

# if we found the GTest cmake package then we are done, and
# can print what we found and return.
if(GTest_FOUND)
set(GTEST_FOUND ${GTest_FOUND})
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTest HANDLE_COMPONENTS
CONFIG_MODE)

set(GTEST_LIBRARIES  GTest::gtest)
set(GTEST_MAIN_LIBRARIES GTest::gtest_main)

__gtest_define_backwards_compatible_library_targets()

return()
endif()
--

-- 
Eero Aaltonen


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159625): 
https://lists.openembedded.org/g/openembedded-core/message/159625
Mute This Topic: https://lists.openembedded.org/mt/87483225/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [RFC PATCH 1/3] recipetool: Separate licenses with & operator

[Stefan Herbrechtsmeier]

Am 13.12.2021 um 14:00 schrieb Stefan Herbrechtsmeier via 
lists.openembedded.org:



Am 13.12.2021 um 13:57 schrieb Alexander Kanavin:
On Mon, 13 Dec 2021 at 13:38, Stefan Herbrechtsmeier 
> wrote:


    From: Stefan Herbrechtsmeier mailto:stefan.herbrechtsme...@weidmueller.com>>

    Separate licenses with & operator since it should be satisfied 
most use

    cases and it is a reasonable assumption that all the licenses apply.
    Furthermore flat, split and sort the licenses to minimize license 
string

    changes.


I think this is better explained with an example. What did not work 
before, and what works with this change?


Do you mean something like:

-LICENSE = "MIT ISC Unknown"
+LICENSE = "BSD-3-Clause & ISC & MIT & Unknown"


Sorry I mean:

-LICENSE = "MIT ISC Unknown"
+LICENSE = "ISC & MIT & Unknown"

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159624): 
https://lists.openembedded.org/g/openembedded-core/message/159624
Mute This Topic: https://lists.openembedded.org/mt/87696347/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [RFC PATCH 1/3] recipetool: Separate licenses with & operator

[Stefan Herbrechtsmeier]

Am 13.12.2021 um 13:57 schrieb Alexander Kanavin:
On Mon, 13 Dec 2021 at 13:38, Stefan Herbrechtsmeier 
> wrote:


From: Stefan Herbrechtsmeier mailto:stefan.herbrechtsme...@weidmueller.com>>

Separate licenses with & operator since it should be satisfied most use
cases and it is a reasonable assumption that all the licenses apply.
Furthermore flat, split and sort the licenses to minimize license string
changes.


I think this is better explained with an example. What did not work 
before, and what works with this change?


Do you mean something like:

-LICENSE = "MIT ISC Unknown"
+LICENSE = "BSD-3-Clause & ISC & MIT & Unknown"


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159623): 
https://lists.openembedded.org/g/openembedded-core/message/159623
Mute This Topic: https://lists.openembedded.org/mt/87696347/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [RFC PATCH 1/3] recipetool: Separate licenses with & operator

[Alexander Kanavin]

On Mon, 13 Dec 2021 at 13:38, Stefan Herbrechtsmeier <
stefan.herbrechtsmeier-...@weidmueller.com> wrote:

> From: Stefan Herbrechtsmeier 
>
> Separate licenses with & operator since it should be satisfied most use
> cases and it is a reasonable assumption that all the licenses apply.
> Furthermore flat, split and sort the licenses to minimize license string
> changes.
>

I think this is better explained with an example. What did not work before,
and what works with this change?

Alex



>
> Signed-off-by: Stefan Herbrechtsmeier <
> stefan.herbrechtsme...@weidmueller.com>
> ---
>
>  meta/lib/oeqa/selftest/cases/recipetool.py |  4 +--
>  scripts/lib/recipetool/create.py   | 39 +-
>  2 files changed, 32 insertions(+), 11 deletions(-)
>
> diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py
> b/meta/lib/oeqa/selftest/cases/recipetool.py
> index 439e41597c..95e4753976 100644
> --- a/meta/lib/oeqa/selftest/cases/recipetool.py
> +++ b/meta/lib/oeqa/selftest/cases/recipetool.py
> @@ -426,7 +426,7 @@ class RecipetoolCreateTests(RecipetoolBase):
>  checkvars = {}
>  checkvars['SUMMARY'] = 'Node Server Example'
>  checkvars['HOMEPAGE'] = '
> https://github.com/savoirfairelinux/node-server-example#readme'
> -checkvars['LICENSE'] = set(['MIT', 'ISC', 'Unknown'])
> +checkvars['LICENSE'] = 'BSD-3-Clause & ISC & MIT & Unknown'
>  urls = []
>  urls.append('npm://
> registry.npmjs.org/;package=@savoirfairelinux/node-server-example;version=${PV}
> 
> ')
>  urls.append('npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json')
> @@ -483,7 +483,7 @@ class RecipetoolCreateTests(RecipetoolBase):
>  result = runCmd('recipetool create -o %s %s' % (temprecipe,
> srcuri))
>  self.assertTrue(os.path.isfile(recipefile))
>  checkvars = {}
> -checkvars['LICENSE'] = set(['PSF', '&', 'BSD-3-Clause', 'GPL'])
> +checkvars['LICENSE'] = 'BSD-3-Clause & GPL & PSF'
>  checkvars['LIC_FILES_CHKSUM'] =
> 'file://COPYING.txt;md5=35a23d42b615470583563132872c97d6'
>  checkvars['SRC_URI'] = '
> https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-${PV}.tar.gz
> '
>  checkvars['SRC_URI[md5sum]'] = 'c53768d63db3873b7d452833553469de'
> diff --git a/scripts/lib/recipetool/create.py
> b/scripts/lib/recipetool/create.py
> index 406c97f1c5..8e8a621b4f 100644
> --- a/scripts/lib/recipetool/create.py
> +++ b/scripts/lib/recipetool/create.py
> @@ -919,6 +919,22 @@ def split_value(value):
>  else:
>  return value
>
> +def fixup_license(value):
> +# Ensure licenses with OR starts and ends with brackets
> +if '|' in value:
> +return '(' + value + ')'
> +return value
> +
> +def tidy_licenses(value):
> +"""Flat, split and sort licenses"""
> +from oe.license import flattened_licenses
> +def _choose(a, b):
> +str_a, str_b  = sorted((" & ".join(a), " & ".join(b)),
> key=str.casefold)
> +return ["(%s | %s)" % (str_a, str_b)]
> +if not isinstance(value, str):
> +value = " & ".join(value)
> +return sorted(list(set(flattened_licenses(value, _choose))),
> key=str.casefold)
> +
>  def handle_license_vars(srctree, lines_before, handled, extravalues, d):
>  lichandled = [x for x in handled if x[0] == 'license']
>  if lichandled:
> @@ -932,10 +948,13 @@ def handle_license_vars(srctree, lines_before,
> handled, extravalues, d):
>  lines = []
>  if licvalues:
>  for licvalue in licvalues:
> -if not licvalue[0] in licenses:
> -licenses.append(licvalue[0])
> +license = licvalue[0]
> +lics = tidy_licenses(fixup_license(license))
> +lics = [lic for lic in lics if lic not in licenses]
> +if len(lics):
> +licenses.extend(lics)
>  lic_files_chksum.append('file://%s;md5=%s' % (licvalue[1],
> licvalue[2]))
> -if licvalue[0] == 'Unknown':
> +if license == 'Unknown':
>  lic_unknown.append(licvalue[1])
>  if lic_unknown:
>  lines.append('#')
> @@ -944,9 +963,7 @@ def handle_license_vars(srctree, lines_before,
> handled, extravalues, d):
>  for licfile in lic_unknown:
>  lines.append('#   %s' % licfile)
>
> -extra_license = split_value(extravalues.pop('LICENSE', []))
> -if '&' in extra_license:
> -extra_license.remove('&')
> +extra_license = tidy_licenses(extravalues.pop('LICENSE', ''))
>  if extra_license:
>  if licenses == ['Unknown']:
>  licenses = extra_license
> @@ -987,7 +1004,7 @@ def handle_license_vars(srctree, lines_before,
> handled, extravalues, d):
>  lines.append('# instead of &. If there is any doubt, check the
> accompanying 

[OE-core] [RFC PATCH 3/3] selftest: recipetool: Add test for handle_license_vars function

[Stefan Herbrechtsmeier]

From: Stefan Herbrechtsmeier 

Signed-off-by: Stefan Herbrechtsmeier 
---

 meta/lib/oeqa/selftest/cases/recipetool.py | 62 ++
 1 file changed, 62 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 1c73b2c5e0..5330d73cbf 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -592,6 +592,68 @@ class RecipetoolTests(RecipetoolBase):
 with open(srcfile, 'w') as fh:
 fh.writelines(plugincontent)
 
+def test_recipetool_handle_license_vars(self):
+from create import handle_license_vars
+from unittest.mock import Mock
+
+commonlicdir = get_bb_var('COMMON_LICENSE_DIR')
+
+d = bb.tinfoil.TinfoilDataStoreConnector
+d.getVar = Mock(return_value=commonlicdir)
+
+srctree = tempfile.mkdtemp(prefix='recipetoolqa')
+self.track_for_cleanup(srctree)
+
+# Multiple licenses
+licenses = ['MIT', 'ISC', 'BSD-3-Clause', 'Apache-2.0']
+for licence in licenses:
+shutil.copy(os.path.join(commonlicdir, licence), 
os.path.join(srctree, 'LICENSE.' + licence))
+# Duplicate license
+shutil.copy(os.path.join(commonlicdir, 'MIT'), os.path.join(srctree, 
'LICENSE'))
+
+extravalues = {
+# Duplicate and missing licenses
+'LICENSE': 'Zlib & BSD-2-Clause & Zlib',
+'LIC_FILES_CHKSUM': [
+'file://README.md;md5=0123456789abcdef0123456789abcd'
+]
+}
+lines_before = []
+handled = []
+licvalues = handle_license_vars(srctree, lines_before, handled, 
extravalues, d)
+expected_lines_before = [
+'# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are 
best guesses - it is',
+'# your responsibility to verify that the values are complete and 
correct.',
+'# NOTE: Original package / source metadata indicates license is: 
BSD-2-Clause & Zlib',
+'#',
+'# NOTE: multiple licenses have been detected; they have been 
separated with &',
+'# in the LICENSE value for now since it is a reasonable 
assumption that all',
+'# of the licenses apply. If instead there is a choice between the 
multiple',
+'# licenses then you should change the value to separate the 
licenses with |',
+'# instead of &. If there is any doubt, check the accompanying 
documentation',
+'# to determine which situation is applicable.',
+'LICENSE = "Apache-2.0 & BSD-2-Clause & BSD-3-Clause & ISC & MIT & 
Zlib"',
+'LIC_FILES_CHKSUM = 
"file://LICENSE;md5=0835ade698e0bcf8506ecda2f7b4f302 \\\n'
+'
file://LICENSE.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \\\n'
+'
file://LICENSE.ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d \\\n'
+'
file://LICENSE.Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \\\n'
+'
file://LICENSE.BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \\\n'
+'
file://README.md;md5=0123456789abcdef0123456789abcd"',
+''
+]
+self.assertEqual(lines_before, expected_lines_before)
+expected_licvalues = [
+('MIT', 'LICENSE', '0835ade698e0bcf8506ecda2f7b4f302'),
+('MIT', 'LICENSE.MIT', '0835ade698e0bcf8506ecda2f7b4f302'),
+('ISC', 'LICENSE.ISC', 'f3b90e78ea0cffb20bf5cca7947a896d'),
+('Apache-2.0', 'LICENSE.Apache-2.0', 
'89aea4e17d99a7cacdbeed46a0096b10'),
+('BSD-3-Clause', 'LICENSE.BSD-3-Clause', 
'550794465ba0ec5312d6919e203a55f9')
+]
+self.assertEqual(handled, [('license', expected_licvalues)])
+self.assertEqual(extravalues, {})
+self.assertEqual(licvalues, expected_licvalues)
+
+
 def test_recipetool_split_pkg_licenses(self):
 from create import split_pkg_licenses
 licvalues = [
-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159621): 
https://lists.openembedded.org/g/openembedded-core/message/159621
Mute This Topic: https://lists.openembedded.org/mt/87696349/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [RFC PATCH 2/3] selftest: recipetool: Add test for split_pkg_licenses function

[Stefan Herbrechtsmeier]

From: Stefan Herbrechtsmeier 

Signed-off-by: Stefan Herbrechtsmeier 
---

 meta/lib/oeqa/selftest/cases/recipetool.py | 64 ++
 1 file changed, 64 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 95e4753976..1c73b2c5e0 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -541,9 +541,13 @@ class RecipetoolTests(RecipetoolBase):
 
 @classmethod
 def setUpClass(cls):
+import sys
+
 super(RecipetoolTests, cls).setUpClass()
 bb_vars = get_bb_vars(['BBPATH'])
 cls.bbpath = bb_vars['BBPATH']
+libpath = os.path.join(get_bb_var('COREBASE'), 'scripts', 'lib', 
'recipetool')
+sys.path.insert(0, libpath)
 
 def _copy_file_with_cleanup(self, srcfile, basedstdir, *paths):
 dstdir = basedstdir
@@ -588,6 +592,66 @@ class RecipetoolTests(RecipetoolBase):
 with open(srcfile, 'w') as fh:
 fh.writelines(plugincontent)
 
+def test_recipetool_split_pkg_licenses(self):
+from create import split_pkg_licenses
+licvalues = [
+# Duplicate licenses
+('BSD-2-Clause', 'x/COPYING', None),
+('BSD-2-Clause', 'x/LICENSE', None),
+# Multiple licenses
+('MIT', 'x/a/LICENSE.MIT', None),
+('ISC', 'x/a/LICENSE.ISC', None),
+# Alternative licenses
+('(MIT | ISC)', 'x/b/LICENSE', None),
+# Alternative licenses without brackets
+('MIT | BSD-2-Clause', 'x/c/LICENSE', None),
+# Multi licenses with alternatives
+('MIT', 'x/d/COPYING', None),
+('MIT | BSD-2-Clause', 'x/d/LICENSE', None),
+# Multi licenses with alternatives and brackets
+('Apache-2.0 & ((MIT | ISC) & BSD-3-Clause)', 'x/e/LICENSE', None)
+]
+packages = {
+'${PN}': '',
+'a': 'x/a',
+'b': 'x/b',
+'c': 'x/c',
+'d': 'x/d',
+'e': 'x/e',
+'f': 'x/f',
+'g': 'x/g',
+}
+fallback_licenses = {
+# Ignored
+'a': 'BSD-3-Clause',
+# Used
+'f': 'BSD-3-Clause'
+}
+outlines = []
+outlicenses = split_pkg_licenses(licvalues, packages, outlines, 
fallback_licenses)
+expected_outlicenses = {
+'${PN}': ['BSD-2-Clause'],
+'a': ['ISC', 'MIT'],
+'b': ['(ISC | MIT)'],
+'c': ['(BSD-2-Clause | MIT)'],
+'d': ['(BSD-2-Clause | MIT)', 'MIT'],
+'e': ['(ISC | MIT)', 'Apache-2.0', 'BSD-3-Clause'],
+'f': ['BSD-3-Clause'],
+'g': ['Unknown']
+}
+self.assertEqual(outlicenses, expected_outlicenses)
+expected_outlines = [
+'LICENSE:${PN} = "BSD-2-Clause"',
+'LICENSE:a = "ISC & MIT"',
+'LICENSE:b = "(ISC | MIT)"',
+'LICENSE:c = "(BSD-2-Clause | MIT)"',
+'LICENSE:d = "(BSD-2-Clause | MIT) & MIT"',
+'LICENSE:e = "(ISC | MIT) & Apache-2.0 & BSD-3-Clause"',
+'LICENSE:f = "BSD-3-Clause"',
+'LICENSE:g = "Unknown"'
+]
+self.assertEqual(outlines, expected_outlines)
+
 
 class RecipetoolAppendsrcBase(RecipetoolBase):
 def _try_recipetool_appendsrcfile(self, testrecipe, newfile, destfile, 
options, expectedlines, expectedfiles):
-- 
2.30.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159620): 
https://lists.openembedded.org/g/openembedded-core/message/159620
Mute This Topic: https://lists.openembedded.org/mt/87696348/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [RFC PATCH 1/3] recipetool: Separate licenses with & operator

[Stefan Herbrechtsmeier]

From: Stefan Herbrechtsmeier 

Separate licenses with & operator since it should be satisfied most use
cases and it is a reasonable assumption that all the licenses apply.
Furthermore flat, split and sort the licenses to minimize license string
changes.

Signed-off-by: Stefan Herbrechtsmeier 
---

 meta/lib/oeqa/selftest/cases/recipetool.py |  4 +--
 scripts/lib/recipetool/create.py   | 39 +-
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py 
b/meta/lib/oeqa/selftest/cases/recipetool.py
index 439e41597c..95e4753976 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -426,7 +426,7 @@ class RecipetoolCreateTests(RecipetoolBase):
 checkvars = {}
 checkvars['SUMMARY'] = 'Node Server Example'
 checkvars['HOMEPAGE'] = 
'https://github.com/savoirfairelinux/node-server-example#readme'
-checkvars['LICENSE'] = set(['MIT', 'ISC', 'Unknown'])
+checkvars['LICENSE'] = 'BSD-3-Clause & ISC & MIT & Unknown'
 urls = []
 
urls.append('npm://registry.npmjs.org/;package=@savoirfairelinux/node-server-example;version=${PV}')
 urls.append('npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json')
@@ -483,7 +483,7 @@ class RecipetoolCreateTests(RecipetoolBase):
 result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri))
 self.assertTrue(os.path.isfile(recipefile))
 checkvars = {}
-checkvars['LICENSE'] = set(['PSF', '&', 'BSD-3-Clause', 'GPL'])
+checkvars['LICENSE'] = 'BSD-3-Clause & GPL & PSF'
 checkvars['LIC_FILES_CHKSUM'] = 
'file://COPYING.txt;md5=35a23d42b615470583563132872c97d6'
 checkvars['SRC_URI'] = 
'https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-${PV}.tar.gz'
 checkvars['SRC_URI[md5sum]'] = 'c53768d63db3873b7d452833553469de'
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 406c97f1c5..8e8a621b4f 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -919,6 +919,22 @@ def split_value(value):
 else:
 return value
 
+def fixup_license(value):
+# Ensure licenses with OR starts and ends with brackets
+if '|' in value:
+return '(' + value + ')'
+return value
+
+def tidy_licenses(value):
+"""Flat, split and sort licenses"""
+from oe.license import flattened_licenses
+def _choose(a, b):
+str_a, str_b  = sorted((" & ".join(a), " & ".join(b)), 
key=str.casefold)
+return ["(%s | %s)" % (str_a, str_b)]
+if not isinstance(value, str):
+value = " & ".join(value)
+return sorted(list(set(flattened_licenses(value, _choose))), 
key=str.casefold)
+
 def handle_license_vars(srctree, lines_before, handled, extravalues, d):
 lichandled = [x for x in handled if x[0] == 'license']
 if lichandled:
@@ -932,10 +948,13 @@ def handle_license_vars(srctree, lines_before, handled, 
extravalues, d):
 lines = []
 if licvalues:
 for licvalue in licvalues:
-if not licvalue[0] in licenses:
-licenses.append(licvalue[0])
+license = licvalue[0]
+lics = tidy_licenses(fixup_license(license))
+lics = [lic for lic in lics if lic not in licenses]
+if len(lics):
+licenses.extend(lics)
 lic_files_chksum.append('file://%s;md5=%s' % (licvalue[1], 
licvalue[2]))
-if licvalue[0] == 'Unknown':
+if license == 'Unknown':
 lic_unknown.append(licvalue[1])
 if lic_unknown:
 lines.append('#')
@@ -944,9 +963,7 @@ def handle_license_vars(srctree, lines_before, handled, 
extravalues, d):
 for licfile in lic_unknown:
 lines.append('#   %s' % licfile)
 
-extra_license = split_value(extravalues.pop('LICENSE', []))
-if '&' in extra_license:
-extra_license.remove('&')
+extra_license = tidy_licenses(extravalues.pop('LICENSE', ''))
 if extra_license:
 if licenses == ['Unknown']:
 licenses = extra_license
@@ -987,7 +1004,7 @@ def handle_license_vars(srctree, lines_before, handled, 
extravalues, d):
 lines.append('# instead of &. If there is any doubt, check the 
accompanying documentation')
 lines.append('# to determine which situation is applicable.')
 
-lines.append('LICENSE = "%s"' % ' & '.join(licenses))
+lines.append('LICENSE = "%s"' % ' & '.join(sorted(licenses, 
key=str.casefold)))
 lines.append('LIC_FILES_CHKSUM = "%s"' % ' \\\n
'.join(lic_files_chksum))
 lines.append('')
 
@@ -1226,6 +1243,7 @@ def split_pkg_licenses(licvalues, packages, outlines, 
fallback_licenses=[], pn='
 """
 pkglicenses = {pn: []}
 for license, licpath, _ in licvalues:
+license = fixup_license(license)
 

Re: [OE-core] The state of DKMS in the Yocto community

[Alex Stewart]

On 12/11/21 09:24, Bruce Ashfield wrote:

On Fri, Dec 10, 2021 at 3:58 PM Alex Stewart  wrote:

Hey List,

I'm trying to work out the mysterious state of DKMS in OE-Core.

Our (NI) OE distributions rely heavily on DKMS to (un)install our
ecosystem of kernel drivers at runtime across our product lines. To
facilitate that, we authored a dkms_2.4.0.bb recipe [1] back in 2017,
which we have carried out-of-stream since.

We tried to upstream it, and the patched rev'ed a couple of times [2];
but it seems to have never made it into a yocto release.

Though some other recipes mention DKMS passingly, I don't see anywhere
that OE-Core officially supports it. Nor does my googling reveal anyone
else who uses DKMS. I find that a little hard to believe, though I
understand that it's probably relatively rare in the embedded space.


@all
So does anyone else on the list use DKMS in their yocto distribution?
Are you maintaining a DKMS recipe out-of-stream as well?


@maintainers
If NI upgraded our DKMS recipe to a more recent version than 2.4.0 and
submitted it again to OE-Core, would you accept it? If not, we will move
it to our own meta layer and accept that we are unique in this regard.

I used to have a DKMS recipe myself (at my previous employer), but
never submitted it, because generally speaking, there are better ways
to do things in OE.

DKMS tends to avoid proper cross compilation (which of course we
already do), or is often used to distribute proprietary code (which we
don't want to encourage), or is avoiding the need to upstream the
module code (which we also don't want to encourage).  It also only
tends to be used on a subset of the architectures that have enough
memory/cpu to build on target, so by definition it is a bit more
niche.


Yeah; I agree. In our case, we have several dozen drivers split across 
many product teams and largely distributing internally-controlled 
source. At this stage, it isn't feasible for us to build them all within 
OE - which is unfortunate.


Many of those drivers are also required to support both our OE 
distribution, as well as a small matrix of supported generic Linux 
desktop OSes. So having them manage their own DKMS packages reduces the 
surface area for packaging errors.


I don't expect that either of those considerations is common in the OE 
community.



We of course already have the ability to build modules on the target
(we have a test case in core that does just that), so what is in core
can support what DKMS needs to build on target.


I'm not sure which test case you're referencing, do you have a link or 
could you expand on what you mean?



I don't see this as something that makes sense in oe-core (but maybe
I'm not fully understanding the case, and where the current support is
failing), but could of course be contributed to another layer.


That's fair. Our use case is motivated more by an organizational failure 
than a failure of the OE tooling.



@Khem
You're maintaining the meta-oe layer; correct? Do you have any interest 
in a DKMS recipe?


Thanks,

--
Alex Stewart
Software Engineer - NI Real-Time OS
NI (National Instruments)

alex.stew...@ni.com


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159618): 
https://lists.openembedded.org/g/openembedded-core/message/159618
Mute This Topic: https://lists.openembedded.org/mt/87645999/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core][PATCH v2] epiphany: Add packageconfig for libsoup2

[Quentin Schulz]

On Fri, Dec 10, 2021 at 09:38:34AM -0600, Joshua Watt wrote:
> Adds a PACKAGECONFIG option to use libsoup2 instead of libsoup3.
> Including libsoup2 and libsoup3 in the same process can cause strange
> runtime failures, and the latest release of each major version will
> cause the process to exit if both are detected on startup.
> 
> The default is changed from libsoup3 back to libsoup2 to follow
> webkitgtk.
> 
> Signed-off-by: Joshua Watt 

Looks good to me, thanks :)

Reviewed-by: Quentin Schulz 

Cheers,
Quentin

> ---
>  meta/recipes-gnome/epiphany/epiphany_41.0.bb | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-gnome/epiphany/epiphany_41.0.bb 
> b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
> index 09210b68aa..8f3bd87340 100644
> --- a/meta/recipes-gnome/epiphany/epiphany_41.0.bb
> +++ b/meta/recipes-gnome/epiphany/epiphany_41.0.bb
> @@ -30,10 +30,13 @@ SRC_URI = 
> "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
> "
>  SRC_URI[archive.sha256sum] = 
> "b39d1825492595b0b74c5d6a6686a857f9419dfa4c02f8013c297bc870e26dd0"
>  
> -EXTRA_OEMESON += "-Dsoup2=disabled"
> +PACKAGECONFIG_SOUP ?= "soup2"
> +PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
>  
>  # Developer mode enables debugging
>  PACKAGECONFIG[developer-mode] = 
> "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
> +PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3"
> +PACKAGECONFIG[soup3] = ",,libsoup,,,soup2"
>  
>  FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers 
> ${datadir}/metainfo"
>  RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
> -- 
> 2.33.0
> 

> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159617): 
https://lists.openembedded.org/g/openembedded-core/message/159617
Mute This Topic: https://lists.openembedded.org/mt/87638363/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH v2 2/4] mesa: PROVIDES virtual/libgles3

[Quentin Schulz]

It's assumed that not all OpenGL ES implementation are compliant with
the 3.x specification. Therefore an additional virtual providers is
created to explicit compatibility with OpenGL ES 3 specification.

Cc: Quentin Schulz 
Signed-off-by: Quentin Schulz 
---
 meta/conf/distro/include/default-providers.inc | 1 +
 meta/conf/machine/include/qemu.inc | 1 +
 meta/conf/machine/qemux86-64.conf  | 1 +
 meta/conf/machine/qemux86.conf | 1 +
 meta/recipes-graphics/mesa/mesa.inc| 2 +-
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/default-providers.inc 
b/meta/conf/distro/include/default-providers.inc
index ea88bd4876..6defdca12d 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/libgl-native ?= "mesa-native"
 PREFERRED_PROVIDER_virtual/nativesdk-libgl ?= "nativesdk-mesa"
 PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa"
 PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
 PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils"
 PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native"
diff --git a/meta/conf/machine/include/qemu.inc 
b/meta/conf/machine/include/qemu.inc
index 642c322abc..0d71bcbbad 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -3,6 +3,7 @@ PREFERRED_PROVIDER_virtual/egl ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa"
 
 XSERVER ?= "xserver-xorg \
 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 
'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \
diff --git a/meta/conf/machine/qemux86-64.conf 
b/meta/conf/machine/qemux86-64.conf
index 978334d5bb..901353499c 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -6,6 +6,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa"
 
 require conf/machine/include/qemu.inc
 DEFAULTTUNE ?= "core2-64"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index ad7f6e0ee4..1e072e1ae2 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -6,6 +6,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa"
 
 require conf/machine/include/qemu.inc
 DEFAULTTUNE ?= "core2-32"
diff --git a/meta/recipes-graphics/mesa/mesa.inc 
b/meta/recipes-graphics/mesa/mesa.inc
index c894c2dab5..6d6fc607f9 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -39,7 +39,7 @@ DEPENDS = "expat makedepend-native flex-native bison-native 
libxml2-native zlib
 EXTRANATIVEPATH += "chrpath-native"
 PROVIDES = " \
 ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \
-${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 
virtual/libgles2', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 
virtual/libgles2 virtual/libgles3', '', d)} \
 ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \
 ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \
 virtual/mesa \
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159614): 
https://lists.openembedded.org/g/openembedded-core/message/159614
Mute This Topic: https://lists.openembedded.org/mt/87694123/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH v2 3/4] kmscube: add build dependency on virtual/libgles3

[Quentin Schulz]

texturator requires GLES 3 headers and libs so let's explicit this
dependency. This was not detected until now because mesa, the default
provider, actually provides both Open GLES 2 and 3 compliant
implementations.

Cc: Quentin Schulz 
Signed-off-by: Quentin Schulz 
---
 meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb 
b/meta/recipes-graphics/kmscube/kmscube_git.bb
index efaa962704..54993be89e 100644
--- a/meta/recipes-graphics/kmscube/kmscube_git.bb
+++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
@@ -6,7 +6,7 @@ OpenGL or OpenGL ES."
 HOMEPAGE = "https://cgit.freedesktop.org/mesa/kmscube/;
 LICENSE = "MIT"
 SECTION = "graphics"
-DEPENDS = "virtual/libgles2 virtual/egl libdrm"
+DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm"
 
 LIC_FILES_CHKSUM = 
"file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb"
 
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159615): 
https://lists.openembedded.org/g/openembedded-core/message/159615
Mute This Topic: https://lists.openembedded.org/mt/87694124/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH v2 4/4] mesa: make ligles3-dev RDEPENDS on libgles2-dev

[Quentin Schulz]

Khronos documentation[1] says that include/GLES2/gl2ext.h can be used
for OpenGL ES 3 specification as well as for OpenGL ES 2.
There can be applications including GLES2/gl2ext.h instead of
GLES3/gl3ext.h meaning we should probably bring in GLES2/gl2ext.h if
someone asks for development package of libgles3.

[1] https://www.khronos.org/registry/OpenGL/index_es.php#headers

Cc: Quentin Schulz 
Signed-off-by: Quentin Schulz 
---

added in v2

 meta/recipes-graphics/mesa/mesa.inc | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa.inc 
b/meta/recipes-graphics/mesa/mesa.inc
index 6d6fc607f9..64702f8168 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -186,8 +186,12 @@ CFLAGS:append:armv6 = " -DMISSING_64BIT_ATOMICS"
 # Remove the mesa dependency on mesa-dev, as mesa is empty
 RDEPENDS:${PN}-dev = ""
 
-# Add dependency so that GLES3 header don't need to be added manually
-RDEPENDS:libgles2-mesa-dev += "libgles3-mesa-dev"
+# Khronos documentation says that include/GLES2/gl2ext.h can be used for
+# OpenGL ES 3 specification as well as for OpenGL ES 2.
+# There can be applications including GLES2/gl2ext.h instead of GLES3/gl3ext.h
+# meaning we should probably bring in GLES2/gl2ext.h if someone asks for
+# development package of libgles3.
+RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev"
 
 PACKAGES =+ "libegl-mesa libegl-mesa-dev \
  libosmesa libosmesa-dev \
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159616): 
https://lists.openembedded.org/g/openembedded-core/message/159616
Mute This Topic: https://lists.openembedded.org/mt/87694125/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH v2 1/4] kmscube: fix build on OpenGL ES 3 dependencies not providing GLES3/gl3ext.h

[Quentin Schulz]

According to Khronos documentation[1], gl2ext.h can be used for OpenGL
ES 3. Some vendor implementation of OpenGL ES 3, such as
Rockchip's libmali[2], do not have a gl3ext.h but only a gl2ext.h while
being OpenGL ES 3 compliant.

This fixes the header files to be included from gl3ext.h to gl2ext.h to
be compatible with (hopefully) all OpenGL ES 3 implementations.

[1] https://www.khronos.org/registry/OpenGL/index_es.php#headers
[2] https://github.com/rockchip-linux/libmali

Cc: Quentin Schulz 
Signed-off-by: Quentin Schulz 
---

v2: move patch into correct directory

 ...ator-Use-correct-GL-extension-header.patch | 33 +++
 meta/recipes-graphics/kmscube/kmscube_git.bb  |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 
meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch

diff --git 
a/meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch
 
b/meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch
new file mode 100644
index 00..5965782de7
--- /dev/null
+++ 
b/meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch
@@ -0,0 +1,33 @@
+From 2b74e0e32235f6ab2e3e42d53dea985a7ba6227f Mon Sep 17 00:00:00 2001
+From: Damian Hobson-Garcia 
+Date: Wed, 16 Dec 2020 11:08:25 +0900
+Subject: [PATCH] texturator: Use correct GL extension header
+
+gl2ext.h is the extenstion header for OpenGL ES 2.0 and all later
+versions according to the Khronos documentation [1].  gl3ext.h is either
+an empty stub, or may not even exist on some platforms.
+
+[1]: https://www.khronos.org/registry/OpenGL/index_es.php#headers
+
+Upstream-Status: Submitted 
[https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/26]
+Signed-off-by: Quentin Schulz 
+---
+ texturator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/texturator.c b/texturator.c
+index d9335d7..6d97856 100644
+--- a/texturator.c
 b/texturator.c
+@@ -30,7 +30,7 @@
+ #include 
+ 
+ #include 
+-#include 
++#include 
+ 
+ #ifdef HAVE_LIBPNG
+ #include 
+-- 
+2.33.1
+
diff --git a/meta/recipes-graphics/kmscube/kmscube_git.bb 
b/meta/recipes-graphics/kmscube/kmscube_git.bb
index f4e6cd41e7..efaa962704 100644
--- a/meta/recipes-graphics/kmscube/kmscube_git.bb
+++ b/meta/recipes-graphics/kmscube/kmscube_git.bb
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = 
"file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315
 
 SRCREV = "9f63f359fab1b5d8e862508e4e51c9dfe339ccb0"
 SRC_URI = 
"git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https"
+SRC_URI += "file://0001-texturator-Use-correct-GL-extension-header.patch"
 UPSTREAM_CHECK_COMMITS = "1"
 
 S = "${WORKDIR}/git"
-- 
2.33.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159613): 
https://lists.openembedded.org/g/openembedded-core/message/159613
Mute This Topic: https://lists.openembedded.org/mt/87694122/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-