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

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

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

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

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

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

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

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

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

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

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:

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

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

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.

Ross

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

On Mon, Jan 17, 2022 at 7:58 AM Ross Burton <ross@...> wrote:

Inheriting setuptools3-base doesn't actually define any tasks, so commit
1ef6050 to drop distutils3 had the side-effect of not building any code.

Backport a commit from upstream to switch to setuptools, inherit
setuptool3, and change DISTUTILS_SETUP_PATH to SETUPTOOLS_SETUP_PATH.

I have a SRCREV bump ready to go for dtc, so I've applied this and
then the bump on top.

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.

Bruce

Bruce

Signed-off-by: Ross Burton <ross.burton@...>
---
recipes-kernel/dtc/files/setuptools.patch | 34 +++++++++++++++++++++++
recipes-kernel/dtc/python3-dtc_1.6.1.bb | 7 +++--
2 files changed, 38 insertions(+), 3 deletions(-)
create mode 100644 recipes-kernel/dtc/files/setuptools.patch

diff --git a/recipes-kernel/dtc/files/setuptools.patch b/recipes-kernel/dtc/files/setuptools.patch
new file mode 100644
index 0000000..3d37ebd
--- /dev/null
+++ b/recipes-kernel/dtc/files/setuptools.patch
@@ -0,0 +1,34 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@...>
+
+From c691776ddb26acbd3674722caafacaf7b6e3e807 Mon Sep 17 00:00:00 2001
+From: Rob Herring <robh@...>
+Date: Wed, 10 Nov 2021 19:11:32 -0600
+Subject: [PATCH] pylibfdt: Use setuptools instead of distutils
+
+The use of setuptools is favored over distutils. setuptools is needed to
+support building Python 'wheels' and for pip support.
+
+Signed-off-by: Rob Herring <robh@...>
+Message-Id: <20211111011135.2386773-2-robh@...>
+Signed-off-by: David Gibson <david@...>
+---
+ pylibfdt/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py
+index ef40f15..f065a59 100755
+--- a/pylibfdt/setup.py
++++ b/pylibfdt/setup.py
+@@ -10,7 +10,7 @@ Copyright (C) 2017 Google, Inc.
+ Written by Simon Glass <sjg@...>
+ """
+
+-from distutils.core import setup, Extension
++from setuptools import setup, Extension
+ import os
+ import re
+ import sys
+--
+2.25.1
+
diff --git a/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/recipes-kernel/dtc/python3-dtc_1.6.1.bb
index e9b8499..6e02db6 100644
--- a/recipes-kernel/dtc/python3-dtc_1.6.1.bb
+++ b/recipes-kernel/dtc/python3-dtc_1.6.1.bb
@@ -7,6 +7,7 @@ LICENSE = "GPLv2 | BSD-2-Clause"
DEPENDS = "flex-native bison-native swig-native libyaml dtc"

SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \
+ file://setuptools.patch \
file://ssize.patch"

UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
@@ -17,13 +18,13 @@ SRCREV = "ecaeb97fec013973360e94888a7de645f084345c"

S = "${WORKDIR}/git"

-inherit setuptools3-base pkgconfig
+inherit setuptools3 pkgconfig

-DISTUTILS_SETUP_PATH = "${S}/pylibfdt"
+SETUPTOOLS_SETUP_PATH = "${S}/pylibfdt"

do_configure:prepend() {
oe_runmake -C "${S}" version_gen.h
- mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/"
+ mv "${S}/version_gen.h" "${SETUPTOOLS_SETUP_PATH}/"
}

BBCLASSEXTEND = "native nativesdk"
--
2.25.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

On Mon, Jan 17, 2022 at 7:58 AM Ross Burton <ross@...> wrote:

Inheriting setuptools3-base doesn't actually define any tasks, so commit
1ef6050 to drop distutils3 had the side-effect of not building any code.

Backport a commit from upstream to switch to setuptools, inherit
setuptool3, and change DISTUTILS_SETUP_PATH to SETUPTOOLS_SETUP_PATH.

I have a SRCREV bump ready to go for dtc, so I've applied this and
then the bump on top.

Bruce

Signed-off-by: Ross Burton <ross.burton@...>
---
recipes-kernel/dtc/files/setuptools.patch | 34 +++++++++++++++++++++++
recipes-kernel/dtc/python3-dtc_1.6.1.bb | 7 +++--
2 files changed, 38 insertions(+), 3 deletions(-)
create mode 100644 recipes-kernel/dtc/files/setuptools.patch

diff --git a/recipes-kernel/dtc/files/setuptools.patch b/recipes-kernel/dtc/files/setuptools.patch
new file mode 100644
index 0000000..3d37ebd
--- /dev/null
+++ b/recipes-kernel/dtc/files/setuptools.patch
@@ -0,0 +1,34 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@...>
+
+From c691776ddb26acbd3674722caafacaf7b6e3e807 Mon Sep 17 00:00:00 2001
+From: Rob Herring <robh@...>
+Date: Wed, 10 Nov 2021 19:11:32 -0600
+Subject: [PATCH] pylibfdt: Use setuptools instead of distutils
+
+The use of setuptools is favored over distutils. setuptools is needed to
+support building Python 'wheels' and for pip support.
+
+Signed-off-by: Rob Herring <robh@...>
+Message-Id: <20211111011135.2386773-2-robh@...>
+Signed-off-by: David Gibson <david@...>
+---
+ pylibfdt/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py
+index ef40f15..f065a59 100755
+--- a/pylibfdt/setup.py
++++ b/pylibfdt/setup.py
+@@ -10,7 +10,7 @@ Copyright (C) 2017 Google, Inc.
+ Written by Simon Glass <sjg@...>
+ """
+
+-from distutils.core import setup, Extension
++from setuptools import setup, Extension
+ import os
+ import re
+ import sys
+--
+2.25.1
+
diff --git a/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/recipes-kernel/dtc/python3-dtc_1.6.1.bb
index e9b8499..6e02db6 100644
--- a/recipes-kernel/dtc/python3-dtc_1.6.1.bb
+++ b/recipes-kernel/dtc/python3-dtc_1.6.1.bb
@@ -7,6 +7,7 @@ LICENSE = "GPLv2 | BSD-2-Clause"
DEPENDS = "flex-native bison-native swig-native libyaml dtc"

SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \
+ file://setuptools.patch \
file://ssize.patch"

UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
@@ -17,13 +18,13 @@ SRCREV = "ecaeb97fec013973360e94888a7de645f084345c"

S = "${WORKDIR}/git"

-inherit setuptools3-base pkgconfig
+inherit setuptools3 pkgconfig

-DISTUTILS_SETUP_PATH = "${S}/pylibfdt"
+SETUPTOOLS_SETUP_PATH = "${S}/pylibfdt"

do_configure:prepend() {
oe_runmake -C "${S}" version_gen.h
- mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/"
+ mv "${S}/version_gen.h" "${SETUPTOOLS_SETUP_PATH}/"
}

BBCLASSEXTEND = "native nativesdk"
--
2.25.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

Inheriting setuptools3-base doesn't actually define any tasks, so commit
1ef6050 to drop distutils3 had the side-effect of not building any code.

Backport a commit from upstream to switch to setuptools, inherit
setuptool3, and change DISTUTILS_SETUP_PATH to SETUPTOOLS_SETUP_PATH.

Signed-off-by: Ross Burton <ross.burton@...>
---
recipes-kernel/dtc/files/setuptools.patch | 34 +++++++++++++++++++++++
recipes-kernel/dtc/python3-dtc_1.6.1.bb | 7 +++--
2 files changed, 38 insertions(+), 3 deletions(-)
create mode 100644 recipes-kernel/dtc/files/setuptools.patch

