Date   

[hardknott][PATCH] ovs: update to 2.15.3

He Zhe
 

Drop the following backported patch.
0001-ofp-actions-Fix-use-after-free-while-decoding-RAW_EN.patch

Signed-off-by: He Zhe <zhe.he@...>
---
...use-after-free-while-decoding-RAW_EN.patch | 101 ------------------
.../openvswitch/openvswitch_git.bb | 7 +-
2 files changed, 3 insertions(+), 105 deletions(-)
delete mode 100644 recipes-networking/openvswitch/files/0001-ofp-actions-Fix-use-after-free-while-decoding-RAW_EN.patch

diff --git a/recipes-networking/openvswitch/files/0001-ofp-actions-Fix-use-after-free-while-decoding-RAW_EN.patch b/recipes-networking/openvswitch/files/0001-ofp-actions-Fix-use-after-free-while-decoding-RAW_EN.patch
deleted file mode 100644
index c88c097d..00000000
--- a/recipes-networking/openvswitch/files/0001-ofp-actions-Fix-use-after-free-while-decoding-RAW_EN.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 802a31a7070cea910b95d7e926c9da30a1f9e54f Mon Sep 17 00:00:00 2001
-From: Ilya Maximets <i.maximets@...>
-Date: Tue, 16 Feb 2021 23:27:30 +0100
-Subject: [PATCH] ofp-actions: Fix use-after-free while decoding RAW_ENCAP.
-
-While decoding RAW_ENCAP action, decode_ed_prop() might re-allocate
-ofpbuf if there is no enough space left. However, function
-'decode_NXAST_RAW_ENCAP' continues to use old pointer to 'encap'
-structure leading to write-after-free and incorrect decoding.
-
- ==3549105==ERROR: AddressSanitizer: heap-use-after-free on address
- 0x60600000011a at pc 0x0000005f6cc6 bp 0x7ffc3a2d4410 sp 0x7ffc3a2d4408
- WRITE of size 2 at 0x60600000011a thread T0
- #0 0x5f6cc5 in decode_NXAST_RAW_ENCAP lib/ofp-actions.c:4461:20
- #1 0x5f0551 in ofpact_decode ./lib/ofp-actions.inc2:4777:16
- #2 0x5ed17c in ofpacts_decode lib/ofp-actions.c:7752:21
- #3 0x5eba9a in ofpacts_pull_openflow_actions__ lib/ofp-actions.c:7791:13
- #4 0x5eb9fc in ofpacts_pull_openflow_actions lib/ofp-actions.c:7835:12
- #5 0x64bb8b in ofputil_decode_packet_out lib/ofp-packet.c:1113:17
- #6 0x65b6f4 in ofp_print_packet_out lib/ofp-print.c:148:13
- #7 0x659e3f in ofp_to_string__ lib/ofp-print.c:1029:16
- #8 0x659b24 in ofp_to_string lib/ofp-print.c:1244:21
- #9 0x65a28c in ofp_print lib/ofp-print.c:1288:28
- #10 0x540d11 in ofctl_ofp_parse utilities/ovs-ofctl.c:2814:9
- #11 0x564228 in ovs_cmdl_run_command__ lib/command-line.c:247:17
- #12 0x56408a in ovs_cmdl_run_command lib/command-line.c:278:5
- #13 0x5391ae in main utilities/ovs-ofctl.c:179:9
- #14 0x7f6911ce9081 in __libc_start_main (/lib64/libc.so.6+0x27081)
- #15 0x461fed in _start (utilities/ovs-ofctl+0x461fed)
-
-Fix that by getting a new pointer before using.
-
-Credit to OSS-Fuzz.
-
-Fuzzer regression test will fail only with AddressSanitizer enabled.
-
-Reported-at: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27851
-Fixes: f839892a206a ("OF support and translation of generic encap and decap")
-Acked-by: William Tu <u9012063@...>
-Signed-off-by: Ilya Maximets <i.maximets@...>
-
-Upstream-Status: Backport
-CVE: CVE-2021-36980
-Signed-off-by: Yanfei Xu <yanfei.xu@...>
----
- lib/ofp-actions.c | 2 ++
- tests/automake.mk | 3 ++-
- tests/fuzz-regression-list.at | 1 +
- tests/fuzz-regression/ofp_print_fuzzer-6540965472632832 | 0
- 4 files changed, 5 insertions(+), 1 deletion(-)
- create mode 100644 tests/fuzz-regression/ofp_print_fuzzer-6540965472632832
-
-diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
-index e2e829772..0342a228b 100644
---- a/lib/ofp-actions.c
-+++ b/lib/ofp-actions.c
-@@ -4431,6 +4431,7 @@ decode_NXAST_RAW_ENCAP(const struct nx_action_encap *nae,
- {
- struct ofpact_encap *encap;
- const struct ofp_ed_prop_header *ofp_prop;
-+ const size_t encap_ofs = out->size;
- size_t props_len;
- uint16_t n_props = 0;
- int err;
-@@ -4458,6 +4459,7 @@ decode_NXAST_RAW_ENCAP(const struct nx_action_encap *nae,
- }
- n_props++;
- }
-+ encap = ofpbuf_at_assert(out, encap_ofs, sizeof *encap);
- encap->n_props = n_props;
- out->header = &encap->ofpact;
- ofpact_finish_ENCAP(out, &encap);
-diff --git a/tests/automake.mk b/tests/automake.mk
-index 677b99a6b..fc80e027d 100644
---- a/tests/automake.mk
-+++ b/tests/automake.mk
-@@ -134,7 +134,8 @@ FUZZ_REGRESSION_TESTS = \
- tests/fuzz-regression/ofp_print_fuzzer-5722747668791296 \
- tests/fuzz-regression/ofp_print_fuzzer-6285128790704128 \
- tests/fuzz-regression/ofp_print_fuzzer-6470117922701312 \
-- tests/fuzz-regression/ofp_print_fuzzer-6502620041576448
-+ tests/fuzz-regression/ofp_print_fuzzer-6502620041576448 \
-+ tests/fuzz-regression/ofp_print_fuzzer-6540965472632832
- $(srcdir)/tests/fuzz-regression-list.at: tests/automake.mk
- $(AM_V_GEN)for name in $(FUZZ_REGRESSION_TESTS); do \
- basename=`echo $$name | sed 's,^.*/,,'`; \
-diff --git a/tests/fuzz-regression-list.at b/tests/fuzz-regression-list.at
-index e3173fb88..2347c690e 100644
---- a/tests/fuzz-regression-list.at
-+++ b/tests/fuzz-regression-list.at
-@@ -21,3 +21,4 @@ TEST_FUZZ_REGRESSION([ofp_print_fuzzer-5722747668791296])
- TEST_FUZZ_REGRESSION([ofp_print_fuzzer-6285128790704128])
- TEST_FUZZ_REGRESSION([ofp_print_fuzzer-6470117922701312])
- TEST_FUZZ_REGRESSION([ofp_print_fuzzer-6502620041576448])
-+TEST_FUZZ_REGRESSION([ofp_print_fuzzer-6540965472632832])
-diff --git a/tests/fuzz-regression/ofp_print_fuzzer-6540965472632832 b/tests/fuzz-regression/ofp_print_fuzzer-6540965472632832
-new file mode 100644
-index 000000000..e69de29bb
---
-2.27.0
-
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index d7f8e4b0..a66c9677 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -14,12 +14,12 @@ RDEPENDS_${PN}-ptest += "\
"

S = "${WORKDIR}/git"
-PV = "2.15+${SRCPV}"
-CVE_VERSION = "2.13.0"
+PV = "2.15.3+${SRCPV}"
+CVE_VERSION = "2.15.3"

FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"

-SRCREV = "8dc1733eaea866dce033b3c44853e1b09bf59fc7"
+SRCREV = "e4d2df62e65a615e19f62e2fd294709be8d75cdc"
SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.15 \
file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \
file://run-ptest \
@@ -28,7 +28,6 @@ SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.15
file://systemd-update-tool-paths.patch \
file://systemd-create-runtime-dirs.patch \
file://0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch \
- file://0001-ofp-actions-Fix-use-after-free-while-decoding-RAW_EN.patch \
"

LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab"
--
2.17.1


[PATCH] ovs: update to 2.15.3

He Zhe
 

Signed-off-by: He Zhe <zhe.he@...>
---
recipes-networking/openvswitch/openvswitch_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index 0fb7c132..4d413170 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -14,12 +14,12 @@ RDEPENDS:${PN}-ptest += "\
"

S = "${WORKDIR}/git"
-PV = "2.15.1+${SRCPV}"
-CVE_VERSION = "2.13.0"
+PV = "2.15.3+${SRCPV}"
+CVE_VERSION = "2.15.3"

FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:"

-SRCREV = "f8274b78c3403591e84f3c2bbacf8c86920d68ba"
+SRCREV = "e4d2df62e65a615e19f62e2fd294709be8d75cdc"
SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-2.15 \
file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \
file://run-ptest \
--
2.17.1


Re: [PATCH] docker: Add kernel-module-xt-nat to RRECOMMENDS

Bruce Ashfield
 

On Thu, Jan 20, 2022 at 2:07 AM Robert Yang <liezhi.yang@...> wrote:

Hi Bruce,

On 1/19/22 9:34 PM, Bruce Ashfield wrote:
On Wed, Jan 19, 2022 at 7:00 AM Robert Yang <liezhi.yang@...> wrote:

Fixed when kernel-module-xt-nat is not installed:
$ docker run --rm -it -p 80:80 alpine

docker: Error response from daemon: driver failed programming external connectivity on endpoint elated_cori
Try `iptables -h' or 'iptables --help' for more information.
(exit status 2)).
There's already a pending patch for similar changes, I'm still
working through the unification of the meta-virt fragments and the
kernel-cache fragments, so I'm not doing any of the RRECOMMENDS
changes at the moment, until I have that unified.

Since we can recommend all we want, but it can't fix a bad
configuration, and that's the issue.
Yes, makes sense, do you have a clue on how to figure out all of them, please?
This is something that I'm working on in cooperation with the external
kernel-cache recipe/tool that I have in meta-virt.

Your change is correct, I'm just going to let it sit on my queue for a
bit, while I work through the rest of the changes with respect to
getting the right configuration across a range of kernels and having
the ability to check for the fragments (versus the final .config,
since we don't want to start checking for individual options after the
kernel configuration runs).

Bruce


// Robert


Bruce

Signed-off-by: Robert Yang <liezhi.yang@...>
---
recipes-containers/docker/docker.inc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc
index 40a3642c..e7bdc388 100644
--- a/recipes-containers/docker/docker.inc
+++ b/recipes-containers/docker/docker.inc
@@ -29,7 +29,13 @@ RDEPENDS:${PN} = "util-linux util-linux-unshare iptables \
"
RDEPENDS:${PN} += "virtual-containerd virtual-runc"

-RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
+RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool \
+ kernel-module-nf-nat \
+ kernel-module-nf-conntrack-netlink \
+ kernel-module-xt-addrtype \
+ kernel-module-xt-masquerade \
+ kernel-module-xt-nat \
+ "

PROVIDES += "virtual/docker"

--
2.17.1

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


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


Re: [PATCH] docker: Add kernel-module-xt-nat to RRECOMMENDS

Robert Yang
 

Hi Bruce,

On 1/19/22 9:34 PM, Bruce Ashfield wrote:
On Wed, Jan 19, 2022 at 7:00 AM Robert Yang <liezhi.yang@...> wrote:

Fixed when kernel-module-xt-nat is not installed:
$ docker run --rm -it -p 80:80 alpine

docker: Error response from daemon: driver failed programming external connectivity on endpoint elated_cori
Try `iptables -h' or 'iptables --help' for more information.
(exit status 2)).
There's already a pending patch for similar changes, I'm still
working through the unification of the meta-virt fragments and the
kernel-cache fragments, so I'm not doing any of the RRECOMMENDS
changes at the moment, until I have that unified.
Since we can recommend all we want, but it can't fix a bad
configuration, and that's the issue.
Yes, makes sense, do you have a clue on how to figure out all of them, please?

