Patch review
cover Patch review
Please review this set of patches for dunfell and have comments back by end of day Tuesday.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/2988
with the exception of a known autobuilder intermittent issue (on qemuppc test) which passed on subsequent retest:
https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/4402
The following changes since commit f61fcb6e176f19f1e768ce63a693f238713c8887:
openssh: remove redundant BSD license (2021-12-02 05:11:21 -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
Dhruva Gole (1):
scripts/checklayer/common.py: Fixed a minor grammatical error
Eero Aaltonen (1):
cmake: FindGTest: Add target for gmock library
Jate Sujjavanich (2):
libdnf: Backport bugfix for upgrade calc
dnf: Backport bugfix for upgrade
Khem Raj (1):
libunwind: Backport a fix for -fno-common option to compile
Neetika Singh (1):
glib-2.0: Add security fixes
Pavel Zhukov (2):
busybox: Fix for CVE-2021-42374
busybox: Fix for CVE-2021-42376
Quentin Schulz (1):
README.OE-Core.md: update URLs
Ranjitsinh Rathod (2):
ncurses: Fix for CVE-2021-39537
libsolv: update tag for missing CVEs
Richard Purdie (2):
buildhistory: Fix srcrevs output
oeqa/parselogs: Fix quoting
Ross Burton (1):
vim: fix CVE-2021-3968 and CVE-2021-3973
Steve Sakoman (4):
cve-extra-exclusions: add db CVEs to exclusion list
bind: update to 9.11.33
bind: update to 9.11.34
bind: update to 9.11.35
README.OE-Core | 10 +-
meta/classes/buildhistory.bbclass | 30 +-
.../distro/include/cve-extra-exclusions.inc | 9 +-
meta/lib/oeqa/runtime/cases/parselogs.py | 14 +-
.../bind/{bind_9.11.32.bb => bind_9.11.35.bb} | 2 +-
.../busybox/busybox/CVE-2021-42374.patch | 53 +++
.../busybox/busybox/CVE-2021-42376.patch | 138 ++++++
meta/recipes-core/busybox/busybox_1.31.1.bb | 2 +
.../glib-2.0/glib-2.0/CVE-2021-27218.patch | 129 ++++++
.../glib-2.0/glib-2.0/CVE-2021-27219-01.patch | 170 +++++++
.../glib-2.0/glib-2.0/CVE-2021-27219-02.patch | 249 +++++++++++
.../glib-2.0/glib-2.0/CVE-2021-27219-03.patch | 131 ++++++
.../glib-2.0/glib-2.0/CVE-2021-27219-04.patch | 298 +++++++++++++
.../glib-2.0/glib-2.0/CVE-2021-27219-05.patch | 54 +++
.../glib-2.0/glib-2.0/CVE-2021-27219-06.patch | 101 +++++
.../glib-2.0/glib-2.0/CVE-2021-27219-07.patch | 76 ++++
.../glib-2.0/glib-2.0/CVE-2021-27219-08.patch | 101 +++++
.../glib-2.0/glib-2.0/CVE-2021-27219-09.patch | 100 +++++
.../glib-2.0/glib-2.0/CVE-2021-27219-10.patch | 59 +++
.../glib-2.0/glib-2.0/CVE-2021-27219-11.patch | 63 +++
.../glib-2.0/CVE-2021-27219-reg1-1.patch | 36 ++
.../glib-2.0/CVE-2021-27219-reg1-2.patch | 38 ++
.../glib-2.0/CVE-2021-27219-reg1-4.patch | 38 ++
.../glib-2.0/CVE-2021-27219-reg1-5.patch | 100 +++++
.../glib-2.0/CVE-2021-27219-reg2-1.patch | 49 ++
.../glib-2.0/CVE-2021-27219-reg2-2.patch | 43 ++
.../glib-2.0/CVE-2021-27219-reg2-3.patch | 232 ++++++++++
.../glib-2.0/glib-2.0/CVE-2021-28153-1.patch | 27 ++
.../glib-2.0/glib-2.0/CVE-2021-28153-2.patch | 42 ++
.../glib-2.0/glib-2.0/CVE-2021-28153-3.patch | 57 +++
.../glib-2.0/glib-2.0/CVE-2021-28153-4.patch | 265 +++++++++++
.../glib-2.0/glib-2.0/CVE-2021-28153-5.patch | 55 +++
meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb | 24 +
.../ncurses/files/CVE-2021-39537.patch | 30 ++
meta/recipes-core/ncurses/ncurses_6.2.bb | 1 +
.../cmake/cmake-native_3.16.5.bb | 1 +
...ndGTest-Add-target-for-gmock-library.patch | 255 +++++++++++
...ackages-in-upgrade-job-RhBug-1728252.patch | 60 +++
meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 +
...job-goal.upgrade-with-sltr-as-target.patch | 58 +++
meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 +
.../libsolv/files/CVE-2021-3200.patch | 9 +-
...0001-Fix-compilation-with-fno-common.patch | 420 ++++++++++++++++++
.../libunwind/libunwind_1.3.1.bb | 1 +
...rash-when-using-CTRL-W-f-without-fin.patch | 92 ++++
meta/recipes-support/vim/vim.inc | 4 +
scripts/lib/checklayer/cases/common.py | 2 +-
47 files changed, 3696 insertions(+), 34 deletions(-)
rename meta/recipes-connectivity/bind/{bind_9.11.32.bb => bind_9.11.35.bb} (98%)
create mode 100644 meta/recipes-core/busybox/busybox/CVE-2021-42374.patch
create mode 100644 meta/recipes-core/busybox/busybox/CVE-2021-42376.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27218.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-01.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-02.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-03.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-04.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-05.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-06.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-07.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-08.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-09.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-10.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-11.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-1.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-2.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-4.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-5.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg2-1.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg2-2.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg2-3.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-1.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-2.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-3.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-4.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-5.patch
create mode 100644 meta/recipes-core/ncurses/files/CVE-2021-39537.patch
create mode 100644 meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add-target-for-gmock-library.patch
create mode 100644 meta/recipes-devtools/dnf/dnf/0040-Keep-installed-packages-in-upgrade-job-RhBug-1728252.patch
create mode 100644 meta/recipes-devtools/libdnf/libdnf/0040-Mark-job-goal.upgrade-with-sltr-as-target.patch
create mode 100644 meta/recipes-support/libunwind/libunwind/0001-Fix-compilation-with-fno-common.patch
create mode 100644 meta/recipes-support/vim/files/0002-patch-8.2.3611-crash-when-using-CTRL-W-f-without-fin.patchSignature · 1 line
2.25.1
PATCH 1/18 cve-extra-exclusions: add db CVEs to exclusion list
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.
--- meta/conf/distro/include/cve-extra-exclusions.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
meta/conf/distro/include/cve-extra-exclusions.inc +8 -1
@@ -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 ####
Signature · 1 line
2.25.1
Re: [OE-core][dunfell 01/18] cve-extra-exclusions: add db CVEs to exclusion list
Quoted 18 lines · 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 <[email protected]>--- meta/conf/distro/include/cve-extra-exclusions.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)meta/conf/distro/include/cve-extra-exclusions.inc +1
-1@@ -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
meta/conf/distro/include/cve-extra-exclusions.inc CVE_CHECK_WHITELIST += "CVE-2010-4756" · line 57
Quoted 10 lines
meta/conf/distro/include/cve-extra-exclusions.inc +7
-0+# 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 ####
Do we need to fix this in master first?
Cheers,
Richard
Re: [OE-core][dunfell 01/18] cve-extra-exclusions: add db CVEs to exclusion list
Quoted 33 lines · Richard Purdie
Quoted 1 line · Steve Sakoman
Since Oracle relicensed bdb, the open source community is slowly but
surely replacing bdb with
Quoted 1 line
supported and open source friendly alternatives. As a result these CVEs
are unlikely to ever be fixed.
Review
Quoted 7 lines
Signed-off-by Steve Sakoman <[email protected]>--- meta/conf/distro/include/cve-extra-exclusions.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)(quoted diff) +0
-0b/meta/conf/distro/include/cve-extra-exclusions.inc
meta/conf/distro/include/cve-extra-exclusions.inc CVE_CHECK_WHITELIST += "CVE-2010-4756" · line 48
Quoted 10 lines
index
a6f52b5de7..e02a4d1fde100644meta/conf/distro/include/cve-extra-exclusions.inc +2
-1@@ -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 butsurely replacing bdb with
meta/conf/distro/include/cve-extra-exclusions.inc CVE_CHECK_WHITELIST += "CVE-2010-4756" · line 49
Quoted 1 line
meta/conf/distro/include/cve-extra-exclusions.inc +1
-0+# supported and open source friendly alternatives. As a result theseCVEs are unlikely to ever be fixed.
meta/conf/distro/include/cve-extra-exclusions.inc CVE_CHECK_WHITELIST += "CVE-2010-4756" · line 50
Quoted 1 line
meta/conf/distro/include/cve-extra-exclusions.inc +1
-0+CVE_CHECK_WHITELIST += "CVE-2015-2583 CVE-2015-2624 CVE-2015-2626CVE-2015-2640 CVE-2015-2654 \
meta/conf/distro/include/cve-extra-exclusions.inc CVE_CHECK_WHITELIST += "CVE-2010-4756" · line 51
Quoted 1 line
meta/conf/distro/include/cve-extra-exclusions.inc +1
-0+CVE-2015-2656 CVE-2015-4754 CVE-2015-4764 CVE-2015-4774 CVE-2015-4775CVE-2015-4776 CVE-2015-4777 \
meta/conf/distro/include/cve-extra-exclusions.inc CVE_CHECK_WHITELIST += "CVE-2010-4756" · line 52
Quoted 1 line
meta/conf/distro/include/cve-extra-exclusions.inc +1
-0+CVE-2015-4778 CVE-2015-4779 CVE-2015-4780 CVE-2015-4781 CVE-2015-4782CVE-2015-4783 CVE-2015-4784 \
meta/conf/distro/include/cve-extra-exclusions.inc CVE_CHECK_WHITELIST += "CVE-2010-4756" · line 53
Quoted 1 line
meta/conf/distro/include/cve-extra-exclusions.inc +1
-0+CVE-2015-4785 CVE-2015-4786 CVE-2015-4787 CVE-2015-4788 CVE-2015-4789
Quoted 8 lines
CVE-2015-4790 CVE-2016-0682 \
meta/conf/distro/include/cve-extra-exclusions.inc CVE_CHECK_WHITELIST += "CVE-2010-4756" · line 57
Quoted 4 lines
meta/conf/distro/include/cve-extra-exclusions.inc +1
-0+CVE-2016-0689 CVE-2016-0692 CVE-2016-0694 CVE-2016-3418 CVE-2020-2981" #### CPE update pending ####Do we need to fix this in master first?
Yes, of course! Thanks for catching this. I'll submit for master, then cherry-pick.
Steve
PATCH 2/18 glib-2.0: Add security fixes
In reply to Steve SakomanFrom: Neetika Singh <[email protected]>
Add patches for below CVE issues:
CVE-2021-27218
CVE-2021-27219
CVE-2021-28153
Also, add regression patchs for CVE-2021-27219. CVE-2021-27219-reg1-3.patch is not relevant for glib2.0 v2.64
--- .../glib-2.0/glib-2.0/CVE-2021-27218.patch | 129 ++++++++ .../glib-2.0/glib-2.0/CVE-2021-27219-01.patch | 170 ++++++++++ .../glib-2.0/glib-2.0/CVE-2021-27219-02.patch | 249 +++++++++++++++ .../glib-2.0/glib-2.0/CVE-2021-27219-03.patch | 131 ++++++++ .../glib-2.0/glib-2.0/CVE-2021-27219-04.patch | 298 ++++++++++++++++++ .../glib-2.0/glib-2.0/CVE-2021-27219-05.patch | 54 ++++ .../glib-2.0/glib-2.0/CVE-2021-27219-06.patch | 101 ++++++ .../glib-2.0/glib-2.0/CVE-2021-27219-07.patch | 76 +++++ .../glib-2.0/glib-2.0/CVE-2021-27219-08.patch | 101 ++++++ .../glib-2.0/glib-2.0/CVE-2021-27219-09.patch | 100 ++++++ .../glib-2.0/glib-2.0/CVE-2021-27219-10.patch | 59 ++++ .../glib-2.0/glib-2.0/CVE-2021-27219-11.patch | 63 ++++ .../glib-2.0/CVE-2021-27219-reg1-1.patch | 36 +++ .../glib-2.0/CVE-2021-27219-reg1-2.patch | 38 +++ .../glib-2.0/CVE-2021-27219-reg1-4.patch | 38 +++ .../glib-2.0/CVE-2021-27219-reg1-5.patch | 100 ++++++ .../glib-2.0/CVE-2021-27219-reg2-1.patch | 49 +++ .../glib-2.0/CVE-2021-27219-reg2-2.patch | 43 +++ .../glib-2.0/CVE-2021-27219-reg2-3.patch | 232 ++++++++++++++ .../glib-2.0/glib-2.0/CVE-2021-28153-1.patch | 27 ++ .../glib-2.0/glib-2.0/CVE-2021-28153-2.patch | 42 +++ .../glib-2.0/glib-2.0/CVE-2021-28153-3.patch | 57 ++++ .../glib-2.0/glib-2.0/CVE-2021-28153-4.patch | 265 ++++++++++++++++ .../glib-2.0/glib-2.0/CVE-2021-28153-5.patch | 55 ++++ meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb | 24 ++ 25 files changed, 2537 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27218.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-01.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-02.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-03.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-04.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-05.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-06.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-07.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-08.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-09.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-10.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-11.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-1.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-2.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-4.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-5.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg2-1.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg2-2.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg2-3.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-1.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-2.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-3.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-4.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-5.patch
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27218.patch new file +129 -0
@@ -0,0 +1,129 @@ +Backport of: + +From 0f384c88a241bbbd884487b1c40b7b75f1e638d3 Mon Sep 17 00:00:00 2001 +From: Krzesimir Nowak <[email protected]> +Date: Wed, 10 Feb 2021 23:51:07 +0100 +Subject: [PATCH] gbytearray: Do not accept too large byte arrays + +GByteArray uses guint for storing the length of the byte array, but it +also has a constructor (g_byte_array_new_take) that takes length as a +gsize. gsize may be larger than guint (64 bits for gsize vs 32 bits +for guint). It is possible to call the function with a value greater +than G_MAXUINT, which will result in silent length truncation. This +may happen as a result of unreffing GBytes into GByteArray, so rather +be loud about it. + +(Test case tweaked by Philip Withnall.) + +(Backport 2.66: Add #include gstrfuncsprivate.h in the test case for +`g_memdup2()`.) + +Upstream-Status: Backport [https://mirrors.ocf.berkeley.edu/ubuntu/pool/main/g/glib2.0/glib2.0_2.64.6-1~ubuntu20.04.3.debian.tar.xz] +CVE: CVE-2021-27218 +Signed-off-by: Neetika Singh <[email protected]> +Signed-off-by: Ranjitsinh Rathod <[email protected]> + +--- + glib/garray.c | 6 ++++++ + glib/gbytes.c | 4 ++++ + glib/tests/bytes.c | 35 ++++++++++++++++++++++++++++++++++- + 3 files changed, 44 insertions(+), 1 deletion(-) + +--- a/glib/garray.c ++++ b/glib/garray.c +@@ -2234,6 +2234,10 @@ g_byte_array_steal (GByteArray *array, + * Create byte array containing the data. The data will be owned by the array + * and will be freed with g_free(), i.e. it could be allocated using g_strdup(). + * ++ * Do not use it if @len is greater than %G_MAXUINT. #GByteArray ++ * stores the length of its data in #guint, which may be shorter than ++ * #gsize. ++ * + * Since: 2.32 + * + * Returns: (transfer full): a new #GByteArray +@@ -2245,6 +2249,8 @@ g_byte_array_new_take (guint8 *data, + GByteArray *array; + GRealArray *real; + ++ g_return_val_if_fail (len <= G_MAXUINT, NULL); ++ + array = g_byte_array_new (); + real = (GRealArray *)array; + g_assert (real->data == NULL); +--- a/glib/gbytes.c ++++ b/glib/gbytes.c +@@ -519,6 +519,10 @@ g_bytes_unref_to_data (GBytes *bytes, + * g_bytes_new(), g_bytes_new_take() or g_byte_array_free_to_bytes(). In all + * other cases the data is copied. + * ++ * Do not use it if @bytes contains more than %G_MAXUINT ++ * bytes. #GByteArray stores the length of its data in #guint, which ++ * may be shorter than #gsize, that @bytes is using. ++ * + * Returns: (transfer full): a new mutable #GByteArray containing the same byte data + * + * Since: 2.32 +--- a/glib/tests/bytes.c ++++ b/glib/tests/bytes.c +@@ -10,12 +10,12 @@ + */ + + #undef G_DISABLE_ASSERT +-#undef G_LOG_DOMAIN + + #include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include "glib.h" ++#include "glib/gstrfuncsprivate.h" + + /* Keep in sync with glib/gbytes.c */ + struct _GBytes +@@ -334,6 +334,38 @@ test_to_array_transferred (void) + } + + static void ++test_to_array_transferred_oversize (void) ++{ ++ g_test_message ("g_bytes_unref_to_array() can only take GBytes up to " ++ "G_MAXUINT in length; test that longer ones are rejected"); ++ ++ if (sizeof (guint) >= sizeof (gsize)) ++ { ++ g_test_skip ("Skipping test as guint is not smaller than gsize"); ++ } ++ else if (g_test_undefined ()) ++ { ++ GByteArray *array = NULL; ++ GBytes *bytes = NULL; ++ gpointer data = g_memdup2 (NYAN, N_NYAN); ++ gsize len = ((gsize) G_MAXUINT) + 1; ++ ++ bytes = g_bytes_new_take (data, len); ++ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, ++ "g_byte_array_new_take: assertion 'len <= G_MAXUINT' failed"); ++ array = g_bytes_unref_to_array (g_steal_pointer (&bytes)); ++ g_test_assert_expected_messages (); ++ g_assert_null (array); ++ ++ g_free (data); ++ } ++ else ++ { ++ g_test_skip ("Skipping test as testing undefined behaviour is disabled"); ++ } ++} ++ ++static void + test_to_array_two_refs (void) + { + gconstpointer memory; +@@ -410,6 +442,7 @@ main (int argc, char *argv[]) + g_test_add_func ("/bytes/to-array/transfered", test_to_array_transferred); + g_test_add_func ("/bytes/to-array/two-refs", test_to_array_two_refs); + g_test_add_func ("/bytes/to-array/non-malloc", test_to_array_non_malloc); ++ g_test_add_func ("/bytes/to-array/transferred/oversize", test_to_array_transferred_oversize); + g_test_add_func ("/bytes/null", test_null); + + return g_test_run ();
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-01.patch new file +170 -0
170 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-02.patch new file +249 -0
249 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-03.patch new file +131 -0
131 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-04.patch new file +298 -0
298 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-05.patch new file +54 -0
54 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-06.patch new file +101 -0
101 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-07.patch new file +76 -0
76 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-08.patch new file +101 -0
101 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-09.patch new file +100 -0
100 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-10.patch new file +59 -0
59 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-11.patch new file +63 -0
63 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-1.patch new file +36 -0
@@ -0,0 +1,36 @@ +From f8273b9aded135fe07094faebd527e43851aaf6e Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <[email protected]> +Date: Sun, 7 Feb 2021 23:32:40 +0100 +Subject: [PATCH 1/5] giochannel: Fix length_size bounds check + +The inverted condition is an obvious error introduced by ecdf91400e9a. + +Fixes https://gitlab.gnome.org/GNOME/glib/-/issues/2323 + +(cherry picked from commit a149bf2f9030168051942124536e303af8ba6176) + +Upstream-Status: Backport [https://mirrors.ocf.berkeley.edu/ubuntu/pool/main/g/glib2.0/glib2.0_2.64.6-1~ubuntu20.04.3.debian.tar.xz] +CVE: CVE-2021-27219 +Signed-off-by: Ranjitsinh Rathod <[email protected]> + +--- + glib/giochannel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/giochannel.c b/glib/giochannel.c +index 4dec20f77..c3f3102ff 100644 +--- a/glib/giochannel.c ++++ b/glib/giochannel.c +@@ -896,7 +896,7 @@ g_io_channel_set_line_term (GIOChannel *channel, + { + /* FIXME: We’re constrained by line_term_len being a guint here */ + gsize length_size = strlen (line_term); +- g_return_if_fail (length_size > G_MAXUINT); ++ g_return_if_fail (length_size <= G_MAXUINT); + length_unsigned = (guint) length_size; + } + +-- +GitLab + +
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-2.patch new file +38 -0
@@ -0,0 +1,38 @@ +From e069c50467712e6d607822afd6b6c15c2c343dff Mon Sep 17 00:00:00 2001 +From: Simon McVittie <[email protected]> +Date: Mon, 8 Feb 2021 10:34:50 +0000 +Subject: [PATCH 2/5] giochannel: Don't store negative line_term_len in + GIOChannel struct + +Adding test coverage indicated that this was another bug in 0cc11f74. + +Fixes: 0cc11f74 "giochannel: Forbid very long line terminator strings" +Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/2323 +Signed-off-by: Simon McVittie <[email protected]> +(cherry picked from commit 5dc8b0014c03e7491d93b90275ab442e888a9628) + +Upstream-Status: Backport [https://mirrors.ocf.berkeley.edu/ubuntu/pool/main/g/glib2.0/glib2.0_2.64.6-1~ubuntu20.04.3.debian.tar.xz] +CVE: CVE-2021-27219 +Signed-off-by: Ranjitsinh Rathod <[email protected]> + +--- + glib/giochannel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/giochannel.c b/glib/giochannel.c +index c3f3102ff..19bb06ba6 100644 +--- a/glib/giochannel.c ++++ b/glib/giochannel.c +@@ -902,7 +902,7 @@ g_io_channel_set_line_term (GIOChannel *channel, + + g_free (channel->line_term); + channel->line_term = line_term ? g_memdup2 (line_term, length_unsigned) : NULL; +- channel->line_term_len = length; ++ channel->line_term_len = length_unsigned; + } + + /** +-- +GitLab + +
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-4.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 4506d1859a863087598c8d122740bae25b65b099 Mon Sep 17 00:00:00 2001 +From: Simon McVittie <[email protected]> +Date: Mon, 8 Feb 2021 10:04:48 +0000 +Subject: [PATCH 4/5] gtlspassword: Fix inverted assertion + +The intention here was to assert that the length of the password fits +in a gssize. Passwords more than half the size of virtual memory are +probably excessive. + +Fixes: a8b204ff "gtlspassword: Forbid very long TLS passwords" +Signed-off-by: Simon McVittie <[email protected]> +(cherry picked from commit 61bb52ec42de1082bfb06ce1c737fc295bfe60b8) + +Upstream-Status: Backport [https://mirrors.ocf.berkeley.edu/ubuntu/pool/main/g/glib2.0/glib2.0_2.64.6-1~ubuntu20.04.3.debian.tar.xz] +CVE: CVE-2021-27219 +Signed-off-by: Ranjitsinh Rathod <[email protected]> + +--- + gio/gtlspassword.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c +index dbcec41a8..bd86a6dfe 100644 +--- a/gio/gtlspassword.c ++++ b/gio/gtlspassword.c +@@ -291,7 +291,7 @@ g_tls_password_set_value (GTlsPassword *password, + { + /* FIXME: g_tls_password_set_value_full() doesn’t support unsigned gsize */ + gsize length_unsigned = strlen ((gchar *) value); +- g_return_if_fail (length_unsigned > G_MAXSSIZE); ++ g_return_if_fail (length_unsigned <= G_MAXSSIZE); + length = (gssize) length_unsigned; + } + +-- +GitLab + +
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg1-5.patch new file +100 -0
100 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg2-1.patch new file +49 -0
49 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg2-2.patch new file +43 -0
43 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-27219-reg2-3.patch new file +232 -0
232 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-1.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 78420a75aeb70569a8cd79fa0fea7b786b6f785f Mon Sep 17 00:00:00 2001 +From: Philip Withnall <[email protected]> +Date: Wed, 24 Feb 2021 17:33:38 +0000 +Subject: [PATCH 1/5] glocalfileoutputstream: Fix a typo in a comment + +Signed-off-by: Philip Withnall <[email protected]> + +Upstream-Status: Backport [https://mirrors.ocf.berkeley.edu/ubuntu/pool/main/g/glib2.0/glib2.0_2.64.6-1~ubuntu20.04.3.debian.tar.xz] +CVE: CVE-2021-28153 +Signed-off-by: Neetika Singh <[email protected]> +Signed-off-by: Ranjitsinh Rathod <[email protected]> + +--- + gio/glocalfileoutputstream.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/gio/glocalfileoutputstream.c ++++ b/gio/glocalfileoutputstream.c +@@ -851,7 +851,7 @@ handle_overwrite_open (const char *fi + mode = mode_from_flags_or_info (flags, reference_info); + + /* We only need read access to the original file if we are creating a backup. +- * We also add O_CREATE to avoid a race if the file was just removed */ ++ * We also add O_CREAT to avoid a race if the file was just removed */ + if (create_backup || readable) + open_flags = O_RDWR | O_CREAT | O_BINARY; + else
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-2.patch new file +42 -0
42 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-3.patch new file +57 -0
57 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-4.patch new file +265 -0
265 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0/CVE-2021-28153-5.patch new file +55 -0
55 lines not on this page · raw message
meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb +24 -0
@@ -18,6 +18,30 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://tzdata-update.patch \ file://CVE-2020-35457.patch \ + file://CVE-2021-27218.patch \ + file://CVE-2021-27219-01.patch \ + file://CVE-2021-27219-02.patch \ + file://CVE-2021-27219-03.patch \ + file://CVE-2021-27219-04.patch \ + file://CVE-2021-27219-05.patch \ + file://CVE-2021-27219-06.patch \ + file://CVE-2021-27219-07.patch \ + file://CVE-2021-27219-08.patch \ + file://CVE-2021-27219-09.patch \ + file://CVE-2021-27219-10.patch \ + file://CVE-2021-27219-11.patch \ + file://CVE-2021-27219-reg1-1.patch \ + file://CVE-2021-27219-reg1-2.patch \ + file://CVE-2021-27219-reg1-4.patch \ + file://CVE-2021-27219-reg1-5.patch \ + file://CVE-2021-27219-reg2-1.patch \ + file://CVE-2021-27219-reg2-2.patch \ + file://CVE-2021-27219-reg2-3.patch \ + file://CVE-2021-28153-1.patch \ + file://CVE-2021-28153-2.patch \ + file://CVE-2021-28153-3.patch \ + file://CVE-2021-28153-4.patch \ + file://CVE-2021-28153-5.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch"
Signature · 1 line
2.25.1
PATCH 3/18 busybox: Fix for CVE-2021-42374
In reply to Steve SakomanFrom: Pavel Zhukov <[email protected]>
An out-of-bounds heap read in unlzma leads to information leak and denial of service when crafted LZMA-compressed input is decompressed. This can be triggered by any applet/format that internally supports LZMA compression.
Reference: https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42374
--- .../busybox/busybox/CVE-2021-42374.patch | 53 +++++++++++++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 1 + 2 files changed, 54 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/CVE-2021-42374.patch
meta/recipes-core/busybox/busybox/CVE-2021-42374.patch new file +53 -0
@@ -0,0 +1,53 @@ +From 04f052c56ded5ab6a904e3a264a73dc0412b2e78 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko <[email protected]> +Date: Tue, 15 Jun 2021 15:07:57 +0200 +Subject: [PATCH] unlzma: fix a case where we could read before beginning of + buffer +Cc: [email protected] + +Testcase: + + 21 01 01 00 00 00 00 00 e7 01 01 01 ef 00 df b6 + 00 17 02 10 11 0f ff 00 16 00 00 + +Unfortunately, the bug is not reliably causing a segfault, +the behavior depends on what's in memory before the buffer. + +function old new delta +unpack_lzma_stream 2762 2768 +6 + +Signed-off-by: Denys Vlasenko <[email protected]> + +Signed-off-by: Pavel Zhukov <[email protected]> + +CVE: CVE-2021-42374 +Upstream-Status: Backport [https://git.busybox.net/busybox/commit/?h=1_33_stable&id=d326be2850ea2bd78fe2c22d6c45c3b861d82937] +Comment: testdata dropped because of binary format + +--- + archival/libarchive/decompress_unlzma.c | 5 ++++- + testsuite/unlzma.tests | 17 +++++++++++++---- + testsuite/unlzma_issue_3.lzma | Bin 0 -> 27 bytes + 3 files changed, 17 insertions(+), 5 deletions(-) + create mode 100644 testsuite/unlzma_issue_3.lzma + +diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c +index 0744f231a1d64d92676b0cada2342f88f3b39b31..fb5aac8fe9ea0c53e0c2d7a7cbd05a753e39bc9d 100644 +--- a/archival/libarchive/decompress_unlzma.c ++++ b/archival/libarchive/decompress_unlzma.c +@@ -290,8 +290,11 @@ unpack_lzma_stream(transformer_state_t *xstate) + uint32_t pos; + + pos = buffer_pos - rep0; +- if ((int32_t)pos < 0) ++ if ((int32_t)pos < 0) { + pos += header.dict_size; ++ if ((int32_t)pos < 0) ++ goto bad; ++ } + match_byte = buffer[pos]; + do { + int bit; +-- +2.34.0 +
meta/recipes-core/busybox/busybox_1.31.1.bb +1 -0
@@ -52,6 +52,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-hwclock-make-glibc-2.31-compatible.patch \ file://0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch \ file://0001-mktemp-add-tmpdir-option.patch \ + file://CVE-2021-42374.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg "
Signature · 1 line
2.25.1
PATCH 4/18 busybox: Fix for CVE-2021-42376
In reply to Steve SakomanFrom: Pavel Zhukov <[email protected]>
A NULL pointer dereference in Busybox's hush applet leads to denial of service when processing a crafted shell command, due to missing validation after a \x03 delimiter character.
This may be used for DoS under very rare conditions of filtered command input.
Reference: https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-42376
--- .../busybox/busybox/CVE-2021-42376.patch | 138 ++++++++++++++++++ meta/recipes-core/busybox/busybox_1.31.1.bb | 1 + 2 files changed, 139 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/CVE-2021-42376.patch
meta/recipes-core/busybox/busybox/CVE-2021-42376.patch new file +138 -0
@@ -0,0 +1,138 @@ +From 56a335378ac100d51c30b21eee499a2effa37fba Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko <[email protected]> +Date: Tue, 15 Jun 2021 16:05:57 +0200 +Subject: hush: fix handling of \^C and "^C" + +function old new delta +parse_stream 2238 2252 +14 +encode_string 243 256 +13 +------------------------------------------------------------------------------ +(add/remove: 0/0 grow/shrink: 2/0 up/down: 27/0) Total: 27 bytes + +Signed-off-by: Denys Vlasenko <[email protected]> +(cherry picked from commit 1b7a9b68d0e9aa19147d7fda16eb9a6b54156985) + +Signed-off-by: Pavel Zhukov <[email protected]> + +CVE: CVE-2021-42376 +Upstream-Status: Backport [https://git.busybox.net/busybox/patch/?id=56a335378ac100d51c30b21eee499a2effa37fba] +Comment: No changes in any hunk +--- + shell/ash_test/ash-misc/control_char3.right | 1 + + shell/ash_test/ash-misc/control_char3.tests | 2 ++ + shell/ash_test/ash-misc/control_char4.right | 1 + + shell/ash_test/ash-misc/control_char4.tests | 2 ++ + shell/hush.c | 11 +++++++++++ + shell/hush_test/hush-misc/control_char3.right | 1 + + shell/hush_test/hush-misc/control_char3.tests | 2 ++ + shell/hush_test/hush-misc/control_char4.right | 1 + + shell/hush_test/hush-misc/control_char4.tests | 2 ++ + 9 files changed, 23 insertions(+) + create mode 100644 shell/ash_test/ash-misc/control_char3.right + create mode 100755 shell/ash_test/ash-misc/control_char3.tests + create mode 100644 shell/ash_test/ash-misc/control_char4.right + create mode 100755 shell/ash_test/ash-misc/control_char4.tests + create mode 100644 shell/hush_test/hush-misc/control_char3.right + create mode 100755 shell/hush_test/hush-misc/control_char3.tests + create mode 100644 shell/hush_test/hush-misc/control_char4.right + create mode 100755 shell/hush_test/hush-misc/control_char4.tests + +diff --git a/shell/ash_test/ash-misc/control_char3.right b/shell/ash_test/ash-misc/control_char3.right +new file mode 100644 +index 000000000..283e02cbb +--- /dev/null ++++ b/shell/ash_test/ash-misc/control_char3.right +@@ -0,0 +1 @@ ++SHELL: line 1: : not found +diff --git a/shell/ash_test/ash-misc/control_char3.tests b/shell/ash_test/ash-misc/control_char3.tests +new file mode 100755 +index 000000000..4359db3f3 +--- /dev/null ++++ b/shell/ash_test/ash-misc/control_char3.tests +@@ -0,0 +1,2 @@ ++# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages) ++$THIS_SH -c '\' SHELL +diff --git a/shell/ash_test/ash-misc/control_char4.right b/shell/ash_test/ash-misc/control_char4.right +new file mode 100644 +index 000000000..2bf18e684 +--- /dev/null ++++ b/shell/ash_test/ash-misc/control_char4.right +@@ -0,0 +1 @@ ++SHELL: line 1: -: not found +diff --git a/shell/ash_test/ash-misc/control_char4.tests b/shell/ash_test/ash-misc/control_char4.tests +new file mode 100755 +index 000000000..48010f154 +--- /dev/null ++++ b/shell/ash_test/ash-misc/control_char4.tests +@@ -0,0 +1,2 @@ ++# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages) ++$THIS_SH -c '"-"' SHELL +diff --git a/shell/hush.c b/shell/hush.c +index 9fead37da..249728b9d 100644 +--- a/shell/hush.c ++++ b/shell/hush.c +@@ -5235,6 +5235,11 @@ static int encode_string(o_string *as_string, + } + #endif + o_addQchr(dest, ch); ++ if (ch == SPECIAL_VAR_SYMBOL) { ++ /* Convert "^C" to corresponding special variable reference */ ++ o_addchr(dest, SPECIAL_VAR_QUOTED_SVS); ++ o_addchr(dest, SPECIAL_VAR_SYMBOL); ++ } + goto again; + #undef as_string + } +@@ -5346,6 +5351,11 @@ static struct pipe *parse_stream(char **pstring, + if (ch == '\n') + continue; /* drop \<newline>, get next char */ + nommu_addchr(&ctx.as_string, '\\'); ++ if (ch == SPECIAL_VAR_SYMBOL) { ++ nommu_addchr(&ctx.as_string, ch); ++ /* Convert \^C to corresponding special variable reference */ ++ goto case_SPECIAL_VAR_SYMBOL; ++ } + o_addchr(&ctx.word, '\\'); + if (ch == EOF) { + /* Testcase: eval 'echo Ok\' */ +@@ -5670,6 +5680,7 @@ static struct pipe *parse_stream(char **pstring, + /* Note: nommu_addchr(&ctx.as_string, ch) is already done */ + + switch (ch) { ++ case_SPECIAL_VAR_SYMBOL: + case SPECIAL_VAR_SYMBOL: + /* Convert raw ^C to corresponding special variable reference */ + o_addchr(&ctx.word, SPECIAL_VAR_SYMBOL); +diff --git a/shell/hush_test/hush-misc/control_char3.right b/shell/hush_test/hush-misc/control_char3.right +new file mode 100644 +index 000000000..94b4f8699 +--- /dev/null ++++ b/shell/hush_test/hush-misc/control_char3.right +@@ -0,0 +1 @@ ++hush: can't execute '': No such file or directory +diff --git a/shell/hush_test/hush-misc/control_char3.tests b/shell/hush_test/hush-misc/control_char3.tests +new file mode 100755 +index 000000000..4359db3f3 +--- /dev/null ++++ b/shell/hush_test/hush-misc/control_char3.tests +@@ -0,0 +1,2 @@ ++# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages) ++$THIS_SH -c '\' SHELL +diff --git a/shell/hush_test/hush-misc/control_char4.right b/shell/hush_test/hush-misc/control_char4.right +new file mode 100644 +index 000000000..698e21427 +--- /dev/null ++++ b/shell/hush_test/hush-misc/control_char4.right +@@ -0,0 +1 @@ ++hush: can't execute '-': No such file or directory +diff --git a/shell/hush_test/hush-misc/control_char4.tests b/shell/hush_test/hush-misc/control_char4.tests +new file mode 100755 +index 000000000..48010f154 +--- /dev/null ++++ b/shell/hush_test/hush-misc/control_char4.tests +@@ -0,0 +1,2 @@ ++# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages) ++$THIS_SH -c '"-"' SHELL +-- +cgit v1.2.3 +
meta/recipes-core/busybox/busybox_1.31.1.bb +1 -0
@@ -53,6 +53,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-decompress_gunzip-Fix-DoS-if-gzip-is-corrupt.patch \ file://0001-mktemp-add-tmpdir-option.patch \ file://CVE-2021-42374.patch \ + file://CVE-2021-42376.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg "
Signature · 1 line
2.25.1
PATCH 5/18 vim: fix CVE-2021-3968 and CVE-2021-3973
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
Backport a fix for -3972, and whitelist -3968: it isn't valid as it fixes a bug which was introduced after 8.2.
--- ...rash-when-using-CTRL-W-f-without-fin.patch | 92 +++++++++++++++++++ meta/recipes-support/vim/vim.inc | 4 + 2 files changed, 96 insertions(+) create mode 100644 meta/recipes-support/vim/files/0002-patch-8.2.3611-crash-when-using-CTRL-W-f-without-fin.patch
meta/recipes-support/vim/files/0002-patch-8.2.3611-crash-when-using-CTRL-W-f-without-fin.patch new file +92 -0
@@ -0,0 +1,92 @@ +CVE: CVE-2021-3973 +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> + +From b6154e9f530544ddc3130d981caae0dabc053757 Mon Sep 17 00:00:00 2001 +From: Bram Moolenaar <[email protected]> +Date: Wed, 17 Nov 2021 18:00:31 +0000 +Subject: [PATCH] patch 8.2.3611: crash when using CTRL-W f without finding a + file name Problem: Crash when using CTRL-W f without finding + a file name. Solution: Bail out when the file name length is zero. + +--- + src/findfile.c | 8 ++++++++ + src/normal.c | 6 ++++-- + src/testdir/test_visual.vim | 8 ++++++++ + src/version.c | 2 ++ + 4 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/src/findfile.c b/src/findfile.c +index dba547da1..5764fd7b8 100644 +--- a/src/findfile.c ++++ b/src/findfile.c +@@ -1727,6 +1727,9 @@ find_file_in_path_option( + proc->pr_WindowPtr = (APTR)-1L; + # endif + ++ if (len == 0) ++ return NULL; ++ + if (first == TRUE) + { + // copy file name into NameBuff, expanding environment variables +@@ -2094,7 +2097,12 @@ find_file_name_in_path( + int c; + # if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) + char_u *tofree = NULL; ++# endif + ++ if (len == 0) ++ return NULL; ++ ++# if defined(FEAT_FIND_ID) && defined(FEAT_EVAL) + if ((options & FNAME_INCL) && *curbuf->b_p_inex != NUL) + { + tofree = eval_includeexpr(ptr, len); +diff --git a/src/normal.c b/src/normal.c +index 7cb959257..f0084f2ac 100644 +--- a/src/normal.c ++++ b/src/normal.c +@@ -3778,8 +3778,10 @@ get_visual_text( + *pp = ml_get_pos(&VIsual); + *lenp = curwin->w_cursor.col - VIsual.col + 1; + } +- if (has_mbyte) +- // Correct the length to include the whole last character. ++ if (**pp == NUL) ++ *lenp = 0; ++ if (has_mbyte && *lenp > 0) ++ // Correct the length to include all bytes of the last character. + *lenp += (*mb_ptr2len)(*pp + (*lenp - 1)) - 1; + } + reset_VIsual_and_resel(); +diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim +index ae281238e..0705fdb57 100644 +--- a/src/testdir/test_visual.vim ++++ b/src/testdir/test_visual.vim +@@ -894,4 +894,12 @@ func Test_block_insert_replace_tabs() + bwipe! + endfunc + ++func Test_visual_block_ctrl_w_f() ++ " Emtpy block selected in new buffer should not result in an error. ++ au! BufNew foo sil norm f ++ edit foo ++ ++ au! BufNew ++endfunc ++ + " vim: shiftwidth=2 sts=2 expandtab +diff --git a/src/version.c b/src/version.c +index 52be3c39d..59a314b3a 100644 +--- a/src/version.c ++++ b/src/version.c +@@ -742,6 +742,8 @@ static char *(features[]) = + + static int included_patches[] = + { /* Add new patch number below this line */ ++/**/ ++ 3611, + /**/ + 3582, + /**/
meta/recipes-support/vim/vim.inc +4 -0
@@ -25,6 +25,7 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch \ file://0001-patch-8.2.3581-reading-character-past-end-of-line.patch \ file://0002-patch-8.2.3582-reading-uninitialized-memory-when-giv.patch \ + file://0002-patch-8.2.3611-crash-when-using-CTRL-W-f-without-fin.patch \ " SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44"
@@ -32,6 +33,9 @@ SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" +# CVE-2021-3968 is related to an issue which was introduced after 8.2, this can be removed after 8.3. +CVE_CHECK_WHITELIST += "CVE-2021-3968" + S = "${WORKDIR}/git" VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
Signature · 1 line
2.25.1
PATCH 6/18 ncurses: Fix for CVE-2021-39537
In reply to Steve SakomanFrom: Ranjitsinh Rathod <[email protected]>
Add patch to fix CVE-2021-39537
--- .../ncurses/files/CVE-2021-39537.patch | 30 +++++++++++++++++++ meta/recipes-core/ncurses/ncurses_6.2.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-core/ncurses/files/CVE-2021-39537.patch
meta/recipes-core/ncurses/files/CVE-2021-39537.patch new file +30 -0
@@ -0,0 +1,30 @@ +$NetBSD: patch-ncurses_tinfo_captoinfo.c,v 1.1 2021/10/09 07:52:36 wiz Exp $ + +Fix for CVE-2021-39537 from upstream: +https://github.com/ThomasDickey/ncurses-snapshots/commit/63ca9e061f4644795d6f3f559557f3e1ed8c738b#diff-7e95c7bc5f213e9be438e69a9d5d0f261a14952bcbd692f7b9014217b8047340 + +CVE: CVE-2021-39537 +Upstream-Status: Backport [http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/devel/ncurses/patches/Attic/patch-ncurses_tinfo_captoinfo.c?rev=1.1&content-type=text/x-cvsweb-markup] +Signed-off-by: Ranjitsinh Rathod <[email protected]> + +--- a/ncurses/tinfo/captoinfo.c 2020-02-02 23:34:34.000000000 +0000 ++++ b/ncurses/tinfo/captoinfo.c +@@ -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);
meta/recipes-core/ncurses/ncurses_6.2.bb +1 -0
@@ -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"
Signature · 1 line
2.25.1
PATCH 7/18 libsolv: update tag for missing CVEs
In reply to Steve SakomanFrom: Ranjitsinh Rathod <[email protected]>
It seems like CVE-2021-33928, CVE-2021-33929, CVE-2021-33930 and CVE-2021-33938 are pointing to same patch as CVE-2021-3200
So add CVE tag inside the patch file which is the remedy for CVE-2021-33928, CVE-2021-33929, CVE-2021-33930 and CVE-2021-33938
Link:
https://ubuntu.com/security/CVE-2021-3200
https://ubuntu.com/security/CVE-2021-33928
https://ubuntu.com/security/CVE-2021-33929
https://ubuntu.com/security/CVE-2021-33930
https://ubuntu.com/security/CVE-2021-33938
--- meta/recipes-extended/libsolv/files/CVE-2021-3200.patch | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
meta/recipes-extended/libsolv/files/CVE-2021-3200.patch +7 -2
@@ -11,9 +11,14 @@ been added. (Jobs may point inside the whatproviedes array, so we must not invalidate this area.) -Upstream-Status: Backport -https://github.com/openSUSE/libsolv/commit/0077ef29eb46d2e1df2f230fc95a1d9748d49dec +Upstream-Status: Backport [https://github.com/openSUSE/libsolv/commit/0077ef29eb46d2e1df2f230fc95a1d9748d49dec] CVE: CVE-2021-3200 +CVE: CVE-2021-33928 +CVE: CVE-2021-33929 +CVE: CVE-2021-33930 +CVE: CVE-2021-33938 +Signed-off-by: Ranjitsinh Rathod <[email protected]> + Signed-off-by: Chee Yang Lee <[email protected]> --- ext/testcase.c | 21 +++++++++++++++++++++
Signature · 1 line
2.25.1
PATCH 8/18 bind: update to 9.11.33
In reply to Steve SakomanNotes for BIND 9.11.33
This maintenance release of BIND 9.11 contains no significant changes, although some minor updates have been made (for example, to eliminate compiler warnings emitted by GCC 11).
---
.../bind/{bind_9.11.32.bb => bind_9.11.33.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/bind/{bind_9.11.32.bb => bind_9.11.33.bb} (98%)meta/recipes-connectivity/bind/bind_9.11.33.bb renamed from meta/recipes-connectivity/bind/bind_9.11.32.bb +1 -1
@@ -21,7 +21,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "cbf8cb4b74dd1452d97c3a2a8c625ea346df8516b4b3508ef07443121a591342" +SRC_URI[sha256sum] = "293e767e96ac8ef17163e9f9cba52a6d27163807c29c88d36fe6e18d89083a3e" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.11 until 9.16, from 9.16 follow the ESV versions divisible by 4
Signature · 1 line
2.25.1
PATCH 9/18 bind: update to 9.11.34
In reply to Steve SakomanNotes for BIND 9.11.34
This maintenance release of BIND 9.11 contains no significant changes, although some minor updates have been made (for example, to fix build issues on Solaris 11).
---
.../bind/{bind_9.11.33.bb => bind_9.11.34.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/bind/{bind_9.11.33.bb => bind_9.11.34.bb} (98%)meta/recipes-connectivity/bind/bind_9.11.34.bb renamed from meta/recipes-connectivity/bind/bind_9.11.33.bb +1 -1
@@ -21,7 +21,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "293e767e96ac8ef17163e9f9cba52a6d27163807c29c88d36fe6e18d89083a3e" +SRC_URI[sha256sum] = "aa031775a73d30d951451034c84c4a716a10e6625acc4eb4bb878ed4c61b7271" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.11 until 9.16, from 9.16 follow the ESV versions divisible by 4
Signature · 1 line
2.25.1
PATCH 10/18 bind: update to 9.11.35
In reply to Steve SakomanNotes for BIND 9.11.35
Security Fixes
named failed to check the opcode of responses when performing zone refreshes, stub zone updates, and UPDATE forwarding. This could lead to an assertion failure under certain conditions and has been addressed by rejecting responses whose opcode does not match the expected value. [GL #2762]
---
.../bind/{bind_9.11.34.bb => bind_9.11.35.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/bind/{bind_9.11.34.bb => bind_9.11.35.bb} (98%)meta/recipes-connectivity/bind/bind_9.11.35.bb renamed from meta/recipes-connectivity/bind/bind_9.11.34.bb +1 -1
@@ -21,7 +21,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "aa031775a73d30d951451034c84c4a716a10e6625acc4eb4bb878ed4c61b7271" +SRC_URI[sha256sum] = "1c882705827b6aafa45d917ae3b20eccccc8d5df3c4477df44b04382e6c47562" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.11 until 9.16, from 9.16 follow the ESV versions divisible by 4
Signature · 1 line
2.25.1
PATCH 11/18 libdnf: Backport bugfix for upgrade calc
In reply to Steve SakomanFrom: Jate Sujjavanich <[email protected]>
Mark goal.upgrade with sltr as targeted
This allows a bugfix in dnf to work
--- ...job-goal.upgrade-with-sltr-as-target.patch | 58 +++++++++++++++++++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 2 files changed, 59 insertions(+) create mode 100644 meta/recipes-devtools/libdnf/libdnf/0040-Mark-job-goal.upgrade-with-sltr-as-target.patch
meta/recipes-devtools/libdnf/libdnf/0040-Mark-job-goal.upgrade-with-sltr-as-target.patch new file +58 -0
@@ -0,0 +1,58 @@ +From b4c5a3312287f31a2075a235db846ff611586d2c Mon Sep 17 00:00:00 2001 +From: Jaroslav Mracek <[email protected]> +Date: Tue, 3 Sep 2019 11:01:23 +0200 +Subject: [PATCH] Mark job goal.upgrade with sltr as targeted + +It allows to keep installed packages in upgrade set. + +It also prevents from reinstalling of modified packages with same NEVRA. + + +Backport commit b4c5a3312287f31a2075a235db846ff611586d2c from +https://github.com/rpm-software-management/libdnf + +This bug is present in oe-core's dnf + +Remove changes to spec file from upstream + +Upstream-Status: Backport +Signed-off-by: Jate Sujjavanich <[email protected]> +--- + libdnf.spec | 4 ++-- + libdnf/goal/Goal.cpp | 2 +- + libdnf/goal/Goal.hpp | 6 ++++-- + 3 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/libdnf/goal/Goal.cpp b/libdnf/goal/Goal.cpp +index b69be19..a38cbb4 100644 +--- a/libdnf/goal/Goal.cpp ++++ b/libdnf/goal/Goal.cpp +@@ -767,7 +767,7 @@ void + Goal::upgrade(HySelector sltr) + { + pImpl->actions = static_cast<DnfGoalActions>(pImpl->actions | DNF_UPGRADE); +- sltrToJob(sltr, &pImpl->staging, SOLVER_UPDATE); ++ sltrToJob(sltr, &pImpl->staging, SOLVER_UPDATE|SOLVER_TARGETED); + } + + void +diff --git a/libdnf/goal/Goal.hpp b/libdnf/goal/Goal.hpp +index f33dfa2..d701317 100644 +--- a/libdnf/goal/Goal.hpp ++++ b/libdnf/goal/Goal.hpp +@@ -86,8 +86,10 @@ public: + /** + * @brief If selector ill formed, it rises std::runtime_error() + * +- * @param sltr p_sltr: It should contain only upgrades with obsoletes otherwise it can try to +- * reinstall installonly packages. ++ * @param sltr p_sltr: It contains upgrade-to packages and obsoletes. The presence of installed ++ * packages prevents reinstalling packages with the same NEVRA but changed contant. To honor repo ++ * priority all relevant packages must be present. To upgrade package foo from priority repo, all ++ * installed and available packages of the foo must be in selector plus obsoletes of foo. + */ + void upgrade(HySelector sltr); + void userInstalled(DnfPackage *pkg); +-- +2.7.4 +
meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +1 -0
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=master;protoco file://0001-Add-WITH_TESTS-option.patch \ file://0001-include-stdexcept-for-runtime_error.patch \ file://fix-deprecation-warning.patch \ + file://0040-Mark-job-goal.upgrade-with-sltr-as-target.patch \ " SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77"
Signature · 1 line
2.25.1
PATCH 12/18 dnf: Backport bugfix for upgrade
In reply to Steve SakomanFrom: Jate Sujjavanich <[email protected]>
Keep installed packages in upgrade job
This prevents duplicate identical packages from being reinstalled with each upgrade
--- ...ackages-in-upgrade-job-RhBug-1728252.patch | 60 +++++++++++++++++++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + 2 files changed, 61 insertions(+) create mode 100644 meta/recipes-devtools/dnf/dnf/0040-Keep-installed-packages-in-upgrade-job-RhBug-1728252.patch
meta/recipes-devtools/dnf/dnf/0040-Keep-installed-packages-in-upgrade-job-RhBug-1728252.patch new file +60 -0
@@ -0,0 +1,60 @@ +From c88a77198c0156e425c2725f30e481207de5162f Mon Sep 17 00:00:00 2001 +From: Jaroslav Mracek <[email protected]> +Date: Tue, 3 Sep 2019 11:01:51 +0200 +Subject: [PATCH] Keep installed packages in upgrade job + (RhBug:1728252,1644241,1741381) + +In combination with marking of job as TARGETED it prevents from +reinstalling of modified packages with same NEVRA. + +https://bugzilla.redhat.com/show_bug.cgi?id=1728252 +https://bugzilla.redhat.com/show_bug.cgi?id=1644241 +https://bugzilla.redhat.com/show_bug.cgi?id=1741381 + +Closes: #1474 +Approved by: m-blaha + + +Backport to fix bug in dnf in oe-core +from https://github.com/rpm-software-management/dnf + +Removed spec file portion of patch + +Upstream-Status: Backport +Signed-off-by: Jate Sujjavanich <[email protected]> +--- + dnf.spec | 4 ++-- + dnf/base.py | 3 --- + dnf/module/module_base.py | 2 +- + 3 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/dnf/base.py b/dnf/base.py +index b2ced61..628c154 100644 +--- a/dnf/base.py ++++ b/dnf/base.py +@@ -1968,9 +1968,6 @@ class Base(object): + obsoletes=q.installed().union(q.upgrades())) + # add obsoletes into transaction + q = q.union(obsoletes) +- # provide only available packages to solver otherwise selection of available +- # possibilities will be ignored +- q = q.available() + if reponame is not None: + q.filterm(reponame=reponame) + q = self._merge_update_filters(q, pkg_spec=pkg_spec) +diff --git a/dnf/module/module_base.py b/dnf/module/module_base.py +index 976d730..ce70f63 100644 +--- a/dnf/module/module_base.py ++++ b/dnf/module/module_base.py +@@ -214,7 +214,7 @@ class ModuleBase(object): + + if not upgrade_package_set: + logger.error(_("Unable to match profile in argument {}").format(spec)) +- query = self.base.sack.query().available().filterm(name=upgrade_package_set) ++ query = self.base.sack.query().filterm(name=upgrade_package_set) + if query: + sltr = dnf.selector.Selector(self.base.sack) + sltr.set(pkg=query) +-- +2.7.4 +
meta/recipes-devtools/dnf/dnf_4.2.2.bb +1 -0
@@ -16,6 +16,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc file://0030-Run-python-scripts-using-env.patch \ file://Fix-SyntaxWarning.patch \ file://0001-set-python-path-for-completion_helper.patch \ + file://0040-Keep-installed-packages-in-upgrade-job-RhBug-1728252.patch \ " SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d"
Signature · 1 line
2.25.1
PATCH 13/18 libunwind: Backport a fix for -fno-common option to compile
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
[Khem Raj]
defaults for gcc is to use -fno-common this ensures that it keeps building with gcc -fno-common
Fixessrc/arm/Ginit.c:60: multiple definition of `_U_dyn_info_list'; mi/.libs/dyn-info-list.o:/usr/src/debug/libunwind/1.4.0-r0/build/src/../../libunwind-1.4.0/src/mi/dyn-info-list.c:28: first defined here
[Philippe Coval]
Change and related patch ported to dunfell branch on 1.3.1 version
Origin: https://github.com/openembedded/openembedded-core/commit/6cd2cf6525bcb241b3a2538e559fcef2a2084a7e
--- ...0001-Fix-compilation-with-fno-common.patch | 420 ++++++++++++++++++ .../libunwind/libunwind_1.3.1.bb | 1 + 2 files changed, 421 insertions(+) create mode 100644 meta/recipes-support/libunwind/libunwind/0001-Fix-compilation-with-fno-common.patch
meta/recipes-support/libunwind/libunwind/0001-Fix-compilation-with-fno-common.patch new file +420 -0
@@ -0,0 +1,420 @@ +From 51112447b316813ad1ae50ea66feca4eb755a424 Mon Sep 17 00:00:00 2001 +From: Yichao Yu <[email protected]> +Date: Tue, 31 Mar 2020 00:43:32 -0400 +Subject: [PATCH] Fix compilation with -fno-common. + +[Khem Raj] +Making all other archs consistent with IA64 which should not have this problem. +Also move the FIXME to the correct place. + +Also add some minimum comments about this... + +[Philippe Coval] + +Patch ported to v1.3-stable branch, +patch to be used used in openembedded-core dunfell branch (on v1.3.1) +for oniro project. + +Upstream-Status: Backport [https://github.com/libunwind/libunwind/pull/166] +Signed-off-by: Khem Raj <[email protected]> +Thanks-to: Yichao Yu <[email protected]> +Origin: https://github.com/libunwind/libunwind/commit/29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e +Relate-to: https://booting.oniroproject.org/distro/oniro/-/issues/191 +Forwarded: https://github.com/libunwind/libunwind/pull/312 +Last-Update: 2021-11-25 +Signed-off-by: Philippe Coval <[email protected]> +--- + src/aarch64/Ginit.c | 15 +++++++-------- + src/arm/Ginit.c | 15 +++++++-------- + src/coredump/_UPT_get_dyn_info_list_addr.c | 5 +++++ + src/hppa/Ginit.c | 15 +++++++-------- + src/ia64/Ginit.c | 1 + + src/mi/Gfind_dynamic_proc_info.c | 1 + + src/mips/Ginit.c | 15 +++++++-------- + src/ppc32/Ginit.c | 11 +++++++---- + src/ppc64/Ginit.c | 11 +++++++---- + src/ptrace/_UPT_get_dyn_info_list_addr.c | 5 +++++ + src/sh/Ginit.c | 15 +++++++-------- + src/tilegx/Ginit.c | 15 +++++++-------- + src/x86/Ginit.c | 15 +++++++-------- + src/x86_64/Ginit.c | 15 +++++++-------- + 14 files changed, 82 insertions(+), 72 deletions(-) + +diff --git a/src/aarch64/Ginit.c b/src/aarch64/Ginit.c +index 9c4eae82..cb954b15 100644 +--- a/src/aarch64/Ginit.c ++++ b/src/aarch64/Ginit.c +@@ -61,13 +61,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -78,7 +71,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/arm/Ginit.c b/src/arm/Ginit.c +index 2720d063..0bac0d72 100644 +--- a/src/arm/Ginit.c ++++ b/src/arm/Ginit.c +@@ -57,18 +57,17 @@ tdep_uc_addr (unw_tdep_context_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/coredump/_UPT_get_dyn_info_list_addr.c b/src/coredump/_UPT_get_dyn_info_list_addr.c +index 0d119055..739ed056 100644 +--- a/src/coredump/_UPT_get_dyn_info_list_addr.c ++++ b/src/coredump/_UPT_get_dyn_info_list_addr.c +@@ -74,6 +74,11 @@ get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, + + #else + ++/* XXX fix me: there is currently no way to locate the dyn-info list ++ by a remote unwinder. On ia64, this is done via a special ++ unwind-table entry. Perhaps something similar can be done with ++ DWARF2 unwind info. */ ++ + static inline int + get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, + int *countp) +diff --git a/src/hppa/Ginit.c b/src/hppa/Ginit.c +index 461e4b93..265455a6 100644 +--- a/src/hppa/Ginit.c ++++ b/src/hppa/Ginit.c +@@ -64,13 +64,6 @@ _Uhppa_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -81,7 +74,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/ia64/Ginit.c b/src/ia64/Ginit.c +index b09a2ad5..8601bb3c 100644 +--- a/src/ia64/Ginit.c ++++ b/src/ia64/Ginit.c +@@ -68,6 +68,7 @@ get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + if (!_U_dyn_info_list_addr) + return -UNW_ENOINFO; + #endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. + *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } +diff --git a/src/mi/Gfind_dynamic_proc_info.c b/src/mi/Gfind_dynamic_proc_info.c +index 98d35012..2e7c62e5 100644 +--- a/src/mi/Gfind_dynamic_proc_info.c ++++ b/src/mi/Gfind_dynamic_proc_info.c +@@ -49,6 +49,7 @@ local_find_proc_info (unw_addr_space_t as, unw_word_t ip, unw_proc_info_t *pi, + return -UNW_ENOINFO; + #endif + ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. + list = (unw_dyn_info_list_t *) (uintptr_t) _U_dyn_info_list_addr (); + for (di = list->first; di; di = di->next) + if (ip >= di->start_ip && ip < di->end_ip) +diff --git a/src/mips/Ginit.c b/src/mips/Ginit.c +index 3df170c7..bf7a8f5a 100644 +--- a/src/mips/Ginit.c ++++ b/src/mips/Ginit.c +@@ -69,13 +69,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -86,7 +79,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) (intptr_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/ppc32/Ginit.c b/src/ppc32/Ginit.c +index ba302448..7b454558 100644 +--- a/src/ppc32/Ginit.c ++++ b/src/ppc32/Ginit.c +@@ -91,9 +91,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -104,7 +101,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/ppc64/Ginit.c b/src/ppc64/Ginit.c +index 4c88cd6e..7bfb395a 100644 +--- a/src/ppc64/Ginit.c ++++ b/src/ppc64/Ginit.c +@@ -95,9 +95,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -108,7 +105,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/ptrace/_UPT_get_dyn_info_list_addr.c b/src/ptrace/_UPT_get_dyn_info_list_addr.c +index cc5ed044..16671d45 100644 +--- a/src/ptrace/_UPT_get_dyn_info_list_addr.c ++++ b/src/ptrace/_UPT_get_dyn_info_list_addr.c +@@ -71,6 +71,11 @@ get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, + + #else + ++/* XXX fix me: there is currently no way to locate the dyn-info list ++ by a remote unwinder. On ia64, this is done via a special ++ unwind-table entry. Perhaps something similar can be done with ++ DWARF2 unwind info. */ ++ + static inline int + get_list_addr (unw_addr_space_t as, unw_word_t *dil_addr, void *arg, + int *countp) +diff --git a/src/sh/Ginit.c b/src/sh/Ginit.c +index 52988a72..9fe96d2b 100644 +--- a/src/sh/Ginit.c ++++ b/src/sh/Ginit.c +@@ -58,13 +58,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -75,7 +68,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/tilegx/Ginit.c b/src/tilegx/Ginit.c +index 7564a558..925e6413 100644 +--- a/src/tilegx/Ginit.c ++++ b/src/tilegx/Ginit.c +@@ -64,13 +64,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -81,7 +74,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) (intptr_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/x86/Ginit.c b/src/x86/Ginit.c +index f6b8dc27..3cec74a2 100644 +--- a/src/x86/Ginit.c ++++ b/src/x86/Ginit.c +@@ -54,13 +54,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -71,7 +64,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +diff --git a/src/x86_64/Ginit.c b/src/x86_64/Ginit.c +index b7e8e462..fe6bcc33 100644 +--- a/src/x86_64/Ginit.c ++++ b/src/x86_64/Ginit.c +@@ -49,13 +49,6 @@ static struct unw_addr_space local_addr_space; + + unw_addr_space_t unw_local_addr_space = &local_addr_space; + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -66,7 +59,13 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ // Access the `_U_dyn_info_list` from `LOCAL_ONLY` library, i.e. libunwind.so. ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + +-- +2.32.0 +
meta/recipes-support/libunwind/libunwind_1.3.1.bb +1 -0
@@ -7,6 +7,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV file://0004-Fix-build-on-mips-musl.patch \ file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ file://0006-Fix-for-X32.patch \ + file://0001-Fix-compilation-with-fno-common.patch \ " SRC_URI_append_libc-musl = " file://musl-header-conflict.patch"
Signature · 1 line
2.25.1
PATCH 14/18 buildhistory: Fix srcrevs output
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
The code was assuming that the a recipe with only one srcrev wouldn't "name" it. This isn't the case as the glibc or bzip2 recipes show, you can have a single srcrev which is named.
We can pull the data from the fetcher and in fact we already have it, we just need to handle the "default" case and make that code the default for all srcrev regardless of length.
[YOCTO #14017]
--- meta/classes/buildhistory.bbclass | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
meta/classes/buildhistory.bbclass +13 -17
@@ -953,23 +953,19 @@ def write_latest_srcrev(d, pkghistdir): value = value.replace('"', '').strip() old_tag_srcrevs[key] = value with open(srcrevfile, 'w') as f: - orig_srcrev = d.getVar('SRCREV', False) or 'INVALID' - if orig_srcrev != 'INVALID': - f.write('# SRCREV = "%s"\n' % orig_srcrev) - if len(srcrevs) > 1: - for name, srcrev in sorted(srcrevs.items()): - orig_srcrev = d.getVar('SRCREV_%s' % name, False) - if orig_srcrev: - f.write('# SRCREV_%s = "%s"\n' % (name, orig_srcrev)) - f.write('SRCREV_%s = "%s"\n' % (name, srcrev)) - else: - f.write('SRCREV = "%s"\n' % next(iter(srcrevs.values()))) - if len(tag_srcrevs) > 0: - for name, srcrev in sorted(tag_srcrevs.items()): - f.write('# tag_%s = "%s"\n' % (name, srcrev)) - if name in old_tag_srcrevs and old_tag_srcrevs[name] != srcrev: - pkg = d.getVar('PN') - bb.warn("Revision for tag %s in package %s was changed since last build (from %s to %s)" % (name, pkg, old_tag_srcrevs[name], srcrev)) + for name, srcrev in sorted(srcrevs.items()): + suffix = "_" + name + if name == "default": + suffix = "" + orig_srcrev = d.getVar('SRCREV%s' % suffix, False) + if orig_srcrev: + f.write('# SRCREV%s = "%s"\n' % (suffix, orig_srcrev)) + f.write('SRCREV%s = "%s"\n' % (suffix, srcrev)) + for name, srcrev in sorted(tag_srcrevs.items()): + f.write('# tag_%s = "%s"\n' % (name, srcrev)) + if name in old_tag_srcrevs and old_tag_srcrevs[name] != srcrev: + pkg = d.getVar('PN') + bb.warn("Revision for tag %s in package %s was changed since last build (from %s to %s)" % (name, pkg, old_tag_srcrevs[name], srcrev)) else: if os.path.exists(srcrevfile):
Signature · 1 line
2.25.1
PATCH 15/18 oeqa/parselogs: Fix quoting
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
Fix deprecation warnings about invalid escape sequences.
--- meta/lib/oeqa/runtime/cases/parselogs.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
meta/lib/oeqa/runtime/cases/parselogs.py +7 -7
@@ -296,7 +296,7 @@ class ParseLogsTest(OERuntimeTestCase): grepcmd = 'grep ' grepcmd += '-Ei "' for error in errors: - grepcmd += '\<' + error + '\>' + '|' + grepcmd += r'\<' + error + r'\>' + '|' grepcmd = grepcmd[:-1] grepcmd += '" ' + str(log) + " | grep -Eiv \'"
@@ -307,13 +307,13 @@ class ParseLogsTest(OERuntimeTestCase): errorlist = ignore_errors['default'] for ignore_error in errorlist: - ignore_error = ignore_error.replace('(', '\(') - ignore_error = ignore_error.replace(')', '\)') + ignore_error = ignore_error.replace('(', r'\(') + ignore_error = ignore_error.replace(')', r'\)') ignore_error = ignore_error.replace("'", '.') - ignore_error = ignore_error.replace('?', '\?') - ignore_error = ignore_error.replace('[', '\[') - ignore_error = ignore_error.replace(']', '\]') - ignore_error = ignore_error.replace('*', '\*') + ignore_error = ignore_error.replace('?', r'\?') + ignore_error = ignore_error.replace('[', r'\[') + ignore_error = ignore_error.replace(']', r'\]') + ignore_error = ignore_error.replace('*', r'\*') ignore_error = ignore_error.replace('0-9', '[0-9]') grepcmd += ignore_error + '|' grepcmd = grepcmd[:-1]
Signature · 1 line
2.25.1
PATCH 16/18 cmake: FindGTest: Add target for gmock library
In reply to Steve SakomanFrom: Eero Aaltonen <[email protected]>
googlemock has been absorbed into the [googletest](https://github.com/google/googletest) project and is built and installed from the same source tree.
googletest has provided a CMake Config-file Package starting with GTest 1.8.1. find_package(GTest ...) by default dispatches first to CMake Find Module. Starting with CMake commit 2327b4330cce157d616ff8b611b3e77568d00351 in CMake v3.20.0 the module dispatches onward to the Config-file Package so that the same targets are available. In pre v3.20.0 versions of CMake however the Find Module masks the targets provided by the upstream GTest package.
Update Modules/FindGTest.cmake to provide the same targets as the CMake Config-file Package and backwards compatible targets and result variables.
--- .../cmake/cmake-native_3.16.5.bb | 1 + ...ndGTest-Add-target-for-gmock-library.patch | 255 ++++++++++++++++++ 2 files changed, 256 insertions(+) create mode 100644 meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add-target-for-gmock-library.patch
meta/recipes-devtools/cmake/cmake-native_3.16.5.bb +1 -0
@@ -7,6 +7,7 @@ SRC_URI += "file://OEToolchainConfig.cmake \ file://environment.d-cmake.sh \ file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \ file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \ + file://0006-cmake-FindGTest-Add-target-for-gmock-library.patch \ "
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add-target-for-gmock-library.patch new file +255 -0
255 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [OE-core][dunfell 16/18] cmake: FindGTest: Add target for gmock library
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi,
I can't provide any details yet, but I can say with certainty that this patch breaks our build (using the parent commit
746b301d37f9b7333f3d93e6fb7ea2808665df41 as refspec during the build worksasexpected):
[...] undefined reference to `testing::*
Can someone confirm this issue? Feel free to reach out for further details.
- --
With best regards
Jasper Orschulko
DevOps Engineer
Tel. +49 30 58 58 14 265
Fax +49 30 58 58 14 999
[email protected]
• • • • • • • • • • • • • • • • • • • • • • • • • •
iris-GmbH
infrared & intelligent sensors
Schnellerstraße 1-5 | 12439 Berlin
Quoted 347 lines · Steve Sakoman
From: Eero Aaltonen <[email protected]>
googlemockhas been absorbed into the [googletest](https://github.com/google/googletest) project and is built
and installed from the same source tree.
googletesthas provided a CMake Config-file Package starting with GTest 1.8.1.find_package(GTest ...)by default dispatches first to CMake Find Module. Starting with CMake commit2327b4330cce157d616ff8b611b3e77568d00351in CMake v3.20.0 the module dispatches onward to the Config-file Package so that the same targets are available. In pre v3.20.0 versions of CMake however the Find Module
masks the targets provided by the upstreamGTestpackage.Update
Modules/FindGTest.cmaketo provide the same targets as the CMake Config-file Package and backwards compatible targets and result variables.Signed-off-by Eero Aaltonen <[email protected]>Signed-off-by Steve Sakoman <[email protected]>---
.../cmake/cmake-native_3.16.5.bb | 1 + ...ndGTest-Add-target-for-gmock-library.patch | 255
++++++++++++++++++2 files changed, 256 insertions(+)create mode 100644 meta/recipes-devtools/cmake/cmake/0006-cmake- FindGTest-Add-target-for-gmock-library.patch
meta/recipes-devtools/cmake/cmake-native_3.16.5.bb +0
-0@@ -7,6 +7,7 @@ SRC_URI += "file://OEToolchainConfig.cmake \ file://environment.d-cmake.sh \file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \
file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \
+ file://0006-cmake-FindGTest-Add-target-for-gmock-library.patch \
"(quoted diff) +0
-0Add-target-for-gmock-library.patch b/meta/recipes- devtools/cmake/cmake/0006-cmake-FindGTest-Add-target-for-gmock- library.patch
new file mode 100644
index 0000000000..267f586a71meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +0
-0target-for-gmock-library.patch
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +1
-0@@ -0,0 +1,255 @@ +From 39eae0d6c1b398f18761abac7f55944f0290f8a1 Mon Sep 17 00:00:002001
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +6
-0+From: Eero Aaltonen <[email protected]> +Date: Sun, 17 Oct 2021 17:13:07 +0300 +Subject: [PATCH] FindGTest: Add target for gmock library + +`googlemock` has been absorbed into the +[googletest](https://github.com/google/googletest) project and isbuilt
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +17
-0+and installed from the same source tree. + +As GTest may be built with or without GMock, skip GMock if it is not +present. + +Do not provide result variables for GMock. They are not provided by +upstream GTest's CMake Package Configuration File. + +Also update the test case to cover linking to `GTest::gmock`. + +The patch was imported from the Kitware git server +([email protected]:cmake/cmake.git) as of commit id +50bf457a0dd857cf976b22c5be7d333493233d1e + +Patch was modified to support upper case variable `GTEST_FOUND`. + +Upstream-Status: Accepted[https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6632]
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +12
-0+Milestone: 3.23.0 + +Signed-off-by: Eero Aaltonen <[email protected]> +--- + .../dev/FindGTest-target-for-gmock.rst | 4 + + Modules/FindGTest.cmake | 133 +++++++++++++++--- + Tests/FindGTest/Test/CMakeLists.txt | 4 + + 3 files changed, 121 insertions(+), 20 deletions(-) + create mode 100644 Help/release/dev/FindGTest-target-for-gmock.rst + +diff --git a/Help/release/dev/FindGTest-target-for-gmock.rst
b/Help/release/dev/FindGTest-target-for-gmock.rstmeta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +9
-0+new file mode 100644 +index 0000000000..f78242c80e +--- /dev/null ++++ b/Help/release/dev/FindGTest-target-for-gmock.rst +@@ -0,0 +1,4 @@ ++FindGTest-target-for-gmock ++-------------------------- ++ ++* The :module:`FindGTest` module now provides a target for GMock,if found.
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +26
-0+diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake +index e015a9840f..0331049594 100644 +--- a/Modules/FindGTest.cmake ++++ b/Modules/FindGTest.cmake +@@ -7,10 +7,23 @@ FindGTest + + Locate the Google C++ Testing Framework. + ++.. versionadded:: 3.20 ++ Upstream ``GTestConfig.cmake`` is used if possible. ++ + Imported targets + ^^^^^^^^^^^^^^^^ + +-This module defines the following :prop_tgt:`IMPORTED` targets: ++ This module defines the following :prop_tgt:`IMPORTED` targets: ++ ++``GTest::gtest`` ++ The Google Test ``gtest`` library, if found; adds Thread::Thread ++ automatically ++``GTest::gtest_main`` ++ The Google Test ``gtest_main`` library, if found ++ ++.. deprecated:: 3.20 ++ For backwards compatibility, this module defines additionally the ++ following deprecated :prop_tgt:`IMPORTED` targets (availablesince 3.5):
+
+ ``GTest::GTest``
+ The Google Test ``gtest`` library, if found; addsThread::Thread+@@ -18,7 +31,6 @@ This module defines the following :prop_tgt:IMPORTEDtargets:
+ ``GTest::Main``
+ The Google Test ``gtest_main`` library, if found
+
+-
+ Result variables
+ ^^^^^^^^^^^^^^^^
+
+@@ -146,8 +158,42 @@function(__gtest_import_library _target _var _config)
+endif()
+endfunction()
+ ++function(__gtest_define_backwards_compatible_library_targets) ++set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} PARENT_SCOPE)
++
++ # Add targets mapping the same library names as defined in ++ # older versions of CMake's FindGTest
++ if(NOT TARGETGTest::GTest)
++add_library(GTest::GTest INTERFACE IMPORTED)
++target_link_libraries(GTest::GTest INTERFACE GTest::gtest)++endif()
++ if(NOT TARGETGTest::Main)
++add_library(GTest::Main INTERFACE IMPORTED)
++target_link_libraries(GTest::Main INTERFACE GTest::gtest_main)
++endif()
++endfunction()
++
+ #
+ ++include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cma ke)
++
++# first specifically look for the CMake version of GTest ++find_package(GTest QUIETNO_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()
++
+if(NOT DEFINED GTEST_MSVC_SEARCH)
+set(GTEST_MSVC_SEARCH MD)
+endif()
+@@ -194,50 +240,97 @@if(MSVC AND GTEST_MSVC_SEARCH STREQUAL "MD")+__gtest_find_library(GTEST_LIBRARY_DEBUG gtest-mdd gtestd)+__gtest_find_library(GTEST_MAIN_LIBRARY gtest_main-md gtest_main)
+__gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_main-mdd gtest_maind)
++__gtest_find_library(GMOCK_LIBRARY gmock-md gmock)++__gtest_find_library(GMOCK_LIBRARY_DEBUG gmock-mdd gmockd)++__gtest_find_library(GMOCK_MAIN_LIBRARY gmock_main-md gmock_main)
++__gtest_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_main-mdd gmock_maind)
+else()
+__gtest_find_library(GTEST_LIBRARY gtest)+__gtest_find_library(GTEST_LIBRARY_DEBUG gtestd)+__gtest_find_library(GTEST_MAIN_LIBRARY gtest_main)+__gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_maind)++__gtest_find_library(GMOCK_LIBRARY gmock)++__gtest_find_library(GMOCK_LIBRARY_DEBUG gmockd)++__gtest_find_library(GMOCK_MAIN_LIBRARY gmock_main)++__gtest_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_maind)
+endif()
+
+-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTest DEFAULT_MSG GTEST_LIBRARY GTEST_INCLUDE_DIR GTEST_MAIN_LIBRARY)
+
+-if(GTEST_FOUND)
++if(GMOCK_LIBRARY ANDGMOCK_MAIN_LIBRARY)
++set(GMock_FOUND True)
++else()
++set(GMock_FOUND False)
++endif()
++
++if(GTest_FOUND)
+set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
+__gtest_append_debugs(GTEST_LIBRARIES GTEST_LIBRARY)+__gtest_append_debugs(GTEST_MAIN_LIBRARIES GTEST_MAIN_LIBRARY)+-set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
+
+find_package(Threads QUIET)
+
+- if(NOT TARGETGTest::GTest)
++ if(NOT TARGETGTest::gtest)
+__gtest_determine_library_type(GTEST_LIBRARY)
+-add_library(GTest::GTest ${GTEST_LIBRARY_TYPE} IMPORTED)++add_library(GTest::gtest ${GTEST_LIBRARY_TYPE} IMPORTED)+ if(TARGETThreads::Threads)
+- set_target_properties(GTest::GTest PROPERTIES ++ set_target_properties(GTest::gtest PROPERTIES +INTERFACE_LINK_LIBRARIESThreads::Threads) +endif()
+if(GTEST_LIBRARY_TYPE STREQUAL "SHARED")
+- set_target_properties(GTest::GTest PROPERTIES ++ set_target_properties(GTest::gtest PROPERTIES +INTERFACE_COMPILE_DEFINITIONS"GTEST_LINKED_AS_SHARED_LIBRARY=1")
+endif()
+if(GTEST_INCLUDE_DIRS)
+- set_target_properties(GTest::GTest PROPERTIES ++ set_target_properties(GTest::gtest PROPERTIES +INTERFACE_INCLUDE_DIRECTORIES"${GTEST_INCLUDE_DIRS}")
+endif()+- __gtest_import_library(GTest::GTest GTEST_LIBRARY "") +- __gtest_import_library(GTest::GTest GTEST_LIBRARY"RELEASE")
+-__gtest_import_library(GTest::GTest GTEST_LIBRARY "DEBUG")++__gtest_import_library(GTest::gtest GTEST_LIBRARY "")++__gtest_import_library(GTest::gtest GTEST_LIBRARY "RELEASE")
++__gtest_import_library(GTest::gtest GTEST_LIBRARY "DEBUG")+endif()
+- if(NOT TARGETGTest::Main)
++if(NOT TARGET GTest::gtest_main)
+__gtest_determine_library_type(GTEST_MAIN_LIBRARY)+-add_library(GTest::Main ${GTEST_MAIN_LIBRARY_TYPE} IMPORTED)+- set_target_properties(GTest::Main PROPERTIES +- INTERFACE_LINK_LIBRARIES "GTest::GTest") +- __gtest_import_library(GTest::Main GTEST_MAIN_LIBRARY "") +- __gtest_import_library(GTest::Main GTEST_MAIN_LIBRARY"RELEASE")
+-__gtest_import_library(GTest::Main GTEST_MAIN_LIBRARY "DEBUG")
++add_library(GTest::gtest_main ${GTEST_MAIN_LIBRARY_TYPE} IMPORTED)
++set_target_properties(GTest::gtest_main PROPERTIES ++ INTERFACE_LINK_LIBRARIES "GTest::gtest")
++__gtest_import_library(GTest::gtest_main GTEST_MAIN_LIBRARY "")
++__gtest_import_library(GTest::gtest_main GTEST_MAIN_LIBRARY "RELEASE")
++__gtest_import_library(GTest::gtest_main GTEST_MAIN_LIBRARY "DEBUG")
++endif()
++
++__gtest_define_backwards_compatible_library_targets()++endif()
++
++if(GMock_FOUND)
++ if(NOT TARGETGTest::gmock)
++__gtest_determine_library_type(GMOCK_LIBRARY)
++add_library(GTest::gmock ${GMOCK_LIBRARY_TYPE} IMPORTED)++set(_gmock_link_libraries "GTest::gtest")
++ if(TARGETThreads::Threads)
++list(APPEND _gmock_link_libraries Threads::Threads)++endif()
++ set_target_properties(GTest::gmock PROPERTIES
++INTERFACE_LINK_LIBRARIES"${_gmock_link_libraries}") ++if(GMOCK_LIBRARY_TYPE STREQUAL "SHARED")
++ set_target_properties(GTest::gmock PROPERTIES ++INTERFACE_COMPILE_DEFINITIONS"GMOCK_LINKED_AS_SHARED_LIBRARY=1")
++endif()
++if(GTEST_INCLUDE_DIRS)
++ set_target_properties(GTest::gmock PROPERTIES ++INTERFACE_INCLUDE_DIRECTORIES"${GTEST_INCLUDE_DIRS}")
++endif()
++__gtest_import_library(GTest::gmock GMOCK_LIBRARY "")++__gtest_import_library(GTest::gmock GMOCK_LIBRARY "RELEASE")
++__gtest_import_library(GTest::gmock GMOCK_LIBRARY "DEBUG")++endif()
++if(NOT TARGET GTest::gmock_main)
++__gtest_determine_library_type(GMOCK_MAIN_LIBRARY)++add_library(GTest::gmock_main ${GMOCK_MAIN_LIBRARY_TYPE} IMPORTED)
++set_target_properties(GTest::gmock_main PROPERTIES ++ INTERFACE_LINK_LIBRARIES "GTest::gmock")
++__gtest_import_library(GTest::gmock_main GMOCK_MAIN_LIBRARY "")
++__gtest_import_library(GTest::gmock_main GMOCK_MAIN_LIBRARY "RELEASE")
++__gtest_import_library(GTest::gmock_main GMOCK_MAIN_LIBRARY "DEBUG")
+endif()
+endif()
+diff --gita/Tests/FindGTest/Test/CMakeLists.txtb/Tests/FindGTest/Test/CMakeLists.txt
+indexb65b9d28f6..7d3a378a65100644
+---a/Tests/FindGTest/Test/CMakeLists.txt
++++b/Tests/FindGTest/Test/CMakeLists.txt
+@@ -12,3 +12,7 @@add_executable(test_gtest_var main.cxx)
+target_include_directories(test_gtest_var PRIVATE ${GTEST_INCLUDE_DIRS})
+target_link_libraries(test_gtest_var PRIVATE ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
Quoted 8 lines
+
add_test(NAME test_gtest_var COMMAND test_gtest_var)++
++add_executable(test_gmock_tgt main.cxx) ++target_link_libraries(test_gmock_tgtGTest::gmock_main) ++add_test(NAMEtest_gmock_tgtCOMMANDtest_gmock_tgt)
+--
+2.17.1
+
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGyPwAACgkQYgqew07V MNU+qwf/a6pDdacJlCGlNha+d2AbkAqiAlC/djP0i5h17mhRhvfZWwvm8DlyXUNL oYjhi7y6PvO2H7TTsACey7bBcGBwyikTrpBrloxaa+KDKkG1OIvpzJBlRNGA/PUT vZMmDtL6S4E3SuxwBT8P/ShH+RSijJDWVq+9UgNz6jyuNIx4lSVU9lVTACNpN4Mj PI5YXl3g6HZA364UnEZ+KFKwoc5Ihm5U71KkKKekNaOVNf4rzkcwy8bQFc0WyH42 4N/sPDByu/8INnabZm04ypqIOAMGOKsLjuZqvy2PeFiBoXCRsxJD9SF6iFFVeuuc /lP9iIFOIHxUFkeopGvLH7ol8YQtow==
=72K+
-----END PGP SIGNATURE-----
Re: [OE-core][dunfell 16/18] cmake: FindGTest: Add target for gmock library
Quoted 6 lines · Jasper Orschulko
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256Hi,
Quoted 8 lines
I can't provide any details yet, but I can say with certainty that this patch breaks our build (using the parent commit
746b301d37f9b7333f3d93e6fb7ea2808665df41 as refspec during the build worksasexpected):[...] undefined reference to `testing::*
Can someone confirm this issue? Feel free to reach out for further details.
I've not seen any issues in either local or autobuilder testing, so I think we need more details!
Steve
Quoted 376 lines · Steve Sakoman
Quoted 347 lines
From: Eero Aaltonen <[email protected]>
googlemockhas been absorbed into the [googletest](https://github.com/google/googletest) project and is built
and installed from the same source tree.
googletesthas provided a CMake Config-file Package starting with GTest 1.8.1.find_package(GTest ...)by default dispatches first to CMake Find Module. Starting with CMake commit2327b4330cce157d616ff8b611b3e77568d00351in CMake v3.20.0 the module dispatches onward to the Config-file Package so that the same targets are available. In pre v3.20.0 versions of CMake however the Find Module
masks the targets provided by the upstreamGTestpackage.Update
Modules/FindGTest.cmaketo provide the same targets as the CMake Config-file Package and backwards compatible targets and result variables.Signed-off-by Eero Aaltonen <[email protected]>Signed-off-by Steve Sakoman <[email protected]>--- .../cmake/cmake-native_3.16.5.bb | 1 + ...ndGTest-Add-target-for-gmock-library.patch | 255 ++++++++++++++++++ 2 files changed, 256 insertions(+) create mode 100644 meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add-target-for-gmock-library.patch
meta/recipes-devtools/cmake/cmake-native_3.16.5.bb +0
-0@@ -7,6 +7,7 @@ SRC_URI += "file://OEToolchainConfig.cmake \ file://environment.d-cmake.sh \file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
\file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch
\
+file://0006-cmake-FindGTest-Add-target-for-gmock-library.patch \ "(quoted diff) +0
-0Add-target-for-gmock-library.patch b/meta/recipes- devtools/cmake/cmake/0006-cmake-FindGTest-Add-target-for-gmock- library.patch
new file mode 100644
index 0000000000..267f586a71meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +0
-0target-for-gmock-library.patch
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +1
-0@@ -0,0 +1,255 @@ +From 39eae0d6c1b398f18761abac7f55944f0290f8a1 Mon Sep 17 00:00:002001
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +6
-0+From: Eero Aaltonen <[email protected]> +Date: Sun, 17 Oct 2021 17:13:07 +0300 +Subject: [PATCH] FindGTest: Add target for gmock library + +`googlemock` has been absorbed into the +[googletest](https://github.com/google/googletest) project and isbuilt
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +17
-0+and installed from the same source tree. + +As GTest may be built with or without GMock, skip GMock if it is not +present. + +Do not provide result variables for GMock. They are not provided by +upstream GTest's CMake Package Configuration File. + +Also update the test case to cover linking to `GTest::gmock`. + +The patch was imported from the Kitware git server +([email protected]:cmake/cmake.git) as of commit id +50bf457a0dd857cf976b22c5be7d333493233d1e + +Patch was modified to support upper case variable `GTEST_FOUND`. + +Upstream-Status: Accepted[https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6632]
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +12
-0+Milestone: 3.23.0 + +Signed-off-by: Eero Aaltonen <[email protected]> +--- + .../dev/FindGTest-target-for-gmock.rst | 4 + + Modules/FindGTest.cmake | 133 +++++++++++++++--- + Tests/FindGTest/Test/CMakeLists.txt | 4 + + 3 files changed, 121 insertions(+), 20 deletions(-) + create mode 100644 Help/release/dev/FindGTest-target-for-gmock.rst + +diff --git a/Help/release/dev/FindGTest-target-for-gmock.rst
b/Help/release/dev/FindGTest-target-for-gmock.rstmeta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +9
-0+new file mode 100644 +index 0000000000..f78242c80e +--- /dev/null ++++ b/Help/release/dev/FindGTest-target-for-gmock.rst +@@ -0,0 +1,4 @@ ++FindGTest-target-for-gmock ++-------------------------- ++ ++* The :module:`FindGTest` module now provides a target for GMock,if found.
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +26
-0+diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake +index e015a9840f..0331049594 100644 +--- a/Modules/FindGTest.cmake ++++ b/Modules/FindGTest.cmake +@@ -7,10 +7,23 @@ FindGTest + + Locate the Google C++ Testing Framework. + ++.. versionadded:: 3.20 ++ Upstream ``GTestConfig.cmake`` is used if possible. ++ + Imported targets + ^^^^^^^^^^^^^^^^ + +-This module defines the following :prop_tgt:`IMPORTED` targets: ++ This module defines the following :prop_tgt:`IMPORTED` targets: ++ ++``GTest::gtest`` ++ The Google Test ``gtest`` library, if found; adds Thread::Thread ++ automatically ++``GTest::gtest_main`` ++ The Google Test ``gtest_main`` library, if found ++ ++.. deprecated:: 3.20 ++ For backwards compatibility, this module defines additionally the ++ following deprecated :prop_tgt:`IMPORTED` targets (availablesince 3.5):
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +4
-0+ + ``GTest::GTest`` + The Google Test ``gtest`` library, if found; adds Thread::Thread +@@ -18,7 +31,6 @@ This module defines the following:prop_tgt:
IMPORTEDtargets:
+ ``GTest::Main``meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +7
-0+ The Google Test ``gtest_main`` library, if found + +- + Result variables + ^^^^^^^^^^^^^^^^ + +@@ -146,8 +158,42 @@ function(__gtest_import_library _target _var
_config)meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +5
-0+ endif() + endfunction() + ++function(__gtest_define_backwards_compatible_library_targets) ++ set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES}${GTEST_MAIN_LIBRARIES}
PARENT_SCOPE)
++++ # Add targets mapping the same library names as defined in ++ # older versions of CMake's FindGTest ++ if(NOT TARGET GTest::GTest)++
add_library(GTest::GTest INTERFACE IMPORTED)
++target_link_libraries(GTest::GTest INTERFACE GTest::gtest)
++endif()
++ if(NOT TARGETGTest::Main)
++add_library(GTest::Main INTERFACE IMPORTED)
++ target_link_libraries(GTest::Main INTERFACEGTest::gtest_main)
++endif()
++endfunction()
++
+ #
+ ++include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cma ke)
++
++# first specifically look for the CMake version of GTest ++find_package(GTest QUIETNO_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(GTestHANDLE_COMPONENTSCONFIG_MODE)
++
++set(GTEST_LIBRARIES GTest::gtest)
++set(GTEST_MAIN_LIBRARIES GTest::gtest_main)
++
++__gtest_define_backwards_compatible_library_targets()
++
++return()
++endif()
++
+if(NOT DEFINED GTEST_MSVC_SEARCH)meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +5
-0+ set(GTEST_MSVC_SEARCH MD) + endif() +@@ -194,50 +240,97 @@ if(MSVC AND GTEST_MSVC_SEARCH STREQUAL "MD") + __gtest_find_library(GTEST_LIBRARY_DEBUG gtest-mdd gtestd) + __gtest_find_library(GTEST_MAIN_LIBRARY gtest_main-md
gtest_main)
+ __gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_main-mddgtest_maind)++ __gtest_find_library(GMOCK_LIBRARY gmock-md gmock) ++ __gtest_find_library(GMOCK_LIBRARY_DEBUG gmock-mdd gmockd) ++ __gtest_find_library(GMOCK_MAIN_LIBRARY gmock_main-md
gmock_main)
++ __gtest_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_main-mddgmock_maind)
+else()meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +11
-0+ __gtest_find_library(GTEST_LIBRARY gtest) + __gtest_find_library(GTEST_LIBRARY_DEBUG gtestd) + __gtest_find_library(GTEST_MAIN_LIBRARY gtest_main) + __gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_maind) ++ __gtest_find_library(GMOCK_LIBRARY gmock) ++ __gtest_find_library(GMOCK_LIBRARY_DEBUG gmockd) ++ __gtest_find_library(GMOCK_MAIN_LIBRARY gmock_main) ++ __gtest_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_maind) + endif() + +-
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTest DEFAULT_MSG GTEST_LIBRARY GTEST_INCLUDE_DIR GTEST_MAIN_LIBRARY)meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +13
-0+ +-if(GTEST_FOUND) ++if(GMOCK_LIBRARY AND GMOCK_MAIN_LIBRARY) ++ set(GMock_FOUND True) ++else() ++ set(GMock_FOUND False) ++endif() ++ ++if(GTest_FOUND) + set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR}) + __gtest_append_debugs(GTEST_LIBRARIES GTEST_LIBRARY) + __gtest_append_debugs(GTEST_MAIN_LIBRARIES GTEST_MAIN_LIBRARY) +- set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES}${GTEST_MAIN_LIBRARIES})
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +17
-0+ + find_package(Threads QUIET) + +- if(NOT TARGET GTest::GTest) ++ if(NOT TARGET GTest::gtest) + __gtest_determine_library_type(GTEST_LIBRARY) +- add_library(GTest::GTest ${GTEST_LIBRARY_TYPE} IMPORTED) ++ add_library(GTest::gtest ${GTEST_LIBRARY_TYPE} IMPORTED) + if(TARGET Threads::Threads) +- set_target_properties(GTest::GTest PROPERTIES ++ set_target_properties(GTest::gtest PROPERTIES + INTERFACE_LINK_LIBRARIES Threads::Threads) + endif() + if(GTEST_LIBRARY_TYPE STREQUAL "SHARED") +- set_target_properties(GTest::GTest PROPERTIES ++ set_target_properties(GTest::gtest PROPERTIES + INTERFACE_COMPILE_DEFINITIONS"GTEST_LINKED_AS_SHARED_LIBRARY=1")
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +5
-0+ endif() + if(GTEST_INCLUDE_DIRS) +- set_target_properties(GTest::GTest PROPERTIES ++ set_target_properties(GTest::gtest PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES"${GTEST_INCLUDE_DIRS}")
+ endif() +- __gtest_import_library(GTest::GTest GTEST_LIBRARY "") +- __gtest_import_library(GTest::GTest GTEST_LIBRARY "RELEASE") +- __gtest_import_library(GTest::GTest GTEST_LIBRARY "DEBUG") ++ __gtest_import_library(GTest::gtest GTEST_LIBRARY "") ++ __gtest_import_library(GTest::gtest GTEST_LIBRARY"RELEASE")
++__gtest_import_library(GTest::gtest GTEST_LIBRARY "DEBUG")meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +5
-0+ endif() +- if(NOT TARGET GTest::Main) ++ if(NOT TARGET GTest::gtest_main) + __gtest_determine_library_type(GTEST_MAIN_LIBRARY) +- add_library(GTest::Main ${GTEST_MAIN_LIBRARY_TYPE}IMPORTED)
+- set_target_properties(GTest::Main PROPERTIES +- INTERFACE_LINK_LIBRARIES "GTest::GTest") +- __gtest_import_library(GTest::Main GTEST_MAIN_LIBRARY "") +- __gtest_import_library(GTest::Main GTEST_MAIN_LIBRARY"RELEASE")
+- __gtest_import_library(GTest::MainGTEST_MAIN_LIBRARY
"DEBUG")
++ add_library(GTest::gtest_main ${GTEST_MAIN_LIBRARY_TYPE}
IMPORTED)
++ set_target_properties(GTest::gtest_main PROPERTIES
++INTERFACE_LINK_LIBRARIES"GTest::gtest")
++ __gtest_import_library(GTest::gtest_mainGTEST_MAIN_LIBRARY
"")
++ __gtest_import_library(GTest::gtest_mainGTEST_MAIN_LIBRARY
"RELEASE")
++ __gtest_import_library(GTest::gtest_mainGTEST_MAIN_LIBRARY
"DEBUG")
++endif()
++
++__gtest_define_backwards_compatible_library_targets()
++endif()
++
++if(GMock_FOUND)
++ if(NOT TARGETGTest::gmock)++ __gtest_determine_library_type(GMOCK_LIBRARY) ++ add_library(GTest::gmock ${GMOCK_LIBRARY_TYPE} IMPORTED) ++ set(_gmock_link_libraries "GTest::gtest") ++ if(TARGET Threads::Threads)++
list(APPEND _gmock_link_libraries Threads::Threads)
++endif()
++ set_target_properties(GTest::gmock PROPERTIES
++INTERFACE_LINK_LIBRARIES"${_gmock_link_libraries}")
++if(GMOCK_LIBRARY_TYPE STREQUAL "SHARED")
++ set_target_properties(GTest::gmock PROPERTIES
++INTERFACE_COMPILE_DEFINITIONS
"GMOCK_LINKED_AS_SHARED_LIBRARY=1")
++endif()
++if(GTEST_INCLUDE_DIRS)
++ set_target_properties(GTest::gmock PROPERTIES
++INTERFACE_INCLUDE_DIRECTORIES
"${GTEST_INCLUDE_DIRS}")++ endif() ++ __gtest_import_library(GTest::gmock GMOCK_LIBRARY "") ++ __gtest_import_library(GTest::gmock GMOCK_LIBRARY"RELEASE")
++__gtest_import_library(GTest::gmock GMOCK_LIBRARY "DEBUG")
++endif()
++if(NOT TARGET GTest::gmock_main)
++__gtest_determine_library_type(GMOCK_MAIN_LIBRARY)
++ add_library(GTest::gmock_main ${GMOCK_MAIN_LIBRARY_TYPE}
IMPORTED)
++ set_target_properties(GTest::gmock_main PROPERTIES
++INTERFACE_LINK_LIBRARIES"GTest::gmock")
++ __gtest_import_library(GTest::gmock_mainGMOCK_MAIN_LIBRARY
"")
++ __gtest_import_library(GTest::gmock_mainGMOCK_MAIN_LIBRARY
"RELEASE")
++ __gtest_import_library(GTest::gmock_mainGMOCK_MAIN_LIBRARY
"DEBUG")meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +3
-0+ endif() + endif() +diff --git a/Tests/FindGTest/Test/CMakeLists.txt
b/Tests/FindGTest/Test/CMakeLists.txt
+indexb65b9d28f6..7d3a378a65100644
+---a/Tests/FindGTest/Test/CMakeLists.txt
++++b/Tests/FindGTest/Test/CMakeLists.txt
+@@ -12,3 +12,7 @@add_executable(test_gtest_var main.cxx)
+target_include_directories(test_gtest_var PRIVATE ${GTEST_INCLUDE_DIRS})
+target_link_libraries(test_gtest_var PRIVATE ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})Quoted 8 lines
+
add_test(NAME test_gtest_var COMMAND test_gtest_var)++
++add_executable(test_gmock_tgt main.cxx) ++target_link_libraries(test_gmock_tgtGTest::gmock_main) ++add_test(NAMEtest_gmock_tgtCOMMANDtest_gmock_tgt)
+--
+2.17.1
+-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGyPwAACgkQYgqew07V MNU+qwf/a6pDdacJlCGlNha+d2AbkAqiAlC/djP0i5h17mhRhvfZWwvm8DlyXUNL oYjhi7y6PvO2H7TTsACey7bBcGBwyikTrpBrloxaa+KDKkG1OIvpzJBlRNGA/PUT vZMmDtL6S4E3SuxwBT8P/ShH+RSijJDWVq+9UgNz6jyuNIx4lSVU9lVTACNpN4Mj PI5YXl3g6HZA364UnEZ+KFKwoc5Ihm5U71KkKKekNaOVNf4rzkcwy8bQFc0WyH42 4N/sPDByu/8INnabZm04ypqIOAMGOKsLjuZqvy2PeFiBoXCRsxJD9SF6iFFVeuuc /lP9iIFOIHxUFkeopGvLH7ol8YQtow==
=72K+
-----END PGP SIGNATURE------=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159473): https://lists.openembedded.org/g/openembedded-core/message/159473
Mute This Topic: https://lists.openembedded.org/mt/87483225/3617601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][dunfell 16/18] cmake: FindGTest: Add target for gmock library
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
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
So all good here! :)
- --
With best regards
Jasper Orschulko
DevOps Engineer
Tel. +49 30 58 58 14 265
Fax +49 30 58 58 14 999
[email protected]
• • • • • • • • • • • • • • • • • • • • • • • • • •
iris-GmbH
infrared & intelligent sensors
Schnellerstraße 1-5 | 12439 Berlin
Quoted 16 lines · Steve Sakoman
Quoted 14 lines · Jasper Orschulko
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256Hi,
I can't provide any details yet, but I can say with certainty that this
patch breaks our build (using the parent commit746b301d37f9b7333f3d93e6fb7ea2808665df41as refspec during the build worksasexpected):[...] undefined reference to `testing::*
Quoted 432 lines
Quoted 2 lines
Can someone confirm this issue? Feel free to reach out for further details.
I've not seen any issues in either local or autobuilder testing, so I think we need more details!
Steve
Quoted 424 lines · Steve Sakoman
Quoted 392 lines
From: Eero Aaltonen <[email protected]>
googlemockhas been absorbed into the [googletest](https://github.com/google/googletest) project and is built
and installed from the same source tree.
googletesthas provided a CMake Config-file Package starting with
GTest 1.8.1.find_package(GTest ...)by default dispatches first to
CMake Find Module. Starting with CMake commit2327b4330cce157d616ff8b611b3e77568d00351in CMake v3.20.0 the module
dispatches onward to the Config-file Package so that the same targets
are available. In pre v3.20.0 versions of CMake however the Find Module
masks the targets provided by the upstreamGTestpackage.Update
Modules/FindGTest.cmaketo provide the same targets as the
CMake Config-file Package and backwards compatible targets and result
variables.Signed-off-by Eero Aaltonen <[email protected]>Signed-off-by Steve Sakoman <[email protected]>---
.../cmake/cmake-native_3.16.5.bb | 1 + ...ndGTest-Add-target-for-gmock-library.patch | 255
++++++++++++++++++2 files changed, 256 insertions(+)create mode 100644 meta/recipes-devtools/cmake/cmake/0006-cmake- FindGTest-Add-target-for-gmock-library.patch
meta/recipes-devtools/cmake/cmake-native_3.16.5.bb +0
-0@@ -7,6 +7,7 @@ SRC_URI += "file://OEToolchainConfig.cmake \ file://environment.d-cmake.sh \file://0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch \
file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \
+ file://0006-cmake-FindGTest-Add-target-for-gmock-library.patch \
"(quoted diff) +0
-0FindGTest-
Add-target-for-gmock-library.patch b/meta/recipes- devtools/cmake/cmake/0006-cmake-FindGTest-Add-target-for-gmock- library.patch
new file mode 100644
index 0000000000..267f586a71meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +0
-0target-for-gmock-library.patch
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +1
-0@@ -0,0 +1,255 @@ +From 39eae0d6c1b398f18761abac7f55944f0290f8a1 Mon Sep 1700:00:00
2001meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +6
-0+From: Eero Aaltonen <[email protected]> +Date: Sun, 17 Oct 2021 17:13:07 +0300 +Subject: [PATCH] FindGTest: Add target for gmock library + +`googlemock` has been absorbed into the +[googletest](https://github.com/google/googletest) project andis
builtmeta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +3
-0+and installed from the same source tree. + +As GTest may be built with or without GMock, skip GMock if it isnot
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +3
-0+present. + +Do not provide result variables for GMock. They are notprovided by
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +11
-0+upstream GTest's CMake Package Configuration File. + +Also update the test case to cover linking to `GTest::gmock`. + +The patch was imported from the Kitware git server +([email protected]:cmake/cmake.git) as of commit id +50bf457a0dd857cf976b22c5be7d333493233d1e + +Patch was modified to support upper case variable `GTEST_FOUND`. + +Upstream-Status: Accepted[https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6632]
meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +10
-0+Milestone: 3.23.0 + +Signed-off-by: Eero Aaltonen <[email protected]> +--- + .../dev/FindGTest-target-for-gmock.rst | 4 + + Modules/FindGTest.cmake | 133 +++++++++++++++--- + Tests/FindGTest/Test/CMakeLists.txt | 4 + + 3 files changed, 121 insertions(+), 20 deletions(-) + create mode 100644 Help/release/dev/FindGTest-target-for-
gmock.rstmeta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +2
-0+ +diff --git a/Help/release/dev/FindGTest-target-for-gmock.rst
b/Help/release/dev/FindGTest-target-for-gmock.rstmeta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +9
-0+new file mode 100644 +index 0000000000..f78242c80e +--- /dev/null ++++ b/Help/release/dev/FindGTest-target-for-gmock.rst +@@ -0,0 +1,4 @@ ++FindGTest-target-for-gmock ++-------------------------- ++ ++* The :module:`FindGTest` module now provides a target forGMock,
if found.meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +16
-0+diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake +index e015a9840f..0331049594 100644 +--- a/Modules/FindGTest.cmake ++++ b/Modules/FindGTest.cmake +@@ -7,10 +7,23 @@ FindGTest + + Locate the Google C++ Testing Framework. + ++.. versionadded:: 3.20 ++ Upstream ``GTestConfig.cmake`` is used if possible. ++ + Imported targets + ^^^^^^^^^^^^^^^^ + +-This module defines the following :prop_tgt:`IMPORTED` targets: ++ This module defines the following :prop_tgt:`IMPORTED`targets:
++
++``GTest::gtest``
++ The Google Test ``gtest`` library, if found; addsThread::Thread
++ automatically
++``GTest::gtest_main``
++ The Google Test ``gtest_main`` library, if found
++
++.. deprecated:: 3.20
++ For backwards compatibility, this module defines additionally the
++ following deprecated :prop_tgt:IMPORTEDtargets (available since 3.5):
+
+ ``GTest::GTest``
+ The Google Test ``gtest`` library, if found; addsThread::Thread
+@@ -18,7 +31,6 @@ This module defines the following :prop_tgt:IMPORTEDtargets:
+ ``GTest::Main``
+ The Google Test ``gtest_main`` library, if foundmeta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +6
-0+ +- + Result variables + ^^^^^^^^^^^^^^^^ + +@@ -146,8 +158,42 @@ function(__gtest_import_library _target
_var_config)
+endif()
+endfunction()
+ ++function(__gtest_define_backwards_compatible_library_targets) ++set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} PARENT_SCOPE)
++
++ # Add targets mapping the same library names as defined in ++ # older versions of CMake's FindGTest
++ if(NOT TARGETGTest::GTest)
++add_library(GTest::GTest INTERFACE IMPORTED)++target_link_libraries(GTest::GTest INTERFACE GTest::gtest)
++endif()
++ if(NOT TARGETGTest::Main)
++add_library(GTest::Main INTERFACE IMPORTED)++target_link_libraries(GTest::Main INTERFACE GTest::gtest_main)
++endif()
++endfunction()
++
+ #
+ ++include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs .cma
ke)
++
++# first specifically look for the CMake version of GTest ++find_package(GTest QUIETNO_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()
++
+if(NOT DEFINED GTEST_MSVC_SEARCH)
+set(GTEST_MSVC_SEARCH MD)
+endif()
+@@ -194,50 +240,97 @@if(MSVC AND GTEST_MSVC_SEARCH STREQUAL "MD")
+__gtest_find_library(GTEST_LIBRARY_DEBUG gtest-mdd gtestd)
+__gtest_find_library(GTEST_MAIN_LIBRARY gtest_main-md gtest_main)
+ __gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_main- mddgtest_maind)
++__gtest_find_library(GMOCK_LIBRARY gmock-md gmock)
++__gtest_find_library(GMOCK_LIBRARY_DEBUG gmock-mdd gmockd)
++__gtest_find_library(GMOCK_MAIN_LIBRARY gmock_main-md gmock_main)
++ __gtest_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_main- mddgmock_maind)
+else()
+__gtest_find_library(GTEST_LIBRARY gtest)+__gtest_find_library(GTEST_LIBRARY_DEBUG gtestd)+__gtest_find_library(GTEST_MAIN_LIBRARY gtest_main)+__gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_maind)++__gtest_find_library(GMOCK_LIBRARY gmock)++__gtest_find_library(GMOCK_LIBRARY_DEBUG gmockd)++__gtest_find_library(GMOCK_MAIN_LIBRARY gmock_main)++__gtest_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_maind)
+endif()
+
+- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.c make
)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTestDEFAULT_MSGGTEST_LIBRARYGTEST_INCLUDE_DIRGTEST_MAIN_LIBRARY)
+
+-if(GTEST_FOUND)
++if(GMOCK_LIBRARY ANDGMOCK_MAIN_LIBRARY)
++set(GMock_FOUND True)
++else()
++set(GMock_FOUND False)
++endif()
++
++if(GTest_FOUND)
+set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
+__gtest_append_debugs(GTEST_LIBRARIES GTEST_LIBRARY)+__gtest_append_debugs(GTEST_MAIN_LIBRARIES GTEST_MAIN_LIBRARY)
+-set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})meta/recipes-devtools/cmake/cmake/0006-cmake-FindGTest-Add- new file +7
-0+ + find_package(Threads QUIET) + +- if(NOT TARGET GTest::GTest) ++ if(NOT TARGET GTest::gtest) + __gtest_determine_library_type(GTEST_LIBRARY) +- add_library(GTest::GTest ${GTEST_LIBRARY_TYPE}IMPORTED)
++add_library(GTest::gtest ${GTEST_LIBRARY_TYPE} IMPORTED)
+ if(TARGETThreads::Threads)
+- set_target_properties(GTest::GTest PROPERTIES ++ set_target_properties(GTest::gtest PROPERTIES +INTERFACE_LINK_LIBRARIESThreads::Threads) +endif()
+if(GTEST_LIBRARY_TYPE STREQUAL "SHARED")+- set_target_properties(GTest::GTest PROPERTIES ++ set_target_properties(GTest::gtest PROPERTIES +INTERFACE_COMPILE_DEFINITIONS"GTEST_LINKED_AS_SHARED_LIBRARY=1")
+endif()
+if(GTEST_INCLUDE_DIRS)
+- set_target_properties(GTest::GTest PROPERTIES ++ set_target_properties(GTest::gtest PROPERTIES +INTERFACE_INCLUDE_DIRECTORIES"${GTEST_INCLUDE_DIRS}")
+endif()+- __gtest_import_library(GTest::GTest GTEST_LIBRARY "") +- __gtest_import_library(GTest::GTest GTEST_LIBRARY"RELEASE")
+-__gtest_import_library(GTest::GTest GTEST_LIBRARY "DEBUG")
++__gtest_import_library(GTest::gtest GTEST_LIBRARY "")++__gtest_import_library(GTest::gtest GTEST_LIBRARY "RELEASE")
++__gtest_import_library(GTest::gtest GTEST_LIBRARY "DEBUG")
+endif()
+- if(NOT TARGETGTest::Main)
++if(NOT TARGET GTest::gtest_main)
+__gtest_determine_library_type(GTEST_MAIN_LIBRARY)+-add_library(GTest::Main ${GTEST_MAIN_LIBRARY_TYPE} IMPORTED)+- set_target_properties(GTest::Main PROPERTIES +- INTERFACE_LINK_LIBRARIES "GTest::GTest") +- __gtest_import_library(GTest::Main GTEST_MAIN_LIBRARY"")
+-__gtest_import_library(GTest::Main GTEST_MAIN_LIBRARY "RELEASE")
+-__gtest_import_library(GTest::Main GTEST_MAIN_LIBRARY "DEBUG")
++ add_library(GTest::gtest_main ${GTEST_MAIN_LIBRARY_TYPE}
IMPORTED)
++set_target_properties(GTest::gtest_main PROPERTIES ++ INTERFACE_LINK_LIBRARIES "GTest::gtest")++ __gtest_import_library(GTest::gtest_mainGTEST_MAIN_LIBRARY
"")
++ __gtest_import_library(GTest::gtest_mainGTEST_MAIN_LIBRARY
"RELEASE")
++ __gtest_import_library(GTest::gtest_mainGTEST_MAIN_LIBRARY
"DEBUG")
++endif()
++
++__gtest_define_backwards_compatible_library_targets()++endif()
++
++if(GMock_FOUND)
++ if(NOT TARGETGTest::gmock)
++__gtest_determine_library_type(GMOCK_LIBRARY)++add_library(GTest::gmock ${GMOCK_LIBRARY_TYPE} IMPORTED)
++set(_gmock_link_libraries "GTest::gtest")
++ if(TARGETThreads::Threads)
++list(APPEND _gmock_link_libraries Threads::Threads)++endif()
++ set_target_properties(GTest::gmock PROPERTIES ++INTERFACE_LINK_LIBRARIES"${_gmock_link_libraries}")
++if(GMOCK_LIBRARY_TYPE STREQUAL "SHARED")
++ set_target_properties(GTest::gmock PROPERTIES ++INTERFACE_COMPILE_DEFINITIONS"GMOCK_LINKED_AS_SHARED_LIBRARY=1")
++endif()
++if(GTEST_INCLUDE_DIRS)
++ set_target_properties(GTest::gmock PROPERTIES ++INTERFACE_INCLUDE_DIRECTORIES"${GTEST_INCLUDE_DIRS}")
++endif()
++__gtest_import_library(GTest::gmock GMOCK_LIBRARY "")++__gtest_import_library(GTest::gmock GMOCK_LIBRARY "RELEASE")
++__gtest_import_library(GTest::gmock GMOCK_LIBRARY "DEBUG")
++endif()
++if(NOT TARGET GTest::gmock_main)
++__gtest_determine_library_type(GMOCK_MAIN_LIBRARY)++ add_library(GTest::gmock_main ${GMOCK_MAIN_LIBRARY_TYPE}
IMPORTED)
++set_target_properties(GTest::gmock_main PROPERTIES ++ INTERFACE_LINK_LIBRARIES "GTest::gmock")++ __gtest_import_library(GTest::gmock_mainGMOCK_MAIN_LIBRARY
"")
++ __gtest_import_library(GTest::gmock_mainGMOCK_MAIN_LIBRARY
"RELEASE")
++ __gtest_import_library(GTest::gmock_mainGMOCK_MAIN_LIBRARY
"DEBUG")
+endif()
+endif()
+diff --gita/Tests/FindGTest/Test/CMakeLists.txtb/Tests/FindGTest/Test/CMakeLists.txt
+indexb65b9d28f6..7d3a378a65100644
+---a/Tests/FindGTest/Test/CMakeLists.txt
++++b/Tests/FindGTest/Test/CMakeLists.txt
+@@ -12,3 +12,7 @@add_executable(test_gtest_var main.cxx)
+target_include_directories(test_gtest_var PRIVATE ${GTEST_INCLUDE_DIRS})
+target_link_libraries(test_gtest_var PRIVATE ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})Quoted 8 lines
+
add_test(NAME test_gtest_var COMMAND test_gtest_var)++
++add_executable(test_gmock_tgt main.cxx) ++target_link_libraries(test_gmock_tgtGTest::gmock_main) ++add_test(NAMEtest_gmock_tgtCOMMANDtest_gmock_tgt)
+--
+2.17.1
+-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGyPwAACgkQYgqew07V MNU+qwf/a6pDdacJlCGlNha+d2AbkAqiAlC/djP0i5h17mhRhvfZWwvm8DlyXUNL oYjhi7y6PvO2H7TTsACey7bBcGBwyikTrpBrloxaa+KDKkG1OIvpzJBlRNGA/PUT vZMmDtL6S4E3SuxwBT8P/ShH+RSijJDWVq+9UgNz6jyuNIx4lSVU9lVTACNpN4Mj PI5YXl3g6HZA364UnEZ+KFKwoc5Ihm5U71KkKKekNaOVNf4rzkcwy8bQFc0WyH42 4N/sPDByu/8INnabZm04ypqIOAMGOKsLjuZqvy2PeFiBoXCRsxJD9SF6iFFVeuuc /lP9iIFOIHxUFkeopGvLH7ol8YQtow==
=72K+
-----END PGP SIGNATURE------=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#159473):
https://lists.openembedded.org/g/openembedded-core/message/159473
Mute This Topic: https://lists.openembedded.org/mt/87483225/3617601
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-core/unsub [
[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEE4WyPMIC5Ap4+Ooo1Ygqew07VMNUFAmGzoSAACgkQYgqew07V MNUawAf/aoqsdt2f0at05sKUMQRvby+wwBdq+0MnSzQvnkalYZmqVWu9EmVobIaL PgZyzhBFaCMhiKA80sirEqDwippgOyVMtydaXJBNhztCnsyg2pbmouaOZsmjeJ/L bCbJhK+z3eaXzDivZ37/5oIs97hynTgeanJlpowsuE6FXEX8Q8hU7vPjhVjGTeIE wKEGDqDJUMwrmaSmDf+pQcikE5TmsOZyGS006c6S6FmpifImzwM8J/sxmOWtTaN1 EmDGj7h7lsG3+v7XkOODTdDn0Teoe61x0uIfPqvK35ig8V6SP/ylwKF81zK248d/ TWMB7wqyaL6+9gkqvreG96h4eFY6JQ==
=+DGS
-----END PGP SIGNATURE-----
Re: [OE-core][dunfell 16/18] cmake: FindGTest: Add target for gmock library
Quoted 8 lines · Jasper Orschulko
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()
----------------------------------------------
Signature · 1 line
Eero Aaltonen
Re: [OE-core][dunfell 16/18] cmake: FindGTest: Add target for gmock library
-----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
[email protected]
• • • • • • • • • • • • • • • • • • • • • • • • • •
iris-GmbH
infrared & intelligent sensors
Schnellerstraße 1-5 | 12439 Berlin
Quoted 34 lines · Eero Aaltonen
Quoted 8 lines · Jasper Orschulko
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)
Quoted 9 lines
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-----
PATCH 17/18 scripts/checklayer/common.py: Fixed a minor grammatical error
In reply to Steve SakomanFrom: Dhruva Gole <[email protected]>
--- scripts/lib/checklayer/cases/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/checklayer/cases/common.py +1 -1
@@ -14,7 +14,7 @@ class CommonCheckLayer(OECheckLayerTestCase): # The top-level README file may have a suffix (like README.rst or README.txt). readme_files = glob.glob(os.path.join(self.tc.layer['path'], '[Rr][Ee][Aa][Dd][Mm][Ee]*')) self.assertTrue(len(readme_files) > 0, - msg="Layer doesn't contains README file.") + msg="Layer doesn't contain a README file.") # There might be more than one file matching the file pattern above # (for example, README.rst and README-COPYING.rst). The one with the shortest
Signature · 1 line
2.25.1
PATCH 18/18 README.OE-Core.md: update URLs
In reply to Steve SakomanFrom: Quentin Schulz <[email protected]>
Update URLs to what they actually redirect to.
--- README.OE-Core | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
README.OE-Core +5 -5
@@ -6,24 +6,24 @@ of OpenEmbedded. It is distro-less (can build a functional image with DISTRO = "nodistro") and contains only emulated machine support. For information about OpenEmbedded, see the OpenEmbedded website: - http://www.openembedded.org/ + https://www.openembedded.org/ The Yocto Project has extensive documentation about OE including a reference manual which can be found at: - http://yoctoproject.org/documentation + https://docs.yoctoproject.org/ Contributing ------------ Please refer to -http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded +https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded for guidelines on how to submit patches. Mailing list: - http://lists.openembedded.org/mailman/listinfo/openembedded-core + https://lists.openembedded.org/g/openembedded-core Source code: - http://git.openembedded.org/openembedded-core/ + https://git.openembedded.org/openembedded-core/
Signature · 1 line
2.25.1