diff --git a/recipes-kernel/dtc/files/setuptools.patch b/recipes-kernel/d=
tc/files/setuptools.patch
new file mode 100644
index 0000000..3d37ebd
--- /dev/null
+++ b/recipes-kernel/dtc/files/setuptools.patch
@@ -0,0 +1,34 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@...>
+
+From c691776ddb26acbd3674722caafacaf7b6e3e807 Mon Sep 17 00:00:00 2001
+From: Rob Herring <robh@...>
+Date: Wed, 10 Nov 2021 19:11:32 -0600
+Subject: [PATCH] pylibfdt: Use setuptools instead of distutils
+
+The use of setuptools is favored over distutils. setuptools is needed to
+support building Python 'wheels' and for pip support.
+
+Signed-off-by: Rob Herring <robh@...>
+Message-Id: <20211111011135.2386773-2-robh@...>
+Signed-off-by: David Gibson <david@...>
+---
+ pylibfdt/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py
+index ef40f15..f065a59 100755
+--- a/pylibfdt/setup.py
++++ b/pylibfdt/setup.py
+@@ -10,7 +10,7 @@ Copyright (C) 2017 Google, Inc.
+ Written by Simon Glass <sjg@...>
+ """
+=20
+-from distutils.core import setup, Extension
++from setuptools import setup, Extension
+ import os
+ import re
+ import sys
+--=20
+2.25.1
+
diff --git a/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/recipes-kernel/dtc=
/python3-dtc_1.6.1.bb
index e9b8499..6e02db6 100644
--- a/recipes-kernel/dtc/python3-dtc_1.6.1.bb
+++ b/recipes-kernel/dtc/python3-dtc_1.6.1.bb
@@ -7,6 +7,7 @@ LICENSE =3D "GPLv2 | BSD-2-Clause"
DEPENDS =3D "flex-native bison-native swig-native libyaml dtc"
=20
SRC_URI =3D "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=3Dmas=
ter \
+ file://setuptools.patch \
file://ssize.patch"
=20
UPSTREAM_CHECK_GITTAGREGEX =3D "v(?P<pver>\d+(\.\d+)+)"
@@ -17,13 +18,13 @@ SRCREV =3D "ecaeb97fec013973360e94888a7de645f084345c"
=20
S =3D "${WORKDIR}/git"
=20
-inherit setuptools3-base pkgconfig
+inherit setuptools3 pkgconfig
=20
-DISTUTILS_SETUP_PATH =3D "${S}/pylibfdt"
+SETUPTOOLS_SETUP_PATH =3D "${S}/pylibfdt"
=20
do_configure:prepend() {
oe_runmake -C "${S}" version_gen.h
- mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/"
+ mv "${S}/version_gen.h" "${SETUPTOOLS_SETUP_PATH}/"
}
=20
BBCLASSEXTEND =3D "native nativesdk"
--=20
2.25.1

Hi Kamil,

On 13 Jan 2022, at 11:30, Kamil Dziezyk via lists.yoctoproject.org <kamil.dziezyk=arm.com@...> wrote:

Xen build may fail for arm machines that have enabled extra flags,
that can be enabled only for specific architecture version, e.g. armv8-2a.

Signed-off-by: Kamil Dziezyk <kamil.dziezyk@...>

Reviewed-by: Bertrand Marquis <bertrand.marquis@...>

Cheers
Bertrand

---
recipes-extended/xen/xen-hypervisor.inc | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/recipes-extended/xen/xen-hypervisor.inc b/recipes-extended/xen/xen-hypervisor.inc
index cffd491..81e361f 100644
--- a/recipes-extended/xen/xen-hypervisor.inc
+++ b/recipes-extended/xen/xen-hypervisor.inc
@@ -103,3 +103,7 @@ CROSS_CURSES_LIB += "-L${STAGING_LIBDIR_NATIVE}"
# Specify the root dir of the .config file for do_menuconfig and do_diffconfig
# tasks
KCONFIG_CONFIG_ROOTDIR = "${S}/xen"
+
+# Xen is setting all CC flags on its own. Make sure that they are not modified
+# for aarch64, e.g. with architecture-specific optimizations.
+TUNE_CCARGS:aarch64=""
--
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.

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.

Hi Kamil,

On 13 Jan 2022, at 11:30, Kamil Dziezyk via lists.yoctoproject.org <kamil.dziezyk=arm.com@...> 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@...>

Reviewed-by: Bertrand Marquis <bertrand.marquis@...>

Cheers
Bertrand

---
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.

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.