// Robert

Bruce

Signed-off-by: Robert Yang <liezhi.yang@...>
---
recipes-containers/docker/docker.inc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc
index 40a3642c..e7bdc388 100644
--- a/recipes-containers/docker/docker.inc
+++ b/recipes-containers/docker/docker.inc
@@ -29,7 +29,13 @@ RDEPENDS:${PN} = "util-linux util-linux-unshare iptables \
"
RDEPENDS:${PN} += "virtual-containerd virtual-runc"

-RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
+RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool \
+ kernel-module-nf-nat \
+ kernel-module-nf-conntrack-netlink \
+ kernel-module-xt-addrtype \
+ kernel-module-xt-masquerade \
+ kernel-module-xt-nat \
+ "

PROVIDES += "virtual/docker"

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


Re: [PATCH] python3-dtc: fix packaging by using setuptools

Bruce Ashfield
 

On Wed, Jan 19, 2022 at 8:32 AM Bruce Ashfield via
lists.yoctoproject.org
<bruce.ashfield=gmail.com@...> wrote:

On Wed, Jan 19, 2022 at 7:52 AM Peter Hoyes <Peter.Hoyes@...> wrote:

On 18/01/2022 13:52, Bruce Ashfield via lists.yoctoproject.org wrote:
On Tue, Jan 18, 2022 at 6:18 AM Ross Burton <ross@...> wrote:
On Mon, 17 Jan 2022 at 18:07, Bruce Ashfield <bruce.ashfield@...> wrote:
Your change + my update are now queued:

