[OE-core] [PATCH] toaster: Fix broken overrides usage
This fixes data corruption issues with toaster where image data wasn't
being processed correct.
Signed-off-by: Richard Purdie
---
meta/classes/toaster.bbclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass
index dd5c7f224ba..f365c091420 100644
--- a/meta/classes/toaster.bbclass
+++ b/meta/classes/toaster.bbclass
@@ -101,11 +101,11 @@ def _toaster_load_pkgdatafile(dirpath, filepath):
for line in fin:
try:
kn, kv = line.strip().split(": ", 1)
-m = re.match(r"^PKG_([^A-Z:]*)", kn)
+m = re.match(r"^PKG:([^A-Z:]*)", kn)
if m:
pkgdata['OPKGN'] = m.group(1)
-kn = "_".join([x for x in kn.split("_") if x.isupper()])
-pkgdata[kn] = kv.strip()
+kn = kn.split(":")[0]
+pkgdata[kn] = kv
if kn.startswith('FILES_INFO'):
pkgdata[kn] = json.loads(kv)
--
2.32.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163478):
https://lists.openembedded.org/g/openembedded-core/message/163478
Mute This Topic: https://lists.openembedded.org/mt/89899018/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [dunfell][PATCH] bluez5: fix CVE-2021-3658
adapter incorrectly restores Discoverable state after powered down
Upstream-Status: Backport
[https://github.com/bluez/bluez/commit/b497b5942a8beb8f89ca1c359c54ad67ec843055]
CVE: CVE-2021-3658
Signed-off-by:Minjae Kim
---
meta/recipes-connectivity/bluez5/bluez5.inc | 1 +
.../bluez5/bluez5/CVE-2021-3658.patch | 95 +++
2 files changed, 96 insertions(+)
create mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2021-3658.patch
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc
b/meta/recipes-connectivity/bluez5/bluez5.inc
index 34796fdd20..7cf061dcf6 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -54,6 +54,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
file://0001-test-gatt-Fix-hung-issue.patch \
file://CVE-2021-0129.patch \
file://CVE-2021-3588.patch \
+ file://CVE-2021-3658.patch \
"
S = "${WORKDIR}/bluez-${PV}"
diff --git a/meta/recipes-connectivity/bluez5/bluez5/CVE-2021-3658.patch
b/meta/recipes-connectivity/bluez5/bluez5/CVE-2021-3658.patch
new file mode 100644
index 00..1738ca13da
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5/CVE-2021-3658.patch
@@ -0,0 +1,95 @@
+From b497b5942a8beb8f89ca1c359c54ad67ec843055 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz
+Date: Thu, 24 Jun 2021 16:32:04 -0700
+Subject: [PATCH] adapter: Fix storing discoverable setting
+
+discoverable setting shall only be store when changed via Discoverable
+property and not when discovery client set it as that be considered
+temporary just for the lifetime of the discovery.
+
+Upstream-Status: Backport
[https://github.com/bluez/bluez/commit/b497b5942a8beb8f89ca1c359c54ad67ec843055]
+Signed-off-by:Minjae Kim
+---
+ src/adapter.c | 35 ++-
+ 1 file changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/src/adapter.c b/src/adapter.c
+index 12e4ff5c0..663b778e4 100644
+--- a/src/adapter.c
b/src/adapter.c
+@@ -560,7 +560,11 @@ static void settings_changed(struct btd_adapter *adapter,
uint32_t settings)
+ if (changed_mask & MGMT_SETTING_DISCOVERABLE) {
+ g_dbus_emit_property_changed(dbus_conn, adapter->path,
+ ADAPTER_INTERFACE, "Discoverable");
+- store_adapter_info(adapter);
++ /* Only persist discoverable setting if it was not set
++ * temporarily by discovery.
++ */
++ if (!adapter->discovery_discoverable)
++ store_adapter_info(adapter);
+ btd_adv_manager_refresh(adapter->adv_manager);
+ }
+
+@@ -2162,8 +2166,6 @@ static bool filters_equal(struct
mgmt_cp_start_service_discovery *a,
+ static int update_discovery_filter(struct btd_adapter *adapter)
+ {
+ struct mgmt_cp_start_service_discovery *sd_cp;
+- GSList *l;
+-
+
+ DBG("");
+
+@@ -2173,17 +2175,24 @@ static int update_discovery_filter(struct btd_adapter
*adapter)
+ return -ENOMEM;
+ }
+
+- for (l = adapter->discovery_list; l; l = g_slist_next(l)) {
+- struct discovery_client *client = l->data;
++ /* Only attempt to overwrite current discoverable setting when not
++ * discoverable.
++ */
++ if (!(adapter->current_settings & MGMT_OP_SET_DISCOVERABLE)) {
++ GSList *l;
+
+- if (!client->discovery_filter)
+- continue;
++ for (l = adapter->discovery_list; l; l = g_slist_next(l)) {
++ struct discovery_client *client = l->data;
+
+- if (client->discovery_filter->discoverable)
+- break;
+- }
++ if (!client->discovery_filter)
++ continue;
+
+- set_discovery_discoverable(adapter, l ? true : false);
++ if (client->discovery_filter->discoverable) {
++ set_discovery_discoverable(adapter, true);
++ break;
++ }
++ }
++ }
+
+ /*
+* If filters are equal, then don't update scan, except for when
+@@ -2216,8 +2225,7 @@ static int discovery_stop(struct discovery_client
*client)
+ return 0;
+ }
+
+- if (adapter->discovery_discoverable)
+- set_discovery_discoverable(adapter, false);
++ set_discovery_discoverable(adapter, false);
+
+ /*
+* In the idle phase of a discovery, there is no need to stop it
+@@ -6913,6 +6921,7 @@ static void adapter_stop(struct btd_adapter *adapter)
+ g_free(adapter->current_discovery_filter);
+ adapter->current_discovery_filter = NULL;
+
++ set_discovery_discoverable(adapter, false);
+ adapter->discovering = false;
+
+ while (adapter->connections) {
+--
+2.25.1
+
--
2.25.1
[OE-core] [RFC PATCH] kernel: Add kernel-cve-tool support to help monitor kernel CVEs
This adds support for a random kernel CVE monitoring tool which can be
run as a specific task against a kernel:
$ bitbake linux-yocto -c checkcves
[...]
Sstate summary: Wanted 3 Local 3 Mirrors 0 Missed 0 Current 135 (100% match,
100% complete)
NOTE: Executing Tasks
WARNING: linux-yocto-5.15.26+gitAUTOINC+ea948a0983_5bd4bda819-r0 do_checkcves:
Should consider cherry-pick for
be80a1d3f9dbe5aee79a325964f7037fe2d92f30:CVE-2021-4204 (NOT FOR THIS VERSION)
WARNING: linux-yocto-5.15.26+gitAUTOINC+ea948a0983_5bd4bda819-r0 do_checkcves:
Should consider cherry-pick for
20b2aff4bc15bda809f994761d5719827d66c0b4:CVE-2022-0500 (NOT FOR THIS VERSION)
WARNING: linux-yocto-5.15.26+gitAUTOINC+ea948a0983_5bd4bda819-r0 do_checkcves:
Should consider cherry-pick for
55749769fe608fa3f4a075e42e89d237c8e37637:CVE-2021-4095 (NOT FOR THIS VERSION)
WARNING: linux-yocto-5.15.26+gitAUTOINC+ea948a0983_5bd4bda819-r0 do_checkcves:
Should consider cherry-pick for
4fbcc1a4cb20fe26ad0225679c536c80f1648221:CVE-2022-26490 (NOT FOR THIS VERSION)
WARNING: linux-yocto-5.15.26+gitAUTOINC+ea948a0983_5bd4bda819-r0 do_checkcves:
Should consider cherry-pick for
dbbf2d1e4077bab0c65ece2765d3fc69cf7d610f:CVE-2019-15239 (NOT FOR THIS VERSION)
WARNING: linux-yocto-5.15.26+gitAUTOINC+ea948a0983_5bd4bda819-r0 do_checkcves:
Should consider cherry-pick for
89f3594d0de58e8a57d92d497dea9fee3d4b9cda:CVE-2022-24958 (NOT FOR THIS VERSION)
WARNING: linux-yocto-5.15.26+gitAUTOINC+ea948a0983_5bd4bda819-r0 do_checkcves:
Should consider cherry-pick for
1bfba2f4270c64c912756fc76621bbce959ddf2e:CVE-2020-25220 (NOT FOR THIS VERSION)
NOTE: Tasks Summary: Attempted 627 tasks of which 626 didn't need to be rerun
and all succeeded.
Posted as an RFC to see what people think of this. I make no claims
on how useful it is/isn't but wanted to show integration isn't difficult
and provide some inspiration for ideas.
Details on the tool in question: https://github.com/madisongh/kernel-cve-tool
I've ignored the NO-FIXES-AVILABLE and PATCHED-CVES files.
Signed-off-by: Richard Purdie
---
meta/classes/kernel.bbclass | 10 ++
.../kernel-cve-tool/kernel-cve-tool_git.bb| 20 +++
2 files changed, 30 insertions(+)
create mode 100644 meta/recipes-kernel/kernel-cve-tool/kernel-cve-tool_git.bb
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 4f304eb9c7a..a842747b9d9 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -753,6 +753,16 @@ addtask sizecheck before do_install after do_strip
inherit kernel-artifact-names
+do_checkcves () {
+ cd ${S}
+ kernel-cve-tool -P ${STAGING_DATADIR_NATIVE}/kernel-cvedb
+ while read -r line; do
+ bbwarn "Should consider cherry-pick for $line";
+ done < ${S}/cherry-picks.list
+}
+do_checkcves[depends] = "kernel-cve-tool-native:do_populate_sysroot"
+addtask checkcves after do_configure
+
kernel_do_deploy() {
deployDir="${DEPLOYDIR}"
if [ -n "${KERNEL_DEPLOYSUBDIR}" ]; then
diff --git a/meta/recipes-kernel/kernel-cve-tool/kernel-cve-tool_git.bb
b/meta/recipes-kernel/kernel-cve-tool/kernel-cve-tool_git.bb
new file mode 100644
index 000..d2402bae052
--- /dev/null
+++ b/meta/recipes-kernel/kernel-cve-tool/kernel-cve-tool_git.bb
@@ -0,0 +1,20 @@
+HOMEPAGE = "https://github.com/madisongh/kernel-cve-tool/;
+SRC_URI =
"git://github.com/madisongh/kernel-cve-tool;protocol=https;branch=master;name=tool
\
+
git://github.com/nluedtke/linux_kernel_cves.git;protocol=https;branch=master;destsuffix=cvedb;name=data"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=850b17d75c13807fada69140cf7cacc5"
+
+SRCREV_FORMAT ?= "tool_data"
+SRCREV_tool = "eb177abea3745d8576a725646effcce25f34302e"
+SRCREV_data = "b51a576dfbbd4d343b33bed0aa1fc4e095911938"
+
+S = "${WORKDIR}/git"
+
+inherit setuptools_build_meta
+
+do_install:append () {
+ install -d ${D}${datadir}/kernel-cvedb
+ cp -r ${WORKDIR}/cvedb/* ${D}${datadir}/kernel-cvedb
+}
+
+BBCLASSEXTEND = "native"
--
2.32.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163476):
https://lists.openembedded.org/g/openembedded-core/message/163476
Mute This Topic: https://lists.openembedded.org/mt/89894789/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] libtool: Upgrade 2.4.6 -> 2.4.7
On Sat, Mar 19, 2022 at 9:44 AM Richard Purdie < richard.pur...@linuxfoundation.org> wrote: > On Fri, 2022-03-18 at 17:28 -0700, Khem Raj wrote: > > On Fri, Mar 18, 2022 at 5:10 PM Richard Purdie > > wrote: > > > > > > On Fri, 2022-03-18 at 17:06 -0700, Khem Raj wrote: > > > > seeing these 3 failures with new libtool in meta-oe > > > > > > > > https://errors.yoctoproject.org/Errors/Build/142979/ > > > > > > > > > > Those are all libtool version mismatches. Might be a case of deleting > the > > > libtool m4 macros before reautoconf? > > > > i have not looked into details but perhaps it could be just that > > > > I was going to have a look to see if I could help but saw you already have > patches doing that! :) > Yes just wasn’t sure how deep the rathole will be but it turns out to be not that bad and meta-oe build is green with libtool upgrade now > Cheers, > > Richard > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163475): https://lists.openembedded.org/g/openembedded-core/message/163475 Mute This Topic: https://lists.openembedded.org/mt/89851467/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] gcc 12 support
On Sat, Mar 19, 2022 at 5:44 AM Bernhard Rosenkränzer via lists.openembedded.org wrote: > Hi, > with gcc 12 likely being released next month, I thought it's a good idea > to get started on supporting it -- I've submitted a patch that fixes > building ovmf, will submit a few more as I run into more failures. > If anyone is interested in gcc 12 itself, I've uploaded a recipe for the > current 12 snapshot to https://lindev.ch/gcc12.tar.xz > (Probably not worth submitting until gcc 12 is released upstream...) > I usually keep a version locally around here once gcc is into final phases of development Can you post a git patch somewhere > > ttyl > bero > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163474): https://lists.openembedded.org/g/openembedded-core/message/163474 Mute This Topic: https://lists.openembedded.org/mt/89887595/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] recipes-core/ovmf: Fix build with gcc 12
Just disable Werror with appropriate comments describing why we are
Doing it until the issues are fixed
On Sat, Mar 19, 2022 at 9:55 AM Bernhard Rosenkränzer via
lists.openembedded.org wrote:
> From: Bernhard Rosenkränzer
>
> edk2 doesn't compile with gcc 12 - due to 2 legitimate bugs (trying to
> use a file handle as if it were a string) and 2 new warnings in code
> using -Werror (they need further investigation to determine if they're
> legitimate bugs or false positives; in the mean time we can keep things
> building by disabling the warnings for the particular lines triggering
> them).
>
> The proper fixes have already been submitted upstream at
> https://github.com/tianocore/edk2/pull/2602
> Will not submit the workarounds for the warnings upstream for now.
>
> Signed-off-by: Bernhard Rosenkränzer <
> bernhard.rosenkraenzer@huawei.com>
> ---
> ...nfusion-between-file-handle-and-name.patch | 44 +++
> ...orkaround-for-gcc-12-build-failure-2.patch | 33 ++
> ...-workaround-for-gcc-12-build-failure.patch | 28
> meta/recipes-core/ovmf/ovmf_git.bb| 3 ++
> 4 files changed, 108 insertions(+)
> create mode 100644
> meta/recipes-core/ovmf/ovmf/edk2-fix-confusion-between-file-handle-and-name.patch
> create mode 100644
> meta/recipes-core/ovmf/ovmf/edk2-workaround-for-gcc-12-build-failure-2.patch
> create mode 100644
> meta/recipes-core/ovmf/ovmf/edk2-workaround-for-gcc-12-build-failure.patch
>
> diff --git
> a/meta/recipes-core/ovmf/ovmf/edk2-fix-confusion-between-file-handle-and-name.patch
> b/meta/recipes-core/ovmf/ovmf/edk2-fix-confusion-between-file-handle-and-name.patch
> new file mode 100644
> index 00..98023f93c2
> --- /dev/null
> +++
> b/meta/recipes-core/ovmf/ovmf/edk2-fix-confusion-between-file-handle-and-name.patch
> @@ -0,0 +1,44 @@
> +From 74e7ad4e400ea3f942805e70df4d3ed6990759f3 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?=
> +Date: Tue, 8 Mar 2022 18:56:23 +0100
> +Subject: [PATCH] GenFfs: Don't treat a file handle as a string
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +The current code tries to print the file handle as a string on error.
> +Do what it is meant to do instead: Print the file name.
> +
> +Upstream-Status: Submitted [https://github.com/tianocore/edk2/pull/2602]
> +Signed-off-by: Bernhard Rosenkränzer
> +---
> + BaseTools/Source/C/GenFfs/GenFfs.c | 2 +-
> + BaseTools/Source/C/GenSec/GenSec.c | 2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c
> b/BaseTools/Source/C/GenFfs/GenFfs.c
> +index 949025c33325..06e009e279ce 100644
> +--- a/BaseTools/Source/C/GenFfs/GenFfs.c
> b/BaseTools/Source/C/GenFfs/GenFfs.c
> +@@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
> + PeFileBuffer = (UINT8 *) malloc (PeFileSize);
> + if (PeFileBuffer == NULL) {
> + fclose (InFileHandle);
> +-Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of
> %s", InFileHandle);
> ++Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of
> %s", InFile);
> + return EFI_OUT_OF_RESOURCES;
> + }
> + fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
> +diff --git a/BaseTools/Source/C/GenSec/GenSec.c
> b/BaseTools/Source/C/GenSec/GenSec.c
> +index d54a4f9e0a7d..1ad92de1d50e 100644
> +--- a/BaseTools/Source/C/GenSec/GenSec.c
> b/BaseTools/Source/C/GenSec/GenSec.c
> +@@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32
> *Alignment)
> + PeFileBuffer = (UINT8 *) malloc (PeFileSize);
> + if (PeFileBuffer == NULL) {
> + fclose (InFileHandle);
> +-Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of
> %s", InFileHandle);
> ++Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of
> %s", InFile);
> + return EFI_OUT_OF_RESOURCES;
> + }
> + fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
> diff --git
> a/meta/recipes-core/ovmf/ovmf/edk2-workaround-for-gcc-12-build-failure-2.patch
> b/meta/recipes-core/ovmf/ovmf/edk2-workaround-for-gcc-12-build-failure-2.patch
> new file mode 100644
> index 00..e7b7269d82
> --- /dev/null
> +++
> b/meta/recipes-core/ovmf/ovmf/edk2-workaround-for-gcc-12-build-failure-2.patch
> @@ -0,0 +1,33 @@
> +From: Bernhard Rosenkränzer
> +Date: Fri, 18 Mar 2022 17:28:47 +0100
> +Subject: [PATCH] Disable gcc >= 12 stringop-overflow warning
> +
> +gcc 12 warns about a stringop-overflow with SetDevicePathEndNode
> +potentially copying 4 bytes to an area of 1 byte.
> +Since edk2 is built with -Werror, this breaks the build.
> +
> +It is not immedaitely clear whether this is a false warning or if
> +SetDevicePathEndNode is being used incorrectly somewhere, but since
> +the code seems to work, ignore the warning for the time being to
> +keep things buildable.
> +
> +This should be investigated properly at some point.
> +
>
[OE-core] [PATCH] recipes-core/ovmf: Fix build with gcc 12
From: Bernhard Rosenkränzer
edk2 doesn't compile with gcc 12 - due to 2 legitimate bugs (trying to
use a file handle as if it were a string) and 2 new warnings in code
using -Werror (they need further investigation to determine if they're
legitimate bugs or false positives; in the mean time we can keep things
building by disabling the warnings for the particular lines triggering
them).
The proper fixes have already been submitted upstream at
https://github.com/tianocore/edk2/pull/2602
Will not submit the workarounds for the warnings upstream for now.
Signed-off-by: Bernhard Rosenkränzer
---
...nfusion-between-file-handle-and-name.patch | 44 +++
...orkaround-for-gcc-12-build-failure-2.patch | 33 ++
...-workaround-for-gcc-12-build-failure.patch | 28
meta/recipes-core/ovmf/ovmf_git.bb| 3 ++
4 files changed, 108 insertions(+)
create mode 100644
meta/recipes-core/ovmf/ovmf/edk2-fix-confusion-between-file-handle-and-name.patch
create mode 100644
meta/recipes-core/ovmf/ovmf/edk2-workaround-for-gcc-12-build-failure-2.patch
create mode 100644
meta/recipes-core/ovmf/ovmf/edk2-workaround-for-gcc-12-build-failure.patch
diff --git
a/meta/recipes-core/ovmf/ovmf/edk2-fix-confusion-between-file-handle-and-name.patch
b/meta/recipes-core/ovmf/ovmf/edk2-fix-confusion-between-file-handle-and-name.patch
new file mode 100644
index 00..98023f93c2
--- /dev/null
+++
b/meta/recipes-core/ovmf/ovmf/edk2-fix-confusion-between-file-handle-and-name.patch
@@ -0,0 +1,44 @@
+From 74e7ad4e400ea3f942805e70df4d3ed6990759f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?=
+Date: Tue, 8 Mar 2022 18:56:23 +0100
+Subject: [PATCH] GenFfs: Don't treat a file handle as a string
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The current code tries to print the file handle as a string on error.
+Do what it is meant to do instead: Print the file name.
+
+Upstream-Status: Submitted [https://github.com/tianocore/edk2/pull/2602]
+Signed-off-by: Bernhard Rosenkränzer
+---
+ BaseTools/Source/C/GenFfs/GenFfs.c | 2 +-
+ BaseTools/Source/C/GenSec/GenSec.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c
b/BaseTools/Source/C/GenFfs/GenFfs.c
+index 949025c33325..06e009e279ce 100644
+--- a/BaseTools/Source/C/GenFfs/GenFfs.c
b/BaseTools/Source/C/GenFfs/GenFfs.c
+@@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
+ PeFileBuffer = (UINT8 *) malloc (PeFileSize);
+ if (PeFileBuffer == NULL) {
+ fclose (InFileHandle);
+-Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s",
InFileHandle);
++Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s",
InFile);
+ return EFI_OUT_OF_RESOURCES;
+ }
+ fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
+diff --git a/BaseTools/Source/C/GenSec/GenSec.c
b/BaseTools/Source/C/GenSec/GenSec.c
+index d54a4f9e0a7d..1ad92de1d50e 100644
+--- a/BaseTools/Source/C/GenSec/GenSec.c
b/BaseTools/Source/C/GenSec/GenSec.c
+@@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
+ PeFileBuffer = (UINT8 *) malloc (PeFileSize);
+ if (PeFileBuffer == NULL) {
+ fclose (InFileHandle);
+-Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s",
InFileHandle);
++Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s",
InFile);
+ return EFI_OUT_OF_RESOURCES;
+ }
+ fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
diff --git
a/meta/recipes-core/ovmf/ovmf/edk2-workaround-for-gcc-12-build-failure-2.patch
b/meta/recipes-core/ovmf/ovmf/edk2-workaround-for-gcc-12-build-failure-2.patch
new file mode 100644
index 00..e7b7269d82
--- /dev/null
+++
b/meta/recipes-core/ovmf/ovmf/edk2-workaround-for-gcc-12-build-failure-2.patch
@@ -0,0 +1,33 @@
+From: Bernhard Rosenkränzer
+Date: Fri, 18 Mar 2022 17:28:47 +0100
+Subject: [PATCH] Disable gcc >= 12 stringop-overflow warning
+
+gcc 12 warns about a stringop-overflow with SetDevicePathEndNode
+potentially copying 4 bytes to an area of 1 byte.
+Since edk2 is built with -Werror, this breaks the build.
+
+It is not immedaitely clear whether this is a false warning or if
+SetDevicePathEndNode is being used incorrectly somewhere, but since
+the code seems to work, ignore the warning for the time being to
+keep things buildable.
+
+This should be investigated properly at some point.
+
+Upstream-Status: Inappropriate [Workaround to keep things going, should be
fixed properly]
+Signed-off-by: Bernhard Rosenkränzer
+
+diff --git a/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
b/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
+index 2ffefa8cee..32c02bdf82 100644
+--- a/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
b/BaseTools/Source/C/DevicePath/DevicePathUtilities.c
+@@ -318,7 +318,10 @@
Re: [OE-core] gcc 12 support
On Sat, 2022-03-19 at 13:44 +0100, Bernhard Rosenkränzer via lists.openembedded.org wrote: > with gcc 12 likely being released next month, I thought it's a good idea to > get started on supporting it -- I've submitted a patch that fixes building > ovmf, will submit a few more as I run into more failures. Please do, these are things we're going to have to deal with sooner or later so good to get started on them! > If anyone is interested in gcc 12 itself, I've uploaded a recipe for the > current 12 snapshot to https://lindev.ch/gcc12.tar.xz > (Probably not worth submitting until gcc 12 is released upstream...) Handy to know it is there, thanks! Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163471): https://lists.openembedded.org/g/openembedded-core/message/163471 Mute This Topic: https://lists.openembedded.org/mt/89887595/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] libtool: Upgrade 2.4.6 -> 2.4.7
On Fri, 2022-03-18 at 17:28 -0700, Khem Raj wrote: > On Fri, Mar 18, 2022 at 5:10 PM Richard Purdie > wrote: > > > > On Fri, 2022-03-18 at 17:06 -0700, Khem Raj wrote: > > > seeing these 3 failures with new libtool in meta-oe > > > > > > https://errors.yoctoproject.org/Errors/Build/142979/ > > > > > > > Those are all libtool version mismatches. Might be a case of deleting the > > libtool m4 macros before reautoconf? > > i have not looked into details but perhaps it could be just that > I was going to have a look to see if I could help but saw you already have patches doing that! :) Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163470): https://lists.openembedded.org/g/openembedded-core/message/163470 Mute This Topic: https://lists.openembedded.org/mt/89851467/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] gcc 12 support
Hi, with gcc 12 likely being released next month, I thought it's a good idea to get started on supporting it -- I've submitted a patch that fixes building ovmf, will submit a few more as I run into more failures. If anyone is interested in gcc 12 itself, I've uploaded a recipe for the current 12 snapshot to https://lindev.ch/gcc12.tar.xz (Probably not worth submitting until gcc 12 is released upstream...) ttyl bero -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163469): https://lists.openembedded.org/g/openembedded-core/message/163469 Mute This Topic: https://lists.openembedded.org/mt/89887595/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] kernel-fitimage.bbclass: introduce get_fit_replacement_type function
From: Ming Liu
Avoid to set KERNEL_IMAGETYPE_REPLACEMENT in anonymous python function,
otherwise it chould not be overridden in config files, for instance,
it's being set now in meta/lib/oeqa/selftest/cases/fitimage.py.
Introduce a get_fit_replacement_type function to get the default value
of KERNEL_IMAGETYPE_REPLACEMENT, and it could be overridden in config
files.
Signed-off-by: Ming Liu
---
meta/classes/kernel-fitimage.bbclass | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index 8a9b195d6e..df5de0427b 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -1,14 +1,9 @@
inherit kernel-uboot kernel-artifact-names uboot-sign
-KERNEL_IMAGETYPE_REPLACEMENT = ""
-
-python __anonymous () {
+def get_fit_replacement_type(d):
kerneltypes = d.getVar('KERNEL_IMAGETYPES') or ""
+replacementtype = ""
if 'fitImage' in kerneltypes.split():
-depends = d.getVar("DEPENDS")
-depends = "%s u-boot-tools-native dtc-native" % depends
-d.setVar("DEPENDS", depends)
-
uarch = d.getVar("UBOOT_ARCH")
if uarch == "arm64":
replacementtype = "Image"
@@ -22,15 +17,18 @@ python __anonymous () {
replacementtype = "linux.bin"
else:
replacementtype = "zImage"
+return replacementtype
-d.setVar("KERNEL_IMAGETYPE_REPLACEMENT", replacementtype)
+KERNEL_IMAGETYPE_REPLACEMENT ?= "${@get_fit_replacement_type(d)}"
+DEPENDS:append = " ${@'u-boot-tools-native dtc-native' if 'fitImage' in
(d.getVar('KERNEL_IMAGETYPES') or '').split() else ''}"
+python __anonymous () {
# Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
# to kernel.bbclass . We have to override it, since we pack zImage
# (at least for now) into the fitImage .
typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or ""
if 'fitImage' in typeformake.split():
-d.setVar('KERNEL_IMAGETYPE_FOR_MAKE',
typeformake.replace('fitImage', replacementtype))
+d.setVar('KERNEL_IMAGETYPE_FOR_MAKE',
typeformake.replace('fitImage', d.getVar('KERNEL_IMAGETYPE_REPLACEMENT')))
image = d.getVar('INITRAMFS_IMAGE')
if image:
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163468):
https://lists.openembedded.org/g/openembedded-core/message/163468
Mute This Topic: https://lists.openembedded.org/mt/89887420/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 11/11] sqlite3: upgrade 3.38.0 -> 3.38.1
From: Alexander Kanavin
Signed-off-by: Alexander Kanavin
---
.../sqlite/{sqlite3_3.38.0.bb => sqlite3_3.38.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/sqlite/{sqlite3_3.38.0.bb => sqlite3_3.38.1.bb}
(86%)
diff --git a/meta/recipes-support/sqlite/sqlite3_3.38.0.bb
b/meta/recipes-support/sqlite/sqlite3_3.38.1.bb
similarity index 86%
rename from meta/recipes-support/sqlite/sqlite3_3.38.0.bb
rename to meta/recipes-support/sqlite/sqlite3_3.38.1.bb
index a797679f12..54b04d620e 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.38.0.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.38.1.bb
@@ -4,7 +4,7 @@ LICENSE = "PD"
LIC_FILES_CHKSUM =
"file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
SRC_URI = "http://www.sqlite.org/2022/sqlite-autoconf-${SQLITE_PV}.tar.gz;
-SRC_URI[sha256sum] =
"1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68"
+SRC_URI[sha256sum] =
"8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4"
# -19242 is only an issue in specific development branch commits
CVE_CHECK_IGNORE += "CVE-2019-19242"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163467):
https://lists.openembedded.org/g/openembedded-core/message/163467
Mute This Topic: https://lists.openembedded.org/mt/89884875/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 05/11] perl-cross: update 1.3.6 -> 1.3.7
Drop upstreamed patches.
0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
is replaced with a tweak to configure parameters.
Signed-off-by: Alexander Kanavin
---
...nc_sel.sh-disable-thread_safe_nl_lan.patch | 27
...h-do-not-hardcode-prefix-lib-as-libr.patch | 69 ---
...h-do-not-quote-the-argument-to-comma.patch | 29
...{perlcross_1.3.6.bb => perlcross_1.3.7.bb} | 5 +-
meta/recipes-devtools/perl/perl_5.34.0.bb | 1 +
5 files changed, 2 insertions(+), 129 deletions(-)
delete mode 100644
meta/recipes-devtools/perl-cross/files/0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch
delete mode 100644
meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
delete mode 100644
meta/recipes-devtools/perl-cross/files/0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch
rename meta/recipes-devtools/perl-cross/{perlcross_1.3.6.bb =>
perlcross_1.3.7.bb} (77%)
diff --git
a/meta/recipes-devtools/perl-cross/files/0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch
b/meta/recipes-devtools/perl-cross/files/0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch
deleted file mode 100644
index 744e4e09c3..00
---
a/meta/recipes-devtools/perl-cross/files/0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d22f2bb5afcd278b68999f5ce0362328fc8c7723 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Thu, 3 Jun 2021 18:50:56 +0200
-Subject: [PATCH] cnf/configure_func_sel.sh: disable thread_safe_nl_langinfo_l
-
-Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/115]
-Signed-off-by: Alexander Kanavin
- cnf/configure_func_sel.sh | 8 ++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/cnf/configure_func_sel.sh b/cnf/configure_func_sel.sh
-index f48294f..90d350d 100644
a/cnf/configure_func_sel.sh
-+++ b/cnf/configure_func_sel.sh
-@@ -97,5 +97,9 @@ else
- result "irrelevant"
- fi
-
--# Assume nl_langinfo_l is threadsafe if available
--define d_thread_safe_nl_langinfo_l "$d_nl_langinfo_l"
-+# thread_safe_nl_langinfo_l is not enabled by default
-+# by upstream, and causes t/Langinfo.t to fail when it is
-+# (starting from 5.34.0). This means the configuration is
-+# either not well tested, or not at all tested, so we should
-+# pick a safer option.
-+define d_thread_safe_nl_langinfo_l "undef"
diff --git
a/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
b/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
deleted file mode 100644
index 386ea3f27f..00
---
a/meta/recipes-devtools/perl-cross/files/0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 19c1987b455998d2959a5fdf3d1ed911d35e70f2 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin
-Date: Wed, 2 Jan 2019 17:55:35 +0100
-Subject: [PATCH] configure_path.sh: do not hardcode $prefix/lib as library
- path
-
-Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/123]
-Signed-off-by: Alexander Kanavin
-
- cnf/configure_args.sh | 2 +-
- cnf/configure_path.sh | 11 ++-
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/cnf/configure_args.sh b/cnf/configure_args.sh
-index 29ca4f5..3297fb3 100644
a/cnf/configure_args.sh
-+++ b/cnf/configure_args.sh
-@@ -155,7 +155,7 @@ while [ $i -le $# -o -n "$n" ]; do
- help) mode="help" ;;
- regen|regenerate) mode="regen" ;;
- keeplog) defuser "$a" 1 ;;
-- prefix|html[13]dir|libsdir) defuser $a "$v" ;;
-+ prefix|html[13]dir|libsdir|libdir) defuser $a "$v" ;;
- man[13]dir|otherlibsdir)defuser $a "$v" ;;
- siteprefix|sitehtml[13]dir) defuser $a "$v" ;;
- siteman[13]dir|vendorman[13]dir)defuser $a "$v" ;;
-diff --git a/cnf/configure_path.sh b/cnf/configure_path.sh
-index fe7eac7..bcba8b8 100644
a/cnf/configure_path.sh
-+++ b/cnf/configure_path.sh
-@@ -30,6 +30,7 @@ definst() {
- define "$1" "$installpath$v"
- }
-
-+define libdir "$prefix/lib"
- define sharedir "$prefix/share"
- define html1dir "$sharedir/doc/$perlname/html"
- define html3dir "$sharedir/doc/$perlname/html"
-@@ -38,16 +39,16 @@ define man1ext "1"
- define man3dir "$sharedir/man/man3"
- define man3ext "3"
- define bin "$prefix/bin"
--define lib "$prefix/lib"
-+define lib "$libdir"
- define scriptdir "$prefix/bin"
- define libsdirs ' '
--defrel privlib "$prefix/lib/$package/$version"
--defrel archlib "$prefix/lib/$package/$version/$archname"
-+defrel privlib "$libdir/$package/$version"
-+defrel archlib "$libdir/$package/$version/$archname"
- define perlpath "$prefix/bin/$perlname"
- define d_archlib 'define'
-
- define sitebin"$prefix/bin"
--defrel
[OE-core] [PATCH 09/11] meson: upgrade 0.61.2 -> 0.61.3
From: Alexander Kanavin
Signed-off-by: Alexander Kanavin
---
.../recipes-devtools/meson/{meson_0.61.2.bb => meson_0.61.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/meson/{meson_0.61.2.bb => meson_0.61.3.bb} (98%)
diff --git a/meta/recipes-devtools/meson/meson_0.61.2.bb
b/meta/recipes-devtools/meson/meson_0.61.3.bb
similarity index 98%
rename from meta/recipes-devtools/meson/meson_0.61.2.bb
rename to meta/recipes-devtools/meson/meson_0.61.3.bb
index 8304bfdac9..ecc6272998 100644
--- a/meta/recipes-devtools/meson/meson_0.61.2.bb
+++ b/meta/recipes-devtools/meson/meson_0.61.3.bb
@@ -16,7 +16,7 @@ SRC_URI =
"https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
file://0002-Support-building-allarch-recipes-again.patch \
file://0001-is_debianlike-always-return-False.patch \
"
-SRC_URI[sha256sum] =
"0233a7f8d959079318f6052b0939c27f68a5de86ba601f25c9ee6869fb5f5889"
+SRC_URI[sha256sum] =
"9c884434469471f3fe0cbbceb9b9ea0c8047f19e792940e1df6595741aae251b"
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases;
UPSTREAM_CHECK_REGEX = "meson-(?P\d+(\.\d+)+)\.tar"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163465):
https://lists.openembedded.org/g/openembedded-core/message/163465
Mute This Topic: https://lists.openembedded.org/mt/89884872/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 03/11] squashfs-tools: correct upstream version check
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index bffc05e812..c92a5f80a8 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -16,6 +16,7 @@ SRC_URI =
"git://github.com/plougher/squashfs-tools.git;protocol=https;branch=ma
file://CVE-2021-41072-requisite-3.patch;striplevel=2 \
file://CVE-2021-41072.patch;striplevel=2 \
"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P(\d+(\.\d+)+))"
S = "${WORKDIR}/git/squashfs-tools"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163459):
https://lists.openembedded.org/g/openembedded-core/message/163459
Mute This Topic: https://lists.openembedded.org/mt/89884866/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 10/11] mtools: upgrade 4.0.37 -> 4.0.38
From: Alexander Kanavin
Signed-off-by: Alexander Kanavin
---
.../mtools/mtools/disable-hardcoded-configs.patch | 2 +-
.../mtools/{mtools_4.0.37.bb => mtools_4.0.38.bb} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/mtools/{mtools_4.0.37.bb => mtools_4.0.38.bb}
(93%)
diff --git
a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
index 6185f4d19f..25ee2b74b5 100644
--- a/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
+++ b/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
@@ -1,4 +1,4 @@
-From a5076415ed2c226ca7115d27e0ce51a8a0302090 Mon Sep 17 00:00:00 2001
+From 142f40b80ea908831ef7a4d694cec6a5985a0724 Mon Sep 17 00:00:00 2001
From: Ed Bartosh
Date: Tue, 13 Jun 2017 14:55:52 +0300
Subject: [PATCH] Disabled reading host configs.
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.37.bb
b/meta/recipes-devtools/mtools/mtools_4.0.38.bb
similarity index 93%
rename from meta/recipes-devtools/mtools/mtools_4.0.37.bb
rename to meta/recipes-devtools/mtools/mtools_4.0.38.bb
index 3e072b0d93..dc2b9f8794 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.37.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.38.bb
@@ -24,7 +24,7 @@ RRECOMMENDS:${PN}:libc-glibc = "\
glibc-gconv-ibm866 \
glibc-gconv-ibm869 \
"
-SRC_URI[sha256sum] =
"799b197e23e47b61259628810b27790efb7a1fe36037ef1da8a27b0ae4fa8342"
+SRC_URI[sha256sum] =
"7b94485f486e7df08cca68b00a164a13cd38f4c63cb8684d188759ee7bc5e729"
SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
file://mtools-makeinfo.patch \
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163466):
https://lists.openembedded.org/g/openembedded-core/message/163466
Mute This Topic: https://lists.openembedded.org/mt/89884873/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 06/11] perl: update 5.34.0 -> 5.34.1
Signed-off-by: Alexander Kanavin
---
...e5fdd87aa205011512cd1e6cc655bcf677fd.patch | 31 --
.../perl/files/CVE-2021-36770.patch | 40 ---
...2398e766500cb5d83c4d76b642fcf31d997a.patch | 40 ---
...297a58b8f10ab885c19eec48ea076116cc1f.patch | 25
.../perl/files/perl-configpm-switch.patch | 4 +-
.../perl/{perl_5.34.0.bb => perl_5.34.1.bb} | 6 +--
6 files changed, 3 insertions(+), 143 deletions(-)
delete mode 100644
meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch
delete mode 100644 meta/recipes-devtools/perl/files/CVE-2021-36770.patch
delete mode 100644
meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch
delete mode 100644
meta/recipes-devtools/perl/files/ea57297a58b8f10ab885c19eec48ea076116cc1f.patch
rename meta/recipes-devtools/perl/{perl_5.34.0.bb => perl_5.34.1.bb} (98%)
diff --git
a/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch
b/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch
deleted file mode 100644
index 1cb65d932c..00
---
a/meta/recipes-devtools/perl/files/5bc1e5fdd87aa205011512cd1e6cc655bcf677fd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5bc1e5fdd87aa205011512cd1e6cc655bcf677fd Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff
-Date: Wed, 23 Jun 2021 15:31:42 +0300
-Subject: [PATCH] Fix definition of ITEM_NOT_FOUND for pre-1.13 versions.
-
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin
- ext/GDBM_File/GDBM_File.xs | 9 +
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs
-index 494c2889ca89..0125b5dcac4d 100644
a/ext/GDBM_File/GDBM_File.xs
-+++ b/ext/GDBM_File/GDBM_File.xs
-@@ -145,10 +145,11 @@ output_datum(pTHX_ SV *arg, char *str, int size)
- #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt")
- #endif
-
--#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13
--/* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR
-- if the requested key did not exist */
--# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR)
-+#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13
-+/* Prior to 1.13, only gdbm_fetch set GDBM_ITEM_NOT_FOUND if the requested
-+ key did not exist. Other similar function wouls set GDBM_NO_ERROR instead.
-+ The GDBM_ITEM_NOT_FOUND existeds as early as in 1.7.3 */
-+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR || gdbm_errno ==
GDBM_ITEM_NOT_FOUND)
- #else
- # define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND)
- #endif
diff --git a/meta/recipes-devtools/perl/files/CVE-2021-36770.patch
b/meta/recipes-devtools/perl/files/CVE-2021-36770.patch
deleted file mode 100644
index 1ef548b305..00
--- a/meta/recipes-devtools/perl/files/CVE-2021-36770.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Backport patch to fix CVE-2021-36770. And drop the section of code which
-updates version.
-
-Upstream-Status: Backport [https://github.com/Perl/perl5/commit/c1a937f]
-CVE: CVE-2021-36770
-
-Signed-off-by: Kai Kang
-
-From c1a937fef07c061600a0078f4cb53fe9c2136bb9 Mon Sep 17 00:00:00 2001
-From: Ricardo Signes
-Date: Mon, 9 Aug 2021 08:14:05 -0400
-Subject: [PATCH] Encode.pm: apply a local patch for CVE-2021-36770
-
-I expect Encode to see a new release today.
-
-Without this fix, Encode::ConfigLocal can be loaded from a path relative
-to the current directory, because the || operator will evaluate @INC in
-scalar context, putting an integer as the only value in @INC.
- cpan/Encode/Encode.pm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
-index a56a99947f..b96a850416 100644
a/cpan/Encode/Encode.pm
-+++ b/cpan/Encode/Encode.pm
-@@ -65,8 +66,8 @@ require Encode::Config;
- eval {
- local $SIG{__DIE__};
- local $SIG{__WARN__};
--local @INC = @INC || ();
--pop @INC if $INC[-1] eq '.';
-+local @INC = @INC;
-+pop @INC if @INC && $INC[-1] eq '.';
- require Encode::ConfigLocal;
- };
-
---
-2.33.0
-
diff --git
a/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch
b/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch
deleted file mode 100644
index 628903f41c..00
---
a/meta/recipes-devtools/perl/files/aacd2398e766500cb5d83c4d76b642fcf31d997a.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From aacd2398e766500cb5d83c4d76b642fcf31d997a Mon Sep 17 00:00:00 2001
-From: Sergey Poznyakoff
-Date: Wed, 23 Jun 2021 10:26:50 +0300
-Subject: [PATCH] Fix GDBM_File to compile with version 1.20 and earlier
-
-* ext/GDBM_File/GDBM_File.xs (ITEM_NOT_FOUND): Define conditionally,
-depending on the GDBM_VERSION_MAJOR and GDBM_VERSION_MINOR.
-Don't assume GDBM_ITEM_NOT_FOUND is a define (it isn't since
-gdbm commit d3e27957).
-
-Upstream-Status: Backport
[OE-core] [PATCH 04/11] bind: update 9.16.26 -> 9.18.1
Drop removed python/libtool options.
isc/platform.h is no longer installed.
Rewrite reproducibility patch to fix the problem at the source.
License-Update: copyright years
Signed-off-by: Alexander Kanavin
---
...d-V-and-start-log-hide-build-options.patch | 37 ---
...1-avoid-start-failure-with-bind-user.patch | 0
...d-V-and-start-log-hide-build-options.patch | 35 ++
...ching-for-json-headers-searches-sysr.patch | 28 +++---
.../bind/{bind-9.16.26 => bind-9.18.1}/bind9 | 0
.../{bind-9.16.26 => bind-9.18.1}/conf.patch | 0
.../generate-rndc-key.sh | 0
...t.d-add-support-for-read-only-rootfs.patch | 0
.../make-etc-initd-bind-stop-work.patch | 0
.../named.service | 0
.../bind/{bind_9.16.26.bb => bind_9.18.1.bb} | 14 +++
11 files changed, 55 insertions(+), 59 deletions(-)
delete mode 100644
meta/recipes-connectivity/bind/bind-9.16.26/0001-named-lwresd-V-and-start-log-hide-build-options.patch
rename meta/recipes-connectivity/bind/{bind-9.16.26 =>
bind-9.18.1}/0001-avoid-start-failure-with-bind-user.patch (100%)
create mode 100644
meta/recipes-connectivity/bind/bind-9.18.1/0001-named-lwresd-V-and-start-log-hide-build-options.patch
rename meta/recipes-connectivity/bind/{bind-9.16.26 =>
bind-9.18.1}/bind-ensure-searching-for-json-headers-searches-sysr.patch (73%)
rename meta/recipes-connectivity/bind/{bind-9.16.26 => bind-9.18.1}/bind9
(100%)
rename meta/recipes-connectivity/bind/{bind-9.16.26 => bind-9.18.1}/conf.patch
(100%)
rename meta/recipes-connectivity/bind/{bind-9.16.26 =>
bind-9.18.1}/generate-rndc-key.sh (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.26 =>
bind-9.18.1}/init.d-add-support-for-read-only-rootfs.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.26 =>
bind-9.18.1}/make-etc-initd-bind-stop-work.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.26 =>
bind-9.18.1}/named.service (100%)
rename meta/recipes-connectivity/bind/{bind_9.16.26.bb => bind_9.18.1.bb} (89%)
diff --git
a/meta/recipes-connectivity/bind/bind-9.16.26/0001-named-lwresd-V-and-start-log-hide-build-options.patch
b/meta/recipes-connectivity/bind/bind-9.16.26/0001-named-lwresd-V-and-start-log-hide-build-options.patch
deleted file mode 100644
index 4dc6a5a2ae..00
---
a/meta/recipes-connectivity/bind/bind-9.16.26/0001-named-lwresd-V-and-start-log-hide-build-options.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f5761bbaf743d291f3e7e859e69ebe61a1718cbf Mon Sep 17 00:00:00 2001
-From: Hongxu Jia
-Date: Mon, 27 Aug 2018 21:24:20 +0800
-Subject: [PATCH] `named/lwresd -V' and start log hide build options
-
-The build options expose build path directories, so hide them.
-[snip]
-$ named -V
-|built by make with *** (options are hidden)
-[snip]
-
-Upstream-Status: Inappropriate [oe-core specific]
-
-Signed-off-by: Hongxu Jia
-
-Refreshed for 9.16.0
-Signed-off-by: Armin Kuster
- bin/named/include/named/globals.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/named/include/named/globals.h
b/bin/named/include/named/globals.h
-index 0572154..3147e04 100644
a/bin/named/include/named/globals.h
-+++ b/bin/named/include/named/globals.h
-@@ -69,7 +69,7 @@ EXTERN const char *named_g_version INIT(VERSION);
- EXTERN const char *named_g_product INIT(PRODUCT);
- EXTERN const char *named_g_description INIT(DESCRIPTION);
- EXTERN const char *named_g_srcidINIT(SRCID);
--EXTERN const char *named_g_configargs INIT(CONFIGARGS);
-+EXTERN const char *named_g_configargs INIT("*** (options are hidden)");
- EXTERN const char *named_g_builder INIT(BUILDER);
- EXTERN in_port_t named_g_port INIT(0);
- EXTERN isc_dscp_t named_g_dscp INIT(-1);
---
-2.20.1
-
diff --git
a/meta/recipes-connectivity/bind/bind-9.16.26/0001-avoid-start-failure-with-bind-user.patch
b/meta/recipes-connectivity/bind/bind-9.18.1/0001-avoid-start-failure-with-bind-user.patch
similarity index 100%
rename from
meta/recipes-connectivity/bind/bind-9.16.26/0001-avoid-start-failure-with-bind-user.patch
rename to
meta/recipes-connectivity/bind/bind-9.18.1/0001-avoid-start-failure-with-bind-user.patch
diff --git
a/meta/recipes-connectivity/bind/bind-9.18.1/0001-named-lwresd-V-and-start-log-hide-build-options.patch
b/meta/recipes-connectivity/bind/bind-9.18.1/0001-named-lwresd-V-and-start-log-hide-build-options.patch
new file mode 100644
index 00..4c10f33f04
--- /dev/null
+++
b/meta/recipes-connectivity/bind/bind-9.18.1/0001-named-lwresd-V-and-start-log-hide-build-options.patch
@@ -0,0 +1,35 @@
+From 4e83392e840fa7b05e778710b8c202d102477a13 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia
+Date: Mon, 27 Aug 2018 21:24:20 +0800
+Subject: [PATCH] `named/lwresd -V' and start log hide build options
+
+The build options expose build path directories, so hide them.
+[snip]
+$ named -V
+|built by make with ***
[OE-core] [PATCH 08/11] gtk+3: upgrade 3.24.31 -> 3.24.33
From: Alexander Kanavin
Signed-off-by: Alexander Kanavin
---
meta/recipes-gnome/gtk+/{gtk+3_3.24.31.bb => gtk+3_3.24.33.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-gnome/gtk+/{gtk+3_3.24.31.bb => gtk+3_3.24.33.bb} (89%)
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.31.bb
b/meta/recipes-gnome/gtk+/gtk+3_3.24.33.bb
similarity index 89%
rename from meta/recipes-gnome/gtk+/gtk+3_3.24.31.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.24.33.bb
index a53cd7a45e..fb9e29dd8c 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.24.31.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.33.bb
@@ -7,7 +7,7 @@ SRC_URI =
"http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
file://0003-Add-disable-opengl-configure-option.patch \
file://link_fribidi.patch \
"
-SRC_URI[sha256sum] =
"423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9"
+SRC_URI[sha256sum] =
"588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801"
S = "${WORKDIR}/gtk+-${PV}"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163464):
https://lists.openembedded.org/g/openembedded-core/message/163464
Mute This Topic: https://lists.openembedded.org/mt/89884871/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 07/11] diffoscope: upgrade 206 -> 207
From: Alexander Kanavin
Signed-off-by: Alexander Kanavin
---
.../diffoscope/{diffoscope_206.bb => diffoscope_207.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/diffoscope/{diffoscope_206.bb =>
diffoscope_207.bb} (92%)
diff --git a/meta/recipes-support/diffoscope/diffoscope_206.bb
b/meta/recipes-support/diffoscope/diffoscope_207.bb
similarity index 92%
rename from meta/recipes-support/diffoscope/diffoscope_206.bb
rename to meta/recipes-support/diffoscope/diffoscope_207.bb
index 7eaca74b33..004d4d1ee6 100644
--- a/meta/recipes-support/diffoscope/diffoscope_206.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_207.bb
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
inherit pypi setuptools3
-SRC_URI[sha256sum] =
"93731939ede57547a3275c3c81875ab4bd222f26364a7519cf6aafe1939cd603"
+SRC_URI[sha256sum] =
"e670160911c8e465ab178f23bd1a2e6a827032b7bbec5f24eebf9215f1ae5f54"
RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c
python3-magic python3-rpm"
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163463):
https://lists.openembedded.org/g/openembedded-core/message/163463
Mute This Topic: https://lists.openembedded.org/mt/89884870/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 02/11] python3-typing-extensions: fix upstream version check
Signed-off-by: Alexander Kanavin --- .../python/python3-typing-extensions_3.10.0.0.bb| 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb b/meta/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb index a5f491c770..a8e83fc824 100644 --- a/meta/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb +++ b/meta/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb @@ -10,3 +10,5 @@ SRC_URI[sha256sum] = "50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6 inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_REGEX = "/typing-extensions/(?P(\d+[\.\-_]*)+)/" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163458): https://lists.openembedded.org/g/openembedded-core/message/163458 Mute This Topic: https://lists.openembedded.org/mt/89884865/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 01/11] python3-semantic-version: fix upstream verison check
Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/python/python3-semantic-version_2.9.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/python/python3-semantic-version_2.9.0.bb b/meta/recipes-devtools/python/python3-semantic-version_2.9.0.bb index ee635871bf..4101f48043 100644 --- a/meta/recipes-devtools/python/python3-semantic-version_2.9.0.bb +++ b/meta/recipes-devtools/python/python3-semantic-version_2.9.0.bb @@ -10,3 +10,5 @@ PYPI_PACKAGE = "semantic_version" inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_REGEX = "/semantic-version/(?P(\d+[\.\-_]*)+)/" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163457): https://lists.openembedded.org/g/openembedded-core/message/163457 Mute This Topic: https://lists.openembedded.org/mt/89884864/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
