Date   

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



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

Bruce Ashfield
 

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


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

Ross Burton <ross@...>
 

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


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

Bruce Ashfield
 

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


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

Christopher Clark
 



On Mon, Jan 17, 2022 at 12:33 AM Bertrand Marquis <Bertrand.Marquis@...> wrote:
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@...>

Acked-by: Christopher Clark <christopher.w.clark@...>

Christopher

 

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.


Re: [PATCH v3 2/2] xen: Clear TUNE_CCARGS for Xen build for aarch64 machines

Christopher Clark
 



On Mon, Jan 17, 2022 at 12:34 AM Bertrand Marquis <Bertrand.Marquis@...> wrote:
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@...>

Acked-by: Christopher Clark <christopher.w.clark@...>

Christopher

 

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.


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

Bruce Ashfield
 

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


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

Ross Burton <ross@...>
 

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


Re: [PATCH v3 2/2] xen: Clear TUNE_CCARGS for Xen build for aarch64 machines

Bertrand Marquis
 

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.


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

Bertrand Marquis
 

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.


Re: [PATCH V3] add option -p for mkir command

Bruce Ashfield
 

The shortlog was missing "openvswitch:", so I added that locally and
pushed the change.

Cheers,

Bruce

In message: [meta-virtualization][PATCH V3] add option -p for mkir command
on 14/01/2022 Changqing Li wrote:

From: Changqing Li <changqing.li@...>

To avoid "cannot create directory '/var/log/openvswitch': File exists"
when service is restart

Signed-off-by: Changqing Li <changqing.li@...>
---
...01-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
index f7ec3fa..8bda865 100644
--- a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
+++ b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
@@ -96,7 +96,7 @@ index 74e5acb7f..39698f238 100644
ExecStartPre=/bin/rm -f /run/openvswitch.useropts
-ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch
-ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
-+ExecStartPre=-/bin/mkdir /run/openvswitch /var/log/openvswitch
++ExecStartPre=-/bin/mkdir -p /run/openvswitch /var/log/openvswitch
+ExecStartPre=-/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch
ExecStartPre=/bin/sh -c '/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts'
ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi'
--
2.17.1



Re: [PATCH] go-fsnotify: switch to main branch

Bruce Ashfield
 

Thanks Vishal!

My latest runs picked up the same branch change, so I went ahead and
fixed it locally as well as updating to the latest version of the
project.

Assuming my integration tests pass, I expect to get the changes pushed
out today.

Bruce

On Fri, Jan 14, 2022 at 6:22 AM Vishal <vishal.bhoj@...> wrote:

The maintainer has migrated from master branch to main
branch and hence fetch is failing without this patch

Signed-off-by: Vishal Bhoj <vishal.bhoj@...>
---
recipes-devtools/go/go-fsnotify_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-devtools/go/go-fsnotify_git.bb b/recipes-devtools/go/go-fsnotify_git.bb
index 8aa1c76..85350b0 100644
--- a/recipes-devtools/go/go-fsnotify_git.bb
+++ b/recipes-devtools/go/go-fsnotify_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c38914c9a7ab03bb2b96d4baaee10769"
SRCNAME = "fsnotify"

PKG_NAME = "github.com/fsnotify/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https"
+SRC_URI = "git://${PKG_NAME}.git;branch=main;protocol=https"

SRCREV = "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6"
PV = "1.2.11+git${SRCPV}"
--
2.34.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


[PATCH] go-fsnotify: switch to main branch

Vishal <vishal.bhoj@...>
 

The maintainer has migrated from master branch to main
branch and hence fetch is failing without this patch

Signed-off-by: Vishal Bhoj <vishal.bhoj@...>
---
recipes-devtools/go/go-fsnotify_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-devtools/go/go-fsnotify_git.bb b/recipes-devtools/go/go-fsnotify_git.bb
index 8aa1c76..85350b0 100644
--- a/recipes-devtools/go/go-fsnotify_git.bb
+++ b/recipes-devtools/go/go-fsnotify_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c38914c9a7ab03bb2b96d4baaee10769"
SRCNAME = "fsnotify"

PKG_NAME = "github.com/fsnotify/${SRCNAME}"
-SRC_URI = "git://${PKG_NAME}.git;branch=master;protocol=https"
+SRC_URI = "git://${PKG_NAME}.git;branch=main;protocol=https"

SRCREV = "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6"
PV = "1.2.11+git${SRCPV}"
--
2.34.1


[PATCH V3] add option -p for mkir command

Changqing Li
 

From: Changqing Li <changqing.li@...>

To avoid "cannot create directory '/var/log/openvswitch': File exists"
when service is restart

Signed-off-by: Changqing Li <changqing.li@...>
---
...01-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
index f7ec3fa..8bda865 100644
--- a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
+++ b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
@@ -96,7 +96,7 @@ index 74e5acb7f..39698f238 100644
ExecStartPre=/bin/rm -f /run/openvswitch.useropts
-ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch
-ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
-+ExecStartPre=-/bin/mkdir /run/openvswitch /var/log/openvswitch
++ExecStartPre=-/bin/mkdir -p /run/openvswitch /var/log/openvswitch
+ExecStartPre=-/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch
ExecStartPre=/bin/sh -c '/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts'
ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi'
--
2.17.1


[PATCH v3 2/2] xen: Clear TUNE_CCARGS for Xen build for aarch64 machines

Kamil Dziezyk
 

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

501 - 520 of 7513