https://git.yoctoproject.org/meta-virtualization/commit/?h=master-next&id=ed4bd1de0d2e040c303a8497ac0cd961aa8b8a7b

If you have any cycles for test build, that would be great .. since
somehow my own build didn't notice the empty package, so I can't say I
fully trust it.
SETUPTOOLS_SETUP_PATH defaults to S, so you can remove the assignment entirely.
done. And pushed to master.

Bruce

Ross
Hi Bruce,

I am now seeing the following failure on our build when attempting to
use python3-dtc:

usr/lib/python3.10/site-packages/_libfdt.cpython-310-x86_64-linux-gnu.so:
undefined symbol: fdt_overlay_target_offset

I think this is because the updated SRCREV includes 45f3d1a which
requires libfdt to export the symbol above, but poky/dtc is still on an
older revision. Maybe its necessary to roll back the SRCREV patch until
poky updates?
Hmm. That's a last resort, thrashing around the SRCREVs is never a
good idea.

I'll temporarily carry a newer dtc in meta-virt to get things working.
I split the difference.

The PV was wrong on the updated package anyway, so I've pushed a
change that uses SRCPV to show that I'm running ahead of oe-core DTC,
and I've reverted the one commit that introduces the problematic
symbol.

This gets me what I need for lopper, and I can now build and construct
xen-image-mininal for qemuarm64

Bruce



Bruce


Cheers,

Peter

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



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


Re: [PATCH v3 1/2] xen-tools: Load xen related kernel modules during system boot

Bruce Ashfield
 

On Wed, Jan 19, 2022 at 7:39 AM Diego Sueiro <Diego.Sueiro@...> wrote:

Hello Bruce,

Thanks for getting this merged.

We consider these patches as bug fixing and in this case is it possible to have them backported (cherry picked) to honister branch?
Agreed. they are bug fixes, so I've done the cherry pick to honister.

Bruce

Cheers,

--
Diego Sueiro

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Bruce Ashfield via
lists.yoctoproject.org
Sent: 19 January 2022 03:44
To: Kamil Dzieżyk <Kamil.Dziezyk@...>
Cc: meta-virtualization@...;
christopher.w.clark@...; cardoe@...
Subject: Re: [meta-virtualization] [PATCH v3 1/2] xen-tools: Load xen related
kernel modules during system boot

merged.

Bruce

In message: [meta-virtualization] [PATCH v3 1/2] xen-tools: Load xen related
kernel modules during system boot on 13/01/2022 Kamil Dziezyk wrote:

This patch changes the location of xen.conf file, that contains list
of kernel modules to be loaded during system boot, to
"${nonarch_libdir}". This is done by removing '--with-systemd-modules-
load=' flag from EXTRA_OECONF variable.

Previous path based on "${systemd_unitdir}" was not considered by
default by systemd-modules-load.service.

Signed-off-by: Kamil Dziezyk <kamil.dziezyk@...>
---
recipes-extended/xen/xen-tools.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc
b/recipes-extended/xen/xen-tools.inc
index ca924f4..6e25046 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -653,10 +653,10 @@ FILES:${PN}-xm = "\
"

FILES:${PN}-xencommons += "\
+ ${nonarch_libdir}/modules-load.d/xen.conf \
${sysconfdir}/default/xencommons \
${sysconfdir}/init.d/xencommons \
${sysconfdir}/xen/scripts/launch-xenstore \
- ${systemd_unitdir}/modules-load.d/xen.conf \
${systemd_unitdir}/system/proc-xen.mount \
${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \
${systemd_unitdir}/system/xenconsoled.service \ @@ -744,7 +744,6
@@ SYSTEMD_SERVICE:${PN}-xendomains = "xendomains.service"

EXTRA_OECONF += " \
--with-systemd=${systemd_unitdir}/system \
- --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \
--with-initddir=${INIT_D_DIR} \
--with-sysconfig-leaf-dir=default \
--with-system-qemu=${bindir}/qemu-system-i386 \
--
2.17.1

IMPORTANT NOTICE: The contents of this email and any attachments are
confidential and may also be privileged. If you are not the intended recipient,
please notify the sender immediately and do not disclose the contents to any
other person, use it for any purpose, or store or copy the information in any
medium. Thank you.




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


Re: [PATCH] docker: Add kernel-module-xt-nat to RRECOMMENDS

Bruce Ashfield
 

On Wed, Jan 19, 2022 at 7:00 AM Robert Yang <liezhi.yang@...> wrote:

Fixed when kernel-module-xt-nat is not installed:
$ docker run --rm -it -p 80:80 alpine

docker: Error response from daemon: driver failed programming external connectivity on endpoint elated_cori
Try `iptables -h' or 'iptables --help' for more information.
(exit status 2)).
There's already a pending patch for similar changes, I'm still
working through the unification of the meta-virt fragments and the
kernel-cache fragments, so I'm not doing any of the RRECOMMENDS
changes at the moment, until I have that unified.

Since we can recommend all we want, but it can't fix a bad
configuration, and that's the issue.

Bruce

Signed-off-by: Robert Yang <liezhi.yang@...>
---
recipes-containers/docker/docker.inc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc
index 40a3642c..e7bdc388 100644
--- a/recipes-containers/docker/docker.inc
+++ b/recipes-containers/docker/docker.inc
@@ -29,7 +29,13 @@ RDEPENDS:${PN} = "util-linux util-linux-unshare iptables \
"
RDEPENDS:${PN} += "virtual-containerd virtual-runc"

-RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
+RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool \
+ kernel-module-nf-nat \
+ kernel-module-nf-conntrack-netlink \
+ kernel-module-xt-addrtype \
+ kernel-module-xt-masquerade \
+ kernel-module-xt-nat \
+ "

PROVIDES += "virtual/docker"

--
2.17.1

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


Re: [PATCH] python3-dtc: fix packaging by using setuptools

Bruce Ashfield
 

On Wed, Jan 19, 2022 at 7:52 AM Peter Hoyes <Peter.Hoyes@...> wrote:

On 18/01/2022 13:52, Bruce Ashfield via lists.yoctoproject.org wrote:
On Tue, Jan 18, 2022 at 6:18 AM Ross Burton <ross@...> wrote:
On Mon, 17 Jan 2022 at 18:07, Bruce Ashfield <bruce.ashfield@...> wrote:
Your change + my update are now queued:

https://git.yoctoproject.org/meta-virtualization/commit/?h=master-next&id=ed4bd1de0d2e040c303a8497ac0cd961aa8b8a7b

If you have any cycles for test build, that would be great .. since
somehow my own build didn't notice the empty package, so I can't say I
fully trust it.
SETUPTOOLS_SETUP_PATH defaults to S, so you can remove the assignment entirely.
done. And pushed to master.

Bruce

Ross
Hi Bruce,

I am now seeing the following failure on our build when attempting to
use python3-dtc:

usr/lib/python3.10/site-packages/_libfdt.cpython-310-x86_64-linux-gnu.so:
undefined symbol: fdt_overlay_target_offset

I think this is because the updated SRCREV includes 45f3d1a which
requires libfdt to export the symbol above, but poky/dtc is still on an
older revision. Maybe its necessary to roll back the SRCREV patch until
poky updates?
Hmm. That's a last resort, thrashing around the SRCREVs is never a
good idea.

I'll temporarily carry a newer dtc in meta-virt to get things working.

Bruce


Cheers,

Peter

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


Re: [PATCH] python3-dtc: fix packaging by using setuptools

Peter Hoyes
 

On 18/01/2022 13:52, Bruce Ashfield via lists.yoctoproject.org wrote:
On Tue, Jan 18, 2022 at 6:18 AM Ross Burton <ross@...> wrote:
On Mon, 17 Jan 2022 at 18:07, Bruce Ashfield <bruce.ashfield@...> wrote:
Your change + my update are now queued:

https://git.yoctoproject.org/meta-virtualization/commit/?h=master-next&id=ed4bd1de0d2e040c303a8497ac0cd961aa8b8a7b

If you have any cycles for test build, that would be great .. since
somehow my own build didn't notice the empty package, so I can't say I
fully trust it.
SETUPTOOLS_SETUP_PATH defaults to S, so you can remove the assignment entirely.
done. And pushed to master.

Bruce

Ross
Hi Bruce,

I am now seeing the following failure on our build when attempting to use python3-dtc:

usr/lib/python3.10/site-packages/_libfdt.cpython-310-x86_64-linux-gnu.so: undefined symbol: fdt_overlay_target_offset

I think this is because the updated SRCREV includes 45f3d1a which requires libfdt to export the symbol above, but poky/dtc is still on an older revision. Maybe its necessary to roll back the SRCREV patch until poky updates?

Cheers,

Peter


Re: [PATCH v3 1/2] xen-tools: Load xen related kernel modules during system boot

Diego Sueiro
 

Hello Bruce,

Thanks for getting this merged.

We consider these patches as bug fixing and in this case is it possible to have them backported (cherry picked) to honister branch?

Cheers,

--
Diego Sueiro

-----Original Message-----
From: meta-virtualization@... <meta-
virtualization@...> On Behalf Of Bruce Ashfield via
lists.yoctoproject.org
Sent: 19 January 2022 03:44
To: Kamil Dzieżyk <Kamil.Dziezyk@...>
Cc: meta-virtualization@...;
christopher.w.clark@...; cardoe@...
Subject: Re: [meta-virtualization] [PATCH v3 1/2] xen-tools: Load xen related
kernel modules during system boot

merged.

Bruce

In message: [meta-virtualization] [PATCH v3 1/2] xen-tools: Load xen related
kernel modules during system boot on 13/01/2022 Kamil Dziezyk wrote:

This patch changes the location of xen.conf file, that contains list
of kernel modules to be loaded during system boot, to
"${nonarch_libdir}". This is done by removing '--with-systemd-modules-
load=' flag from EXTRA_OECONF variable.

Previous path based on "${systemd_unitdir}" was not considered by
default by systemd-modules-load.service.

Signed-off-by: Kamil Dziezyk <kamil.dziezyk@...>
---
recipes-extended/xen/xen-tools.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc
b/recipes-extended/xen/xen-tools.inc
index ca924f4..6e25046 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -653,10 +653,10 @@ FILES:${PN}-xm = "\
"

FILES:${PN}-xencommons += "\
+ ${nonarch_libdir}/modules-load.d/xen.conf \
${sysconfdir}/default/xencommons \
${sysconfdir}/init.d/xencommons \
${sysconfdir}/xen/scripts/launch-xenstore \
- ${systemd_unitdir}/modules-load.d/xen.conf \
${systemd_unitdir}/system/proc-xen.mount \
${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \
${systemd_unitdir}/system/xenconsoled.service \ @@ -744,7 +744,6
@@ SYSTEMD_SERVICE:${PN}-xendomains = "xendomains.service"

EXTRA_OECONF += " \
--with-systemd=${systemd_unitdir}/system \
- --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \
--with-initddir=${INIT_D_DIR} \
--with-sysconfig-leaf-dir=default \
--with-system-qemu=${bindir}/qemu-system-i386 \
--
2.17.1

IMPORTANT NOTICE: The contents of this email and any attachments are
confidential and may also be privileged. If you are not the intended recipient,
please notify the sender immediately and do not disclose the contents to any
other person, use it for any purpose, or store or copy the information in any
medium. Thank you.




[PATCH] docker: Add kernel-module-xt-nat to RRECOMMENDS

Robert Yang
 

Fixed when kernel-module-xt-nat is not installed:
$ docker run --rm -it -p 80:80 alpine

docker: Error response from daemon: driver failed programming external connectivity on endpoint elated_cori
Try `iptables -h' or 'iptables --help' for more information.
(exit status 2)).

Signed-off-by: Robert Yang <liezhi.yang@...>
---
recipes-containers/docker/docker.inc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc
index 40a3642c..e7bdc388 100644
--- a/recipes-containers/docker/docker.inc
+++ b/recipes-containers/docker/docker.inc
@@ -29,7 +29,13 @@ RDEPENDS:${PN} = "util-linux util-linux-unshare iptables \
"
RDEPENDS:${PN} += "virtual-containerd virtual-runc"

-RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat kernel-module-nf-conntrack-netlink kernel-module-xt-addrtype kernel-module-xt-masquerade"
+RRECOMMENDS:${PN} = "kernel-module-dm-thin-pool \
+ kernel-module-nf-nat \
+ kernel-module-nf-conntrack-netlink \
+ kernel-module-xt-addrtype \
+ kernel-module-xt-masquerade \
+ kernel-module-xt-nat \
+ "

PROVIDES += "virtual/docker"

--
2.17.1


[meta-cloud-services][PATCH 6/8] python3-termcolor: inherit setuptools3 not distutils

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-devtools/python/python3-termcolor_1.1.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb b/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb
index a8d50097..127287a7 100644
--- a/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=809e8749b63567978acfbd81d9f6a27d"
SRC_URI[md5sum] = "043e89644f8909d462fbbfa511c768df"
SRC_URI[sha256sum] = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"

-inherit distutils3 pypi
+inherit setuptools3 pypi

DEPENDS += " \
python3-pip \
--
2.25.1


[meta-cloud-services][PATCH 7/8] mod-wsgi: inherit setuptools3-base not distutils3-base

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
index 910bba1b..b0daf54d 100644
--- a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
+++ b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
@@ -20,7 +20,7 @@ SRC_URI = "\
file://configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch \
"

-inherit autotools-brokensep distutils3-base
+inherit autotools-brokensep setuptools3-base

DEPENDS += "apache2-native apache2 python3"
RDEPENDS:${PN} = "python3"
--
2.25.1


[meta-cloud-services][PATCH 8/8] python3-novnc: update 0.5.1 -> 1.3.0

wangmy
 

refresh python-distutils.patch

License-Update:
-year updated to 2019
-file of the noVNC core library changed
-the HTML, CSS, font and images files that included with the noVNC
source distibution changed
-URL of history changed
-files and projects that have been incorporated into
the noVNC core library changed
-license texts changed

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../python-distutils.patch | 4 ++--
.../python/{python-novnc_git.bb => python3-novnc_git.bb} | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
rename meta-openstack/recipes-devtools/python/{python-novnc => python3-novnc}/python-distutils.patch (91%)
rename meta-openstack/recipes-devtools/python/{python-novnc_git.bb => python3-novnc_git.bb} (68%)

diff --git a/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch b/meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch
similarity index 91%
rename from meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch
rename to meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch
index ef3393f3..85befc9f 100644
--- a/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch
+++ b/meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch
@@ -1,13 +1,13 @@
Index: git/setup.py
===================================================================
--- /dev/null
-+++ git/setup.py
++++ b/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+
-+setup(name='python-novnc',
++setup(name='python3-novnc',
+ version='2012.1~e3',
+ description='NoVNC python libraries',
+ author='Ghe Rivero',
diff --git a/meta-openstack/recipes-devtools/python/python-novnc_git.bb b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb
similarity index 68%
rename from meta-openstack/recipes-devtools/python/python-novnc_git.bb
rename to meta-openstack/recipes-devtools/python/python3-novnc_git.bb
index da5f048e..b41b5876 100644
--- a/meta-openstack/recipes-devtools/python/python-novnc_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb
@@ -2,13 +2,11 @@ DESCRIPTION = "This package contains the core python parts of NoVNC"
HOMEPAGE = "https://github.com/kanaka/noVNC"
SECTION = "devel/python"

-PR = "r0"
-
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6458695fb66dcd893becb5f9f912715e"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99aebbcc36b17df855fad64d4b792bff"

-SRCREV = "3b8ec46fd26d644e6edbea4f46e630929297e448"
-PV = "0.5.1+git${SRCPV}"
+SRCREV = "463c39e4af98ec4106b87bbea17e1605aa4c6180"
+PV = "1.3.0"

SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https \
file://python-distutils.patch"
--
2.25.1


[meta-cloud-services][PATCH 5/8] python3-mimeparse: inherit setuptools3 not distutils

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-devtools/python/python3-mimeparse_1.6.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb b/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
index da87dfdb..ae7bd430 100644
--- a/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
@@ -9,7 +9,7 @@ PYPI_PACKAGE = "python-mimeparse"
SRC_URI[md5sum] = "a32ae1df93be1ddb581d1c0fa124bab4"
SRC_URI[sha256sum] = "76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78"

-inherit distutils3 pypi setuptools3
+inherit pypi setuptools3

DISTUTILS_INSTALL_ARGS = "--root=${D} \
--prefix=${prefix} \
--
2.25.1


[meta-cloud-services][PATCH 2/8] python3-fixtures: inherit setuptools3 not distutils

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-devtools/python/python3-fixtures_3.0.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb b/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb
index 6cd0d810..a9335317 100644
--- a/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=239e2f4698b85aad5ed39bae5d2ef226"
SRC_URI[md5sum] = "cd6345b497a62fad739efee66346c2e0"
SRC_URI[sha256sum] = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef"

-inherit distutils3 pypi
+inherit setuptools3 pypi

DISTUTILS_INSTALL_ARGS = "--root=${D} \
--prefix=${prefix} \
--
2.25.1


[meta-cloud-services][PATCH 3/8] python3-ipaddr: inherit setuptools3 not distutils

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb b/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
index 2706954a..bb236eb8 100644
--- a/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e7e54827196088e6e96b33e9aec35c4a"
SRC_URI[md5sum] = "f88353e40dec06410acfa075b8209b27"
SRC_URI[sha256sum] = "4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6"

-inherit distutils3 pypi
+inherit setuptools3 pypi

DEPENDS += " \
python3-pip \
--
2.25.1


[meta-cloud-services][PATCH 4/8] python3-lockfile: inherit setuptools3 not distutils

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
.../recipes-devtools/python/python3-lockfile_0.12.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb b/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
index 81e1f22b..ba446380 100644
--- a/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2340dffbbfea534b58f1349984eeef72"
SRC_URI[md5sum] = "a6a1a82957a23afdf44cfdd039b65ff9"
SRC_URI[sha256sum] = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"

-inherit distutils3 pypi
+inherit setuptools3 pypi

DEPENDS += "\
python3-pbr \
--
2.25.1


[meta-cloud-services][PATCH 1/8] python-novnc: inherit setuptools3 not distutils

wangmy
 

Signed-off-by: Wang Mingyu <wangmy@...>
---
meta-openstack/recipes-devtools/python/python-novnc_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-openstack/recipes-devtools/python/python-novnc_git.bb b/meta-openstack/recipes-devtools/python/python-novnc_git.bb
index 50041ac9..da5f048e 100644
--- a/meta-openstack/recipes-devtools/python/python-novnc_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-novnc_git.bb
@@ -15,6 +15,6 @@ SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https \

S = "${WORKDIR}/git"

-inherit distutils3
+inherit setuptools3

-DEPENDS += " python-websockify"
+DEPENDS += " python3-websockify"
--
2.25.1


Re: [PATCH v3 1/2] xen-tools: Load xen related kernel modules during system boot

Bruce Ashfield
 

merged.

Bruce

In message: [meta-virtualization] [PATCH v3 1/2] xen-tools: Load xen related kernel modules during system boot
on 13/01/2022 Kamil Dziezyk wrote:

This patch changes the location of xen.conf file, that contains list of kernel
modules to be loaded during system boot, to "${nonarch_libdir}". This is done
by removing '--with-systemd-modules-load=' flag from EXTRA_OECONF variable.

Previous path based on "${systemd_unitdir}" was not considered by default by
systemd-modules-load.service.

Signed-off-by: Kamil Dziezyk <kamil.dziezyk@...>
---
recipes-extended/xen/xen-tools.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
index ca924f4..6e25046 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -653,10 +653,10 @@ FILES:${PN}-xm = "\
"

FILES:${PN}-xencommons += "\
+ ${nonarch_libdir}/modules-load.d/xen.conf \
${sysconfdir}/default/xencommons \
${sysconfdir}/init.d/xencommons \
${sysconfdir}/xen/scripts/launch-xenstore \
- ${systemd_unitdir}/modules-load.d/xen.conf \
${systemd_unitdir}/system/proc-xen.mount \
${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service \
${systemd_unitdir}/system/xenconsoled.service \
@@ -744,7 +744,6 @@ SYSTEMD_SERVICE:${PN}-xendomains = "xendomains.service"

EXTRA_OECONF += " \
--with-systemd=${systemd_unitdir}/system \
- --with-systemd-modules-load=${systemd_unitdir}/modules-load.d \
--with-initddir=${INIT_D_DIR} \
--with-sysconfig-leaf-dir=default \
--with-system-qemu=${bindir}/qemu-system-i386 \
--
2.17.1

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.


481 - 500 of 7507