* [PATCH 1/8] linux-libc-headers: update to v5.2 headers
2019-08-28 19:28 [PATCH 0/8] kernel/kernel-yocto: consolidated M3 feature pull request bruce.ashfield
@ 2019-08-28 19:28 ` bruce.ashfield
2019-08-28 19:28 ` [PATCH 2/8] linux-yocto: introduce 5.2 recipes bruce.ashfield
` (7 subsequent siblings)
8 siblings, 0 replies; 30+ messages in thread
From: bruce.ashfield @ 2019-08-28 19:28 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
We drop the patch 0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch
since it was a backport and is already part of the 5.2 headers
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
...sm-ptrace.h-should-not-depend-on-uap.patch | 62 -------------------
| 5 +-
3 files changed, 3 insertions(+), 66 deletions(-)
delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch
rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_5.0.bb => linux-libc-headers_5.2.bb} (75%)
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index c89b8e012d..5c28386c4f 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -23,7 +23,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.32%"
GDBVERSION ?= "8.3%"
GLIBCVERSION ?= "2.30%"
-LINUXLIBCVERSION ?= "5.0%"
+LINUXLIBCVERSION ?= "5.2%"
QEMUVERSION ?= "4.1%"
GOVERSION ?= "1.12%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch
deleted file mode 100644
index 5ea46e9590..0000000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 35341ca0614ab13e1ef34ad4f29a39e15ef31fa8 Mon Sep 17 00:00:00 2001
-From: Anisse Astier <aastier@freebox.fr>
-Date: Mon, 17 Jun 2019 15:22:22 +0200
-Subject: [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on
- <uapi/linux/prctl.h>
-
-Pulling linux/prctl.h into asm/ptrace.h in the arm64 UAPI headers causes
-userspace build issues for any program (e.g. strace and qemu) that
-includes both <sys/prctl.h> and <linux/ptrace.h> when using musl libc:
-
- | error: redefinition of 'struct prctl_mm_map'
- | struct prctl_mm_map {
-
-See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0
-for a public example of people working around this issue.
-
-Although it's a bit grotty, fix this breakage by duplicating the prctl
-constant definitions. Since these are part of the kernel ABI, they
-cannot be changed in future and so it's not the end of the world to have
-them open-coded.
-
-Fixes: 43d4da2c45b2 ("arm64/sve: ptrace and ELF coredump support")
-
-Upstream-Status: Backport [https://github.com/torvalds/linux/commit/35341ca0614ab13e1ef34ad4f29a39e15ef31fa8]
-Cc: stable@vger.kernel.org
-Acked-by: Dave Martin <Dave.Martin@arm.com>
-Signed-off-by: Anisse Astier <aastier@freebox.fr>
-Signed-off-by: Will Deacon <will.deacon@arm.com>
----
- arch/arm64/include/uapi/asm/ptrace.h | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h
-index 97c53203150b..e932284993d4 100644
---- a/arch/arm64/include/uapi/asm/ptrace.h
-+++ b/arch/arm64/include/uapi/asm/ptrace.h
-@@ -65,8 +65,6 @@
-
- #ifndef __ASSEMBLY__
-
--#include <linux/prctl.h>
--
- /*
- * User structures for general purpose, floating point and debug registers.
- */
-@@ -113,10 +111,10 @@ struct user_sve_header {
-
- /*
- * Common SVE_PT_* flags:
-- * These must be kept in sync with prctl interface in <linux/ptrace.h>
-+ * These must be kept in sync with prctl interface in <linux/prctl.h>
- */
--#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16)
--#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16)
-+#define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_VL_INHERIT */ >> 16)
-+#define SVE_PT_VL_ONEXEC ((1 << 18) /* PR_SVE_SET_VL_ONEXEC */ >> 16)
-
-
- /*
---
-2.22.0
-
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb
similarity index 75%
rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb
rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb
index 473688d95f..9d18df76c6 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb
@@ -12,8 +12,7 @@ SRC_URI_append_libc-musl = "\
SRC_URI_append = "\
file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \
file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \
- file://0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch \
"
-SRC_URI[md5sum] = "7381ce8aac80a01448e065ce795c19c0"
-SRC_URI[sha256sum] = "437b141a6499159f5a7282d5eb4b2be055f8e862ccce44d7464e8759c31a2e43"
+SRC_URI[md5sum] = "ddf994de00d7b18395886dd9b30b9262"
+SRC_URI[sha256sum] = "54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7"
--
2.19.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 2/8] linux-yocto: introduce 5.2 recipes
2019-08-28 19:28 [PATCH 0/8] kernel/kernel-yocto: consolidated M3 feature pull request bruce.ashfield
2019-08-28 19:28 ` [PATCH 1/8] linux-libc-headers: update to v5.2 headers bruce.ashfield
@ 2019-08-28 19:28 ` bruce.ashfield
2019-08-28 20:00 ` Adrian Bunk
2019-08-28 19:28 ` [PATCH 3/8] bluez5: fix build against libc-headers 5.2+ bruce.ashfield
` (6 subsequent siblings)
8 siblings, 1 reply; 30+ messages in thread
From: bruce.ashfield @ 2019-08-28 19:28 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Introducing the 5.2 linux-yocto reference kernels. 5.0 is EOL and will
be removed, leaving 4.19 (LTS) and 5.2 as the reference kernels.
This has been build/boot tested on all qemu architectures for
core-image-kernel-dev, and graphics tesed via core-image-sato. No
blockin issues have been found.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../recipes-kernel/linux/files/0001-foo.patch | 25 +++++++++
.../linux/linux-yocto-rt_5.2.bb | 44 +++++++++++++++
.../linux/linux-yocto-tiny_5.2.bb | 32 +++++++++++
meta/recipes-kernel/linux/linux-yocto_5.2.bb | 54 +++++++++++++++++++
4 files changed, 155 insertions(+)
create mode 100644 meta/recipes-kernel/linux/files/0001-foo.patch
create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.2.bb
diff --git a/meta/recipes-kernel/linux/files/0001-foo.patch b/meta/recipes-kernel/linux/files/0001-foo.patch
new file mode 100644
index 0000000000..0cd4578f33
--- /dev/null
+++ b/meta/recipes-kernel/linux/files/0001-foo.patch
@@ -0,0 +1,25 @@
+From 9ddc5e377434e28f1f3c74c9be011b0c9dfb1de4 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Fri, 1 Mar 2019 10:09:43 -0500
+Subject: [PATCH] foo
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ bsp/common-pc-64/common-pc-64-cpu.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bsp/common-pc-64/common-pc-64-cpu.cfg b/bsp/common-pc-64/common-pc-64-cpu.cfg
+index 8dced733815..63bc167cf6f 100644
+--- a/bsp/common-pc-64/common-pc-64-cpu.cfg
++++ b/bsp/common-pc-64/common-pc-64-cpu.cfg
+@@ -12,6 +12,6 @@
+ #.........................................................................
+
+ CONFIG_MCORE2=y
+-CONFIG_IA32_EMULATION=y
++#CONFIG_IA32_EMULATION is not set
+ CONFIG_NR_CPUS=24
+ CONFIG_PM=y
+--
+2.19.1
+
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb
new file mode 100644
index 0000000000..b4376b431d
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb
@@ -0,0 +1,44 @@
+KBRANCH ?= "v5.2/standard/preempt-rt/base"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+# Skip processing of this recipe if it is not explicitly specified as the
+# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
+# to build multiple virtual/kernel providers, e.g. as dependency of
+# core-image-rt-sdk, core-image-rt.
+python () {
+ if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
+ raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
+}
+
+SRCREV_machine ?= "ea07aa34bed4e662fe374d04d50b6ddb9882bb19"
+SRCREV_meta ?= "b53e99257175fd6f41f31e5ebec46c1bd11076b8"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}"
+
+LINUX_VERSION ?= "5.2.10"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+
+DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
+DEPENDS += "openssl-native util-linux-native"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "2"
+
+LINUX_KERNEL_TYPE = "preempt-rt"
+
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)"
+
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
+
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
+KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
+KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb
new file mode 100644
index 0000000000..f55e607b97
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb
@@ -0,0 +1,32 @@
+KBRANCH ?= "v5.2/standard/tiny/base"
+KBRANCH_qemuarm ?= "v5.2/standard/tiny/arm-versatile-926ejs"
+
+LINUX_KERNEL_TYPE = "tiny"
+KCONFIG_MODE = "--allnoconfig"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+LINUX_VERSION ?= "5.2.10"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+
+DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
+DEPENDS += "openssl-native util-linux-native"
+
+KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "2"
+
+SRCREV_machine_qemuarm ?= "ab7b49b196280d4289f18c35cf6ea534f364d104"
+SRCREV_machine ?= "77c28ea0e55cabb0b22b47d4eb2cc94b0940dfe6"
+SRCREV_meta ?= "b53e99257175fd6f41f31e5ebec46c1bd11076b8"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}"
+
+COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5"
+
+# Functionality flags
+KERNEL_FEATURES = ""
+
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb
new file mode 100644
index 0000000000..d873a1f2b3
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb
@@ -0,0 +1,54 @@
+KBRANCH ?= "v5.2/standard/base"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+# board specific branches
+KBRANCH_qemuarm ?= "v5.2/standard/arm-versatile-926ejs"
+KBRANCH_qemuarm64 ?= "v5.2/standard/qemuarm64"
+KBRANCH_qemumips ?= "v5.2/standard/mti-malta32"
+KBRANCH_qemuppc ?= "v5.2/standard/qemuppc"
+KBRANCH_qemuriscv64 ?= "v5.2/standard/base"
+KBRANCH_qemux86 ?= "v5.2/standard/base"
+KBRANCH_qemux86-64 ?= "v5.2/standard/base"
+KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64"
+
+SRCREV_machine_qemuarm ?= "97808f75eb3a63e9df6101b628720d06d656d79c"
+SRCREV_machine_qemuarm64 ?= "77c28ea0e55cabb0b22b47d4eb2cc94b0940dfe6"
+SRCREV_machine_qemumips ?= "c9fd15c35d77ca0c0a3e815df8284e2e99cabe8c"
+SRCREV_machine_qemuppc ?= "77c28ea0e55cabb0b22b47d4eb2cc94b0940dfe6"
+SRCREV_machine_qemuriscv64 ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458"
+SRCREV_machine_qemux86 ?= "77c28ea0e55cabb0b22b47d4eb2cc94b0940dfe6"
+SRCREV_machine_qemux86-64 ?= "77c28ea0e55cabb0b22b47d4eb2cc94b0940dfe6"
+SRCREV_machine_qemumips64 ?= "7a4b7a5518fb27bff55d4f5632e515289dc3fbb6"
+SRCREV_machine ?= "77c28ea0e55cabb0b22b47d4eb2cc94b0940dfe6"
+SRCREV_meta ?= "b53e99257175fd6f41f31e5ebec46c1bd11076b8"
+
+# remap qemuarm to qemuarma15 for the 5.2 kernel
+# KMACHINE_qemuarm ?= "qemuarma15"
+
+SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
+ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+LINUX_VERSION ?= "5.2.10"
+
+DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
+DEPENDS += "openssl-native util-linux-native"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "2"
+
+KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb"
+
+COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64"
+
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
+KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
+KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
--
2.19.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 2/8] linux-yocto: introduce 5.2 recipes
2019-08-28 19:28 ` [PATCH 2/8] linux-yocto: introduce 5.2 recipes bruce.ashfield
@ 2019-08-28 20:00 ` Adrian Bunk
2019-08-28 20:06 ` Bruce Ashfield
0 siblings, 1 reply; 30+ messages in thread
From: Adrian Bunk @ 2019-08-28 20:00 UTC (permalink / raw)
To: bruce.ashfield; +Cc: openembedded-core
On Wed, Aug 28, 2019 at 03:28:36PM -0400, bruce.ashfield@gmail.com wrote:
>...
> --- /dev/null
> +++ b/meta/recipes-kernel/linux/files/0001-foo.patch
> @@ -0,0 +1,25 @@
> +From 9ddc5e377434e28f1f3c74c9be011b0c9dfb1de4 Mon Sep 17 00:00:00 2001
> +From: Bruce Ashfield <bruce.ashfield@gmail.com>
> +Date: Fri, 1 Mar 2019 10:09:43 -0500
> +Subject: [PATCH] foo
>...
Debug change that leaked into the submission,
or missing proper patch description?
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 2/8] linux-yocto: introduce 5.2 recipes
2019-08-28 20:00 ` Adrian Bunk
@ 2019-08-28 20:06 ` Bruce Ashfield
0 siblings, 0 replies; 30+ messages in thread
From: Bruce Ashfield @ 2019-08-28 20:06 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Patches and discussions about the oe-core layer
On Wed, Aug 28, 2019 at 4:00 PM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Wed, Aug 28, 2019 at 03:28:36PM -0400, bruce.ashfield@gmail.com wrote:
> >...
> > --- /dev/null
> > +++ b/meta/recipes-kernel/linux/files/0001-foo.patch
> > @@ -0,0 +1,25 @@
> > +From 9ddc5e377434e28f1f3c74c9be011b0c9dfb1de4 Mon Sep 17 00:00:00 2001
> > +From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > +Date: Fri, 1 Mar 2019 10:09:43 -0500
> > +Subject: [PATCH] foo
> >...
>
> Debug change that leaked into the submission,
> or missing proper patch description?
Damnit. I scanned right over that :D
Thanks for the catch..
Bruce
>
> cu
> Adrian
>
> --
>
> "Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
> "Only a promise," Lao Er said.
> Pearl S. Buck - Dragon Seed
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 3/8] bluez5: fix build against libc-headers 5.2+
2019-08-28 19:28 [PATCH 0/8] kernel/kernel-yocto: consolidated M3 feature pull request bruce.ashfield
2019-08-28 19:28 ` [PATCH 1/8] linux-libc-headers: update to v5.2 headers bruce.ashfield
2019-08-28 19:28 ` [PATCH 2/8] linux-yocto: introduce 5.2 recipes bruce.ashfield
@ 2019-08-28 19:28 ` bruce.ashfield
2019-08-28 19:28 ` [PATCH 4/8] kernel-devsrc: remove python2 dependency bruce.ashfield
` (5 subsequent siblings)
8 siblings, 0 replies; 30+ messages in thread
From: bruce.ashfield @ 2019-08-28 19:28 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Backporting the following upstream commit to fix the build against
kernel 5.2+ headers:
[
Subject: [PATCH] tools: Fix build after y2038 changes in glibc
The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name
to fix the build.
]
Upstream-Status: backport commit f36f71f60b1e68c0f12e615b9b128d089ec3dd19
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-connectivity/bluez5/bluez5.inc | 1 +
...x-build-after-y2038-changes-in-glibc.patch | 68 +++++++++++++++++++
2 files changed, 69 insertions(+)
create mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index bffd174c0a..6c79ed0606 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -57,6 +57,7 @@ SRC_URI = "\
file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch \
file://CVE-2018-10910.patch \
file://gcc9-fixes.patch \
+ file://0001-tools-Fix-build-after-y2038-changes-in-glibc.patch \
"
S = "${WORKDIR}/bluez-${PV}"
diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch
new file mode 100644
index 0000000000..9ca20ae53b
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5/0001-tools-Fix-build-after-y2038-changes-in-glibc.patch
@@ -0,0 +1,68 @@
+From f36f71f60b1e68c0f12e615b9b128d089ec3dd19 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jun 2019 09:51:33 +0200
+Subject: [PATCH] tools: Fix build after y2038 changes in glibc
+
+The 32-bit SIOCGSTAMP has been deprecated. Use the deprecated name
+to fix the build.
+
+Upstream-Status: backport commit f36f71f60b1e68c0f12e615b9b128d089ec3dd19
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+
+---
+ tools/l2test.c | 6 +++++-
+ tools/rctest.c | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/tools/l2test.c b/tools/l2test.c
+index e755ac881..e787c2ce2 100644
+--- a/tools/l2test.c
++++ b/tools/l2test.c
+@@ -55,6 +55,10 @@
+ #define BREDR_DEFAULT_PSM 0x1011
+ #define LE_DEFAULT_PSM 0x0080
+
++#ifndef SIOCGSTAMP_OLD
++#define SIOCGSTAMP_OLD SIOCGSTAMP
++#endif
++
+ /* Test modes */
+ enum {
+ SEND,
+@@ -907,7 +911,7 @@ static void recv_mode(int sk)
+ if (timestamp) {
+ struct timeval tv;
+
+- if (ioctl(sk, SIOCGSTAMP, &tv) < 0) {
++ if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) {
+ timestamp = 0;
+ memset(ts, 0, sizeof(ts));
+ } else {
+diff --git a/tools/rctest.c b/tools/rctest.c
+index 94490f462..bc8ed875d 100644
+--- a/tools/rctest.c
++++ b/tools/rctest.c
+@@ -50,6 +50,10 @@
+
+ #include "src/shared/util.h"
+
++#ifndef SIOCGSTAMP_OLD
++#define SIOCGSTAMP_OLD SIOCGSTAMP
++#endif
++
+ /* Test modes */
+ enum {
+ SEND,
+@@ -505,7 +509,7 @@ static void recv_mode(int sk)
+ if (timestamp) {
+ struct timeval tv;
+
+- if (ioctl(sk, SIOCGSTAMP, &tv) < 0) {
++ if (ioctl(sk, SIOCGSTAMP_OLD, &tv) < 0) {
+ timestamp = 0;
+ memset(ts, 0, sizeof(ts));
+ } else {
+--
+2.19.1
+
--
2.19.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 4/8] kernel-devsrc: remove python2 dependency
2019-08-28 19:28 [PATCH 0/8] kernel/kernel-yocto: consolidated M3 feature pull request bruce.ashfield
` (2 preceding siblings ...)
2019-08-28 19:28 ` [PATCH 3/8] bluez5: fix build against libc-headers 5.2+ bruce.ashfield
@ 2019-08-28 19:28 ` bruce.ashfield
2019-08-28 20:05 ` Adrian Bunk
2019-08-28 19:28 ` [PATCH 5/8] perf: change dependencies on python to python3 bruce.ashfield
` (4 subsequent siblings)
8 siblings, 1 reply; 30+ messages in thread
From: bruce.ashfield @ 2019-08-28 19:28 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Witht the approaching EOL of python2, the kernel packages need to
be updated to depend on python3.
The core kernel scripts are now python3 safe, making the RDEPENDS
change relatively simple.
but
There are some scripts that are captured in the devsrc files that
are not used, but reference /usr/bin/python. The python3 package
does not provide /usr/bin/python so any package managers with
automatic dependency detection will fail to assemble a rootfs due
to the missing intepreter.
We could drop the scripts from the source capture, but that
risks dropping something that we need in certain operations and
we'd miss when they are updated in tree to explicitly call python3
(since they won't be revisited often). Light testing shows that the
scripts do run with python3, so rather than removing them, we change
the interpreter once they are copied, and automatic dependency
detection won't cause us rootfs assembly issues.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/linux/kernel-devsrc.bb | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 3900489ac5..e17c0ea0ab 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -240,6 +240,15 @@ do_install() {
# Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
cp $kerneldir/build/.config $kerneldir/build/include/config/auto.conf
+ # make the scripts python3 safe. We won't be running these, and if they are
+ # left as /usr/bin/python rootfs assembly will fail, since we only have python3
+ # in the RDEPENDS (and the python3 package does not include /usr/bin/python)
+ for ss in $(find $kerneldir/build/scripts -type f -name '*'); do
+ sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "$ss"
+ sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "$ss"
+ sed -i 's,/usr/bin/python,/usr/bin/env python3,' "$ss"
+ done
+
chown -R root:root ${D}
}
@@ -249,7 +258,7 @@ do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
FILES_${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}"
FILES_${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*"
-RDEPENDS_${PN} = "bc python flex bison ${TCLIBC}-utils"
+RDEPENDS_${PN} = "bc python3 flex bison ${TCLIBC}-utils"
# 4.15+ needs these next two RDEPENDS
RDEPENDS_${PN} += "openssl-dev util-linux"
# and x86 needs a bit more for 4.15+
--
2.19.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 4/8] kernel-devsrc: remove python2 dependency
2019-08-28 19:28 ` [PATCH 4/8] kernel-devsrc: remove python2 dependency bruce.ashfield
@ 2019-08-28 20:05 ` Adrian Bunk
2019-08-28 20:11 ` Bruce Ashfield
2019-08-28 20:12 ` richard.purdie
0 siblings, 2 replies; 30+ messages in thread
From: Adrian Bunk @ 2019-08-28 20:05 UTC (permalink / raw)
To: bruce.ashfield; +Cc: openembedded-core
On Wed, Aug 28, 2019 at 03:28:38PM -0400, bruce.ashfield@gmail.com wrote:
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>
> Witht the approaching EOL of python2, the kernel packages need to
> be updated to depend on python3.
>...
Yocto 3.0 ships and supports Python 2.7, so there is no urgent need for
last-minute Python 2 -> 3 changes.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 4/8] kernel-devsrc: remove python2 dependency
2019-08-28 20:05 ` Adrian Bunk
@ 2019-08-28 20:11 ` Bruce Ashfield
2019-08-28 21:58 ` Adrian Bunk
2019-08-28 20:12 ` richard.purdie
1 sibling, 1 reply; 30+ messages in thread
From: Bruce Ashfield @ 2019-08-28 20:11 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Patches and discussions about the oe-core layer
On Wed, Aug 28, 2019 at 4:05 PM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Wed, Aug 28, 2019 at 03:28:38PM -0400, bruce.ashfield@gmail.com wrote:
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > Witht the approaching EOL of python2, the kernel packages need to
> > be updated to depend on python3.
> >...
>
> Yocto 3.0 ships and supports Python 2.7, so there is no urgent need for
> last-minute Python 2 -> 3 changes.
Actually, there is.
This was discussed in detail on the yocto dev call, Richard is waiting
for these changes. In particular, since the support window for this
release goes out past the EOL, and one of the stretch goals was a
python2 free image. There's zero risk to these, and no reason to sit
on them.
Bruce
>
> cu
> Adrian
>
> --
>
> "Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
> "Only a promise," Lao Er said.
> Pearl S. Buck - Dragon Seed
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/8] kernel-devsrc: remove python2 dependency
2019-08-28 20:11 ` Bruce Ashfield
@ 2019-08-28 21:58 ` Adrian Bunk
2019-08-28 22:06 ` Bruce Ashfield
0 siblings, 1 reply; 30+ messages in thread
From: Adrian Bunk @ 2019-08-28 21:58 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
On Wed, Aug 28, 2019 at 04:11:43PM -0400, Bruce Ashfield wrote:
>...
> There's zero risk to these, and no reason to sit on them.
What range of LTS kernels is covered by the "zero risk"?
> Bruce
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 4/8] kernel-devsrc: remove python2 dependency
2019-08-28 21:58 ` Adrian Bunk
@ 2019-08-28 22:06 ` Bruce Ashfield
2019-08-29 6:31 ` Adrian Bunk
0 siblings, 1 reply; 30+ messages in thread
From: Bruce Ashfield @ 2019-08-28 22:06 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Patches and discussions about the oe-core layer
On Wed, Aug 28, 2019 at 5:58 PM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Wed, Aug 28, 2019 at 04:11:43PM -0400, Bruce Ashfield wrote:
> >...
> > There's zero risk to these, and no reason to sit on them.
>
> What range of LTS kernels is covered by the "zero risk"?
It has nothing to do with LTS kernels.
Cheers,
Bruce
>
> > Bruce
>
> cu
> Adrian
>
> --
>
> "Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
> "Only a promise," Lao Er said.
> Pearl S. Buck - Dragon Seed
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/8] kernel-devsrc: remove python2 dependency
2019-08-28 22:06 ` Bruce Ashfield
@ 2019-08-29 6:31 ` Adrian Bunk
2019-08-29 12:23 ` Bruce Ashfield
0 siblings, 1 reply; 30+ messages in thread
From: Adrian Bunk @ 2019-08-29 6:31 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
On Wed, Aug 28, 2019 at 06:06:04PM -0400, Bruce Ashfield wrote:
> On Wed, Aug 28, 2019 at 5:58 PM Adrian Bunk <bunk@stusta.de> wrote:
> >
> > On Wed, Aug 28, 2019 at 04:11:43PM -0400, Bruce Ashfield wrote:
> > >...
> > > There's zero risk to these, and no reason to sit on them.
> >
> > What range of LTS kernels is covered by the "zero risk"?
>
> It has nothing to do with LTS kernels.
virtual/kernel is special since real products have this provided by
a BSP layer instead of using the kernels for the reference platforms
that ship with Yocto.
How do your changes interact with a BSP layer that provides
the upstream maintained LTS kernel 4.4?
> Cheers,
>
> Bruce
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 4/8] kernel-devsrc: remove python2 dependency
2019-08-29 6:31 ` Adrian Bunk
@ 2019-08-29 12:23 ` Bruce Ashfield
2019-08-29 12:53 ` Adrian Bunk
0 siblings, 1 reply; 30+ messages in thread
From: Bruce Ashfield @ 2019-08-29 12:23 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Patches and discussions about the oe-core layer
On Thu, Aug 29, 2019 at 2:32 AM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Wed, Aug 28, 2019 at 06:06:04PM -0400, Bruce Ashfield wrote:
> > On Wed, Aug 28, 2019 at 5:58 PM Adrian Bunk <bunk@stusta.de> wrote:
> > >
> > > On Wed, Aug 28, 2019 at 04:11:43PM -0400, Bruce Ashfield wrote:
> > > >...
> > > > There's zero risk to these, and no reason to sit on them.
> > >
> > > What range of LTS kernels is covered by the "zero risk"?
> >
> > It has nothing to do with LTS kernels.
>
> virtual/kernel is special since real products have this provided by
> a BSP layer instead of using the kernels for the reference platforms
> that ship with Yocto.
I'm quite aware of what virtual/kernel is, and how it is used.
>
> How do your changes interact with a BSP layer that provides
> the upstream maintained LTS kernel 4.4?
As mentioned in other parts of the threads, we test against the
reference kernel's in master. Other versions can either bbappend, or
send patches. That's unfortunately how it has to be.
Cheers,
Bruce
>
> > Cheers,
> >
> > Bruce
>
> cu
> Adrian
>
> --
>
> "Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
> "Only a promise," Lao Er said.
> Pearl S. Buck - Dragon Seed
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/8] kernel-devsrc: remove python2 dependency
2019-08-29 12:23 ` Bruce Ashfield
@ 2019-08-29 12:53 ` Adrian Bunk
2019-08-29 13:00 ` Alexander Kanavin
0 siblings, 1 reply; 30+ messages in thread
From: Adrian Bunk @ 2019-08-29 12:53 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
On Thu, Aug 29, 2019 at 08:23:58AM -0400, Bruce Ashfield wrote:
> On Thu, Aug 29, 2019 at 2:32 AM Adrian Bunk <bunk@stusta.de> wrote:
> >
> > On Wed, Aug 28, 2019 at 06:06:04PM -0400, Bruce Ashfield wrote:
> > > On Wed, Aug 28, 2019 at 5:58 PM Adrian Bunk <bunk@stusta.de> wrote:
> > > >
> > > > On Wed, Aug 28, 2019 at 04:11:43PM -0400, Bruce Ashfield wrote:
> > > > >...
> > > > > There's zero risk to these, and no reason to sit on them.
> > > >
> > > > What range of LTS kernels is covered by the "zero risk"?
> > >
> > > It has nothing to do with LTS kernels.
>...
> > How do your changes interact with a BSP layer that provides
> > the upstream maintained LTS kernel 4.4?
>
> As mentioned in other parts of the threads, we test against the
> reference kernel's in master. Other versions can either bbappend, or
> send patches. That's unfortunately how it has to be.
It is an unexpected meaning of "zero risk" when this excludes
breakages with kernels other than the ones in master.
One of the non-python changes to perf blew up the build for me even when
trying with a kernel that is only a few months behind on the 4.19 branch,
so there's some patches for me to send next month.
> Cheers,
>
> Bruce
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/8] kernel-devsrc: remove python2 dependency
2019-08-28 20:05 ` Adrian Bunk
2019-08-28 20:11 ` Bruce Ashfield
@ 2019-08-28 20:12 ` richard.purdie
2019-08-28 20:57 ` Alexander Kanavin
1 sibling, 1 reply; 30+ messages in thread
From: richard.purdie @ 2019-08-28 20:12 UTC (permalink / raw)
To: Adrian Bunk, bruce.ashfield; +Cc: openembedded-core
On Wed, 2019-08-28 at 23:05 +0300, Adrian Bunk wrote:
> On Wed, Aug 28, 2019 at 03:28:38PM -0400, bruce.ashfield@gmail.com
> wrote:
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > Witht the approaching EOL of python2, the kernel packages need to
> > be updated to depend on python3.
> > ...
>
> Yocto 3.0 ships and supports Python 2.7, so there is no urgent need
> for
> last-minute Python 2 -> 3 changes.
Removal of 2.X dependencies where we can was an objective of 3.0 and
2.X is EOL and will expire in the lifetime of 3.0. I'd say this is
therefore quite in keeping with that...
Cheers,
Richard
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/8] kernel-devsrc: remove python2 dependency
2019-08-28 20:12 ` richard.purdie
@ 2019-08-28 20:57 ` Alexander Kanavin
0 siblings, 0 replies; 30+ messages in thread
From: Alexander Kanavin @ 2019-08-28 20:57 UTC (permalink / raw)
To: Richard Purdie; +Cc: OE-core, Adrian Bunk
[-- Attachment #1: Type: text/plain, Size: 779 bytes --]
On Wed, 28 Aug 2019 at 22:12, <richard.purdie@linuxfoundation.org> wrote:
> > Yocto 3.0 ships and supports Python 2.7, so there is no urgent need
> > for
> > last-minute Python 2 -> 3 changes.
>
> Removal of 2.X dependencies where we can was an objective of 3.0 and
> 2.X is EOL and will expire in the lifetime of 3.0. I'd say this is
> therefore quite in keeping with that...
>
I just sent the ltp patch, the last remaining target piece. What remains is
eliminating the undercover usage of host python2 at build time (I am now
running test builds to determine what needs fixing), and then dropping py2
from self-hosted packagegroup and HOSTTOOLS. Once we're there, we can
remove py2 recipes from oe-core (which will probably happen after 3.0 is
out).
Alex
[-- Attachment #2: Type: text/html, Size: 1145 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 5/8] perf: change dependencies on python to python3
2019-08-28 19:28 [PATCH 0/8] kernel/kernel-yocto: consolidated M3 feature pull request bruce.ashfield
` (3 preceding siblings ...)
2019-08-28 19:28 ` [PATCH 4/8] kernel-devsrc: remove python2 dependency bruce.ashfield
@ 2019-08-28 19:28 ` bruce.ashfield
2019-08-29 0:01 ` Mittal, Anuj
2019-08-28 19:28 ` [PATCH 6/8] perf: v5.3+ build fixes bruce.ashfield
` (3 subsequent siblings)
8 siblings, 1 reply; 30+ messages in thread
From: bruce.ashfield @ 2019-08-28 19:28 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
The upstream kernel can now handle python3 for the perf scripts, coupled
with the impending EOL of python2, we switch the dependencies in perf
(scripting) to python3.
Outside of dependency changes, we also pass the following two variables
to the perf build: PYTHON=python3 PYTHON_CONFIG=python3-config. To
ensure that our python3 components are used.
For configurations that disable perf scripting, there is no change in
behaviour.
[YOCTO #13358]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/perf/perf.bb | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 4e603f1a32..8ac8e7c308 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -13,7 +13,7 @@ PR = "r9"
PACKAGECONFIG ??= "scripting tui libunwind"
PACKAGECONFIG[dwarf] = ",NO_DWARF=1"
-PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python"
+PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl python3"
# gui support was added with kernel 3.6.35
# since 3.10 libnewt was replaced by slang
# to cover a wide range of kernel we add both dependencies
@@ -44,8 +44,8 @@ PROVIDES = "virtual/perf"
inherit linux-kernel-base kernel-arch manpages
# needed for building the tools/perf Python bindings
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'pythonnative', '', d)}
-inherit python-dir
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'python3native', '', d)}
+inherit python3-dir
export PYTHON_SITEPACKAGES_DIR
#kernel 3.1+ supports WERROR to disable warnings as errors
@@ -94,6 +94,7 @@ EXTRA_OEMAKE += "\
'sharedir=${@os.path.relpath(datadir, prefix)}' \
'mandir=${@os.path.relpath(mandir, prefix)}' \
'infodir=${@os.path.relpath(infodir, prefix)}' \
+ ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'PYTHON=python3 PYTHON_CONFIG=python3-config', '', d)} \
"
# During do_configure, we might run a 'make clean'. That often breaks
@@ -132,7 +133,7 @@ do_install() {
oe_runmake install
# we are checking for this make target to be compatible with older perf versions
if ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'true', 'false', d)} && grep -q install-python_ext ${S}/tools/perf/Makefile*; then
- oe_runmake DESTDIR=${D} install-python_ext
+ oe_runmake DESTDIR=${D} install-python_ext
fi
}
@@ -233,7 +234,8 @@ do_configure_prepend () {
# use /usr/bin/env instead of version specific python
for s in `find ${S}/tools/perf/scripts/python/ -name '*.py'`; do
- sed -i 's,/usr/bin/python2,/usr/bin/env python,' "${s}"
+ sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}"
+ sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}"
done
# unistd.h can be out of sync between libc-headers and the captured version in the perf source
@@ -252,9 +254,9 @@ PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
RDEPENDS_${PN} += "elfutils bash"
RDEPENDS_${PN}-archive =+ "bash"
-RDEPENDS_${PN}-python =+ "bash python python-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}"
+RDEPENDS_${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python3', '', d)}"
RDEPENDS_${PN}-perl =+ "bash perl perl-modules"
-RDEPENDS_${PN}-tests =+ "python"
+RDEPENDS_${PN}-tests =+ "python3"
RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}-perl ${PN}-python', '',d)}"
RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
--
2.19.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 5/8] perf: change dependencies on python to python3
2019-08-28 19:28 ` [PATCH 5/8] perf: change dependencies on python to python3 bruce.ashfield
@ 2019-08-29 0:01 ` Mittal, Anuj
2019-08-29 0:13 ` Bruce Ashfield
0 siblings, 1 reply; 30+ messages in thread
From: Mittal, Anuj @ 2019-08-29 0:01 UTC (permalink / raw)
To: richard.purdie@linuxfoundation.org, bruce.ashfield@gmail.com
Cc: openembedded-core@lists.openembedded.org
This is causing failure for 5.0 kernels probably because the attr.py
python -> python3 changes are not there ...
ERROR: perf-1.0-r9 do_package_qa: QA Issue: /usr/libexec/perf-
core/tests/attr.py contained in package perf-tests requires
/usr/bin/python, but no providers found in RDEPENDS_perf-tests? [file-
rdeps]
ERROR: perf-1.0-r9 do_package_qa: QA run found fatal errors. Please
consider fixing them.
ERROR: Logfile of failure stored in: /home/pokybuild/yocto-
worker/genericx86/build/build/tmp/work/genericx86-poky-linux/perf/1.0-
r9/temp/log.do_package_qa.36284
NOTE: recipe perf-1.0-r9: task do_package_qa: Failed
https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/975/steps/8/logs/step1b
Thanks,
Anuj
On Wed, 2019-08-28 at 15:28 -0400, bruce.ashfield@gmail.com wrote:
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>
> The upstream kernel can now handle python3 for the perf scripts,
> coupled
> with the impending EOL of python2, we switch the dependencies in perf
> (scripting) to python3.
>
> Outside of dependency changes, we also pass the following two
> variables
> to the perf build: PYTHON=python3 PYTHON_CONFIG=python3-config. To
> ensure that our python3 components are used.
>
> For configurations that disable perf scripting, there is no change in
> behaviour.
>
> [YOCTO #13358]
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ---
> meta/recipes-kernel/perf/perf.bb | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-
> kernel/perf/perf.bb
> index 4e603f1a32..8ac8e7c308 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -13,7 +13,7 @@ PR = "r9"
>
> PACKAGECONFIG ??= "scripting tui libunwind"
> PACKAGECONFIG[dwarf] = ",NO_DWARF=1"
> -PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl
> python"
> +PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl
> python3"
> # gui support was added with kernel 3.6.35
> # since 3.10 libnewt was replaced by slang
> # to cover a wide range of kernel we add both dependencies
> @@ -44,8 +44,8 @@ PROVIDES = "virtual/perf"
> inherit linux-kernel-base kernel-arch manpages
>
> # needed for building the tools/perf Python bindings
> -inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting',
> 'pythonnative', '', d)}
> -inherit python-dir
> +inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting',
> 'python3native', '', d)}
> +inherit python3-dir
> export PYTHON_SITEPACKAGES_DIR
>
> #kernel 3.1+ supports WERROR to disable warnings as errors
> @@ -94,6 +94,7 @@ EXTRA_OEMAKE += "\
> 'sharedir=${@os.path.relpath(datadir, prefix)}' \
> 'mandir=${@os.path.relpath(mandir, prefix)}' \
> 'infodir=${@os.path.relpath(infodir, prefix)}' \
> + ${@bb.utils.contains('PACKAGECONFIG', 'scripting',
> 'PYTHON=python3 PYTHON_CONFIG=python3-config', '', d)} \
> "
>
> # During do_configure, we might run a 'make clean'. That often
> breaks
> @@ -132,7 +133,7 @@ do_install() {
> oe_runmake install
> # we are checking for this make target to be compatible with
> older perf versions
> if ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'true',
> 'false', d)} && grep -q install-python_ext ${S}/tools/perf/Makefile*;
> then
> - oe_runmake DESTDIR=${D} install-python_ext
> + oe_runmake DESTDIR=${D} install-python_ext
> fi
> }
>
> @@ -233,7 +234,8 @@ do_configure_prepend () {
>
> # use /usr/bin/env instead of version specific python
> for s in `find ${S}/tools/perf/scripts/python/ -name '*.py'`; do
> - sed -i 's,/usr/bin/python2,/usr/bin/env python,' "${s}"
> + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}"
> + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}"
> done
>
> # unistd.h can be out of sync between libc-headers and the
> captured version in the perf source
> @@ -252,9 +254,9 @@ PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl
> ${PN}-python"
>
> RDEPENDS_${PN} += "elfutils bash"
> RDEPENDS_${PN}-archive =+ "bash"
> -RDEPENDS_${PN}-python =+ "bash python python-modules
> ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '',
> d)}"
> +RDEPENDS_${PN}-python =+ "bash python3 python3-modules
> ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python3', '',
> d)}"
> RDEPENDS_${PN}-perl =+ "bash perl perl-modules"
> -RDEPENDS_${PN}-tests =+ "python"
> +RDEPENDS_${PN}-tests =+ "python3"
>
> RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG',
> 'scripting', '${PN}-perl ${PN}-python', '',d)}"
> RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests
> ${RSUGGESTS_SCRIPTING}"
> --
> 2.19.1
>
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 5/8] perf: change dependencies on python to python3
2019-08-29 0:01 ` Mittal, Anuj
@ 2019-08-29 0:13 ` Bruce Ashfield
2019-08-29 0:18 ` Mittal, Anuj
0 siblings, 1 reply; 30+ messages in thread
From: Bruce Ashfield @ 2019-08-29 0:13 UTC (permalink / raw)
To: Mittal, Anuj; +Cc: openembedded-core@lists.openembedded.org
On Wed, Aug 28, 2019 at 8:01 PM Mittal, Anuj <anuj.mittal@intel.com> wrote:
>
> This is causing failure for 5.0 kernels probably because the attr.py
> python -> python3 changes are not there ...
>
> ERROR: perf-1.0-r9 do_package_qa: QA Issue: /usr/libexec/perf-
> core/tests/attr.py contained in package perf-tests requires
> /usr/bin/python, but no providers found in RDEPENDS_perf-tests? [file-
> rdeps]
> ERROR: perf-1.0-r9 do_package_qa: QA run found fatal errors. Please
> consider fixing them.
> ERROR: Logfile of failure stored in: /home/pokybuild/yocto-
> worker/genericx86/build/build/tmp/work/genericx86-poky-linux/perf/1.0-
> r9/temp/log.do_package_qa.36284
> NOTE: recipe perf-1.0-r9: task do_package_qa: Failed
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/975/steps/8/logs/step1b
unfortunately, I can only cover the active kernels in master with any
certainty, and I already have a patch to drop 5.0, so I didn't trigger
this.
I can spin a patch for 5.0 and make sure it is version proofed a ibt,
but if anyone else has issues with <insert version here>, they'll need
to send their own patch.
Bruce
>
> Thanks,
>
> Anuj
>
> On Wed, 2019-08-28 at 15:28 -0400, bruce.ashfield@gmail.com wrote:
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > The upstream kernel can now handle python3 for the perf scripts,
> > coupled
> > with the impending EOL of python2, we switch the dependencies in perf
> > (scripting) to python3.
> >
> > Outside of dependency changes, we also pass the following two
> > variables
> > to the perf build: PYTHON=python3 PYTHON_CONFIG=python3-config. To
> > ensure that our python3 components are used.
> >
> > For configurations that disable perf scripting, there is no change in
> > behaviour.
> >
> > [YOCTO #13358]
> >
> > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > ---
> > meta/recipes-kernel/perf/perf.bb | 16 +++++++++-------
> > 1 file changed, 9 insertions(+), 7 deletions(-)
> >
> > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-
> > kernel/perf/perf.bb
> > index 4e603f1a32..8ac8e7c308 100644
> > --- a/meta/recipes-kernel/perf/perf.bb
> > +++ b/meta/recipes-kernel/perf/perf.bb
> > @@ -13,7 +13,7 @@ PR = "r9"
> >
> > PACKAGECONFIG ??= "scripting tui libunwind"
> > PACKAGECONFIG[dwarf] = ",NO_DWARF=1"
> > -PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl
> > python"
> > +PACKAGECONFIG[scripting] = ",NO_LIBPERL=1 NO_LIBPYTHON=1,perl
> > python3"
> > # gui support was added with kernel 3.6.35
> > # since 3.10 libnewt was replaced by slang
> > # to cover a wide range of kernel we add both dependencies
> > @@ -44,8 +44,8 @@ PROVIDES = "virtual/perf"
> > inherit linux-kernel-base kernel-arch manpages
> >
> > # needed for building the tools/perf Python bindings
> > -inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting',
> > 'pythonnative', '', d)}
> > -inherit python-dir
> > +inherit ${@bb.utils.contains('PACKAGECONFIG', 'scripting',
> > 'python3native', '', d)}
> > +inherit python3-dir
> > export PYTHON_SITEPACKAGES_DIR
> >
> > #kernel 3.1+ supports WERROR to disable warnings as errors
> > @@ -94,6 +94,7 @@ EXTRA_OEMAKE += "\
> > 'sharedir=${@os.path.relpath(datadir, prefix)}' \
> > 'mandir=${@os.path.relpath(mandir, prefix)}' \
> > 'infodir=${@os.path.relpath(infodir, prefix)}' \
> > + ${@bb.utils.contains('PACKAGECONFIG', 'scripting',
> > 'PYTHON=python3 PYTHON_CONFIG=python3-config', '', d)} \
> > "
> >
> > # During do_configure, we might run a 'make clean'. That often
> > breaks
> > @@ -132,7 +133,7 @@ do_install() {
> > oe_runmake install
> > # we are checking for this make target to be compatible with
> > older perf versions
> > if ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'true',
> > 'false', d)} && grep -q install-python_ext ${S}/tools/perf/Makefile*;
> > then
> > - oe_runmake DESTDIR=${D} install-python_ext
> > + oe_runmake DESTDIR=${D} install-python_ext
> > fi
> > }
> >
> > @@ -233,7 +234,8 @@ do_configure_prepend () {
> >
> > # use /usr/bin/env instead of version specific python
> > for s in `find ${S}/tools/perf/scripts/python/ -name '*.py'`; do
> > - sed -i 's,/usr/bin/python2,/usr/bin/env python,' "${s}"
> > + sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}"
> > + sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}"
> > done
> >
> > # unistd.h can be out of sync between libc-headers and the
> > captured version in the perf source
> > @@ -252,9 +254,9 @@ PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl
> > ${PN}-python"
> >
> > RDEPENDS_${PN} += "elfutils bash"
> > RDEPENDS_${PN}-archive =+ "bash"
> > -RDEPENDS_${PN}-python =+ "bash python python-modules
> > ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '',
> > d)}"
> > +RDEPENDS_${PN}-python =+ "bash python3 python3-modules
> > ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python3', '',
> > d)}"
> > RDEPENDS_${PN}-perl =+ "bash perl perl-modules"
> > -RDEPENDS_${PN}-tests =+ "python"
> > +RDEPENDS_${PN}-tests =+ "python3"
> >
> > RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG',
> > 'scripting', '${PN}-perl ${PN}-python', '',d)}"
> > RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests
> > ${RSUGGESTS_SCRIPTING}"
> > --
> > 2.19.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
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 5/8] perf: change dependencies on python to python3
2019-08-29 0:13 ` Bruce Ashfield
@ 2019-08-29 0:18 ` Mittal, Anuj
2019-08-29 0:24 ` Bruce Ashfield
0 siblings, 1 reply; 30+ messages in thread
From: Mittal, Anuj @ 2019-08-29 0:18 UTC (permalink / raw)
To: bruce.ashfield@gmail.com; +Cc: openembedded-core@lists.openembedded.org
On Wed, 2019-08-28 at 20:13 -0400, Bruce Ashfield wrote:
> > On Wed, Aug 28, 2019 at 8:01 PM Mittal, Anuj <anuj.mittal@intel.com>
> wrote:
> This is causing failure for 5.0 kernels probably because the attr.py
> > python -> python3 changes are not there ...
> >
> > ERROR: perf-1.0-r9 do_package_qa: QA Issue: /usr/libexec/perf-
> > core/tests/attr.py contained in package perf-tests requires
> > /usr/bin/python, but no providers found in RDEPENDS_perf-tests?
> > [file-
> > rdeps]
> > ERROR: perf-1.0-r9 do_package_qa: QA run found fatal errors. Please
> > consider fixing them.
> > ERROR: Logfile of failure stored in: /home/pokybuild/yocto-
> > worker/genericx86/build/build/tmp/work/genericx86-poky-
> > linux/perf/1.0-
> > r9/temp/log.do_package_qa.36284
> > NOTE: recipe perf-1.0-r9: task do_package_qa: Failed
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/975/steps/8/logs/step1b
> ote:
unfortunately, I can only cover the active kernels in master with any
certainty, and I already have a patch to drop 5.0, so I didn't
> trigger
this.
I can spin a patch for 5.0 and make sure it is version proofed a ibt,
but if anyone else has issues with <insert version here>, they'll
> need
> >
> unfortunately, I can only cover the active kernels in master with any
Can we cover at least the kernels in OE-Core master right now affected
by this change? So 4.19 as well ...
Thanks,
Anuj
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 5/8] perf: change dependencies on python to python3
2019-08-29 0:18 ` Mittal, Anuj
@ 2019-08-29 0:24 ` Bruce Ashfield
2019-08-29 0:27 ` Bruce Ashfield
0 siblings, 1 reply; 30+ messages in thread
From: Bruce Ashfield @ 2019-08-29 0:24 UTC (permalink / raw)
To: Mittal, Anuj; +Cc: openembedded-core@lists.openembedded.org
On Wed, Aug 28, 2019 at 8:18 PM Mittal, Anuj <anuj.mittal@intel.com> wrote:
>
> On Wed, 2019-08-28 at 20:13 -0400, Bruce Ashfield wrote:
> > > On Wed, Aug 28, 2019 at 8:01 PM Mittal, Anuj <anuj.mittal@intel.com>
> > wrote:
> > This is causing failure for 5.0 kernels probably because the attr.py
> > > python -> python3 changes are not there ...
> > >
> > > ERROR: perf-1.0-r9 do_package_qa: QA Issue: /usr/libexec/perf-
> > > core/tests/attr.py contained in package perf-tests requires
> > > /usr/bin/python, but no providers found in RDEPENDS_perf-tests?
> > > [file-
> > > rdeps]
> > > ERROR: perf-1.0-r9 do_package_qa: QA run found fatal errors. Please
> > > consider fixing them.
> > > ERROR: Logfile of failure stored in: /home/pokybuild/yocto-
> > > worker/genericx86/build/build/tmp/work/genericx86-poky-
> > > linux/perf/1.0-
> > > r9/temp/log.do_package_qa.36284
> > > NOTE: recipe perf-1.0-r9: task do_package_qa: Failed
> > >
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/975/steps/8/logs/step1b
> > ote:
> unfortunately, I can only cover the active kernels in master with any
> certainty, and I already have a patch to drop 5.0, so I didn't
> > trigger
> this.
> I can spin a patch for 5.0 and make sure it is version proofed a ibt,
> but if anyone else has issues with <insert version here>, they'll
> > need
> > >
> > unfortunately, I can only cover the active kernels in master with any
>
> Can we cover at least the kernels in OE-Core master right now affected
> by this change? So 4.19 as well ...
Consider 5.0 to be not there. It is going to be deleted in about a
day. My hands are very full, so I'm not able to spend much time on it
at the moment.
4.19 did work in my earlier testing, but I will have a look ASAP
(probably next week, since my cycles are largely spoken for at the
moment).
Bruce
>
> Thanks,
>
> Anuj
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 5/8] perf: change dependencies on python to python3
2019-08-29 0:24 ` Bruce Ashfield
@ 2019-08-29 0:27 ` Bruce Ashfield
2019-08-29 1:08 ` Bruce Ashfield
0 siblings, 1 reply; 30+ messages in thread
From: Bruce Ashfield @ 2019-08-29 0:27 UTC (permalink / raw)
To: Mittal, Anuj; +Cc: openembedded-core@lists.openembedded.org
On Wed, Aug 28, 2019 at 8:24 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Wed, Aug 28, 2019 at 8:18 PM Mittal, Anuj <anuj.mittal@intel.com> wrote:
> >
> > On Wed, 2019-08-28 at 20:13 -0400, Bruce Ashfield wrote:
> > > > On Wed, Aug 28, 2019 at 8:01 PM Mittal, Anuj <anuj.mittal@intel.com>
> > > wrote:
> > > This is causing failure for 5.0 kernels probably because the attr.py
> > > > python -> python3 changes are not there ...
> > > >
> > > > ERROR: perf-1.0-r9 do_package_qa: QA Issue: /usr/libexec/perf-
> > > > core/tests/attr.py contained in package perf-tests requires
> > > > /usr/bin/python, but no providers found in RDEPENDS_perf-tests?
> > > > [file-
> > > > rdeps]
> > > > ERROR: perf-1.0-r9 do_package_qa: QA run found fatal errors. Please
> > > > consider fixing them.
> > > > ERROR: Logfile of failure stored in: /home/pokybuild/yocto-
> > > > worker/genericx86/build/build/tmp/work/genericx86-poky-
> > > > linux/perf/1.0-
> > > > r9/temp/log.do_package_qa.36284
> > > > NOTE: recipe perf-1.0-r9: task do_package_qa: Failed
> > > >
> > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/975/steps/8/logs/step1b
> > > ote:
> > unfortunately, I can only cover the active kernels in master with any
> > certainty, and I already have a patch to drop 5.0, so I didn't
> > > trigger
> > this.
> > I can spin a patch for 5.0 and make sure it is version proofed a ibt,
> > but if anyone else has issues with <insert version here>, they'll
> > > need
> > > >
> > > unfortunately, I can only cover the active kernels in master with any
> >
> > Can we cover at least the kernels in OE-Core master right now affected
> > by this change? So 4.19 as well ...
>
> Consider 5.0 to be not there. It is going to be deleted in about a
> day. My hands are very full, so I'm not able to spend much time on it
> at the moment.
>
> 4.19 did work in my earlier testing, but I will have a look ASAP
> (probably next week, since my cycles are largely spoken for at the
> moment).
.. but I will visually check 4.19 for any other scripts that reference
just 'python' visually and make sure my tests are broad enough. It is
more builder and boot cycles that I don't have easily accessible. It
shouldn't be too hard to make the fixes generic and broad enough to
cover it.
Bruce
>
> Bruce
>
> >
> > Thanks,
> >
> > Anuj
>
>
>
> --
> - 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
^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 5/8] perf: change dependencies on python to python3
2019-08-29 0:27 ` Bruce Ashfield
@ 2019-08-29 1:08 ` Bruce Ashfield
0 siblings, 0 replies; 30+ messages in thread
From: Bruce Ashfield @ 2019-08-29 1:08 UTC (permalink / raw)
To: Mittal, Anuj; +Cc: openembedded-core@lists.openembedded.org
On Wed, Aug 28, 2019 at 8:27 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Wed, Aug 28, 2019 at 8:24 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> >
> > On Wed, Aug 28, 2019 at 8:18 PM Mittal, Anuj <anuj.mittal@intel.com> wrote:
> > >
> > > On Wed, 2019-08-28 at 20:13 -0400, Bruce Ashfield wrote:
> > > > > On Wed, Aug 28, 2019 at 8:01 PM Mittal, Anuj <anuj.mittal@intel.com>
> > > > wrote:
> > > > This is causing failure for 5.0 kernels probably because the attr.py
> > > > > python -> python3 changes are not there ...
> > > > >
> > > > > ERROR: perf-1.0-r9 do_package_qa: QA Issue: /usr/libexec/perf-
> > > > > core/tests/attr.py contained in package perf-tests requires
> > > > > /usr/bin/python, but no providers found in RDEPENDS_perf-tests?
> > > > > [file-
> > > > > rdeps]
> > > > > ERROR: perf-1.0-r9 do_package_qa: QA run found fatal errors. Please
> > > > > consider fixing them.
> > > > > ERROR: Logfile of failure stored in: /home/pokybuild/yocto-
> > > > > worker/genericx86/build/build/tmp/work/genericx86-poky-
> > > > > linux/perf/1.0-
> > > > > r9/temp/log.do_package_qa.36284
> > > > > NOTE: recipe perf-1.0-r9: task do_package_qa: Failed
> > > > >
> > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/975/steps/8/logs/step1b
> > > > ote:
> > > unfortunately, I can only cover the active kernels in master with any
> > > certainty, and I already have a patch to drop 5.0, so I didn't
> > > > trigger
> > > this.
> > > I can spin a patch for 5.0 and make sure it is version proofed a ibt,
> > > but if anyone else has issues with <insert version here>, they'll
> > > > need
> > > > >
> > > > unfortunately, I can only cover the active kernels in master with any
> > >
> > > Can we cover at least the kernels in OE-Core master right now affected
> > > by this change? So 4.19 as well ...
> >
> > Consider 5.0 to be not there. It is going to be deleted in about a
> > day. My hands are very full, so I'm not able to spend much time on it
> > at the moment.
> >
> > 4.19 did work in my earlier testing, but I will have a look ASAP
> > (probably next week, since my cycles are largely spoken for at the
> > moment).
>
> .. but I will visually check 4.19 for any other scripts that reference
> just 'python' visually and make sure my tests are broad enough. It is
> more builder and boot cycles that I don't have easily accessible. It
> shouldn't be too hard to make the fixes generic and broad enough to
> cover it.
I retract that statement. I was able to jiggle things and testing on
4.19 is no big deal. I'll send a v2 that covers 4.19/5.0/5.2/5.3-rc
testing shortly.
Bruce
>
> Bruce
>
> >
> > Bruce
> >
> > >
> > > Thanks,
> > >
> > > Anuj
> >
> >
> >
> > --
> > - 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
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 6/8] perf: v5.3+ build fixes
2019-08-28 19:28 [PATCH 0/8] kernel/kernel-yocto: consolidated M3 feature pull request bruce.ashfield
` (4 preceding siblings ...)
2019-08-28 19:28 ` [PATCH 5/8] perf: change dependencies on python to python3 bruce.ashfield
@ 2019-08-28 19:28 ` bruce.ashfield
2019-08-29 0:32 ` Bruce Ashfield
2019-08-28 19:28 ` [PATCH 7/8] devsrc: update arm64 scripts/prepare for kernels 5.3+ bruce.ashfield
` (2 subsequent siblings)
8 siblings, 1 reply; 30+ messages in thread
From: bruce.ashfield @ 2019-08-28 19:28 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
In the 5.3+ perf builds, there are multiple unistd.h files that need
to be kept in sync. So not only do we update one, we update both to
ensure that libc-headers and the perf build are in sync.
perf checks some key files itself to be sure they are in sync, and
bits.h can be out of sync. There's no build error that results with
bits.h at the moment, but we still make sure they are in sync to
avoid the configure/compile warning.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/perf/perf.bb | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 8ac8e7c308..58543c73d8 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -241,6 +241,10 @@ do_configure_prepend () {
# unistd.h can be out of sync between libc-headers and the captured version in the perf source
# so we copy it from the sysroot unistd.h to the perf unistd.h
install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
+ install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h
+
+ # bits.h can have the same issuen as unistd.h, so we make the tools variant take precedence
+ install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h
}
python do_package_prepend() {
--
2.19.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH 6/8] perf: v5.3+ build fixes
2019-08-28 19:28 ` [PATCH 6/8] perf: v5.3+ build fixes bruce.ashfield
@ 2019-08-29 0:32 ` Bruce Ashfield
2019-08-29 1:45 ` Bruce Ashfield
0 siblings, 1 reply; 30+ messages in thread
From: Bruce Ashfield @ 2019-08-29 0:32 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Wed, Aug 28, 2019 at 3:28 PM <bruce.ashfield@gmail.com> wrote:
>
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
>
> In the 5.3+ perf builds, there are multiple unistd.h files that need
> to be kept in sync. So not only do we update one, we update both to
> ensure that libc-headers and the perf build are in sync.
>
> perf checks some key files itself to be sure they are in sync, and
> bits.h can be out of sync. There's no build error that results with
> bits.h at the moment, but we still make sure they are in sync to
> avoid the configure/compile warning.
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ---
> meta/recipes-kernel/perf/perf.bb | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> index 8ac8e7c308..58543c73d8 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -241,6 +241,10 @@ do_configure_prepend () {
> # unistd.h can be out of sync between libc-headers and the captured version in the perf source
> # so we copy it from the sysroot unistd.h to the perf unistd.h
> install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
> + install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h
> +
I just realized this may not be safe across all the kernel versions.
I'll submit a new version (if required), after I've tested my python3
changes to perf.
Cheers,
Bruce
> + # bits.h can have the same issuen as unistd.h, so we make the tools variant take precedence
> + install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h
> }
>
> python do_package_prepend() {
> --
> 2.19.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
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH 6/8] perf: v5.3+ build fixes
2019-08-29 0:32 ` Bruce Ashfield
@ 2019-08-29 1:45 ` Bruce Ashfield
0 siblings, 0 replies; 30+ messages in thread
From: Bruce Ashfield @ 2019-08-29 1:45 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Wed, Aug 28, 2019 at 8:32 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Wed, Aug 28, 2019 at 3:28 PM <bruce.ashfield@gmail.com> wrote:
> >
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> >
> > In the 5.3+ perf builds, there are multiple unistd.h files that need
> > to be kept in sync. So not only do we update one, we update both to
> > ensure that libc-headers and the perf build are in sync.
> >
> > perf checks some key files itself to be sure they are in sync, and
> > bits.h can be out of sync. There's no build error that results with
> > bits.h at the moment, but we still make sure they are in sync to
> > avoid the configure/compile warning.
> >
> > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> > ---
> > meta/recipes-kernel/perf/perf.bb | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> > index 8ac8e7c308..58543c73d8 100644
> > --- a/meta/recipes-kernel/perf/perf.bb
> > +++ b/meta/recipes-kernel/perf/perf.bb
> > @@ -241,6 +241,10 @@ do_configure_prepend () {
> > # unistd.h can be out of sync between libc-headers and the captured version in the perf source
> > # so we copy it from the sysroot unistd.h to the perf unistd.h
> > install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h
> > + install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h
> > +
>
> I just realized this may not be safe across all the kernel versions.
> I'll submit a new version (if required), after I've tested my python3
> changes to perf.
I've tested this across 4.19 -> 5.3 and didn't find any issues. So it
should be safe and I won't send a v2.
Bruce
>
> Cheers,
>
> Bruce
>
> > + # bits.h can have the same issuen as unistd.h, so we make the tools variant take precedence
> > + install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h
> > }
> >
> > python do_package_prepend() {
> > --
> > 2.19.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
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH 7/8] devsrc: update arm64 scripts/prepare for kernels 5.3+
2019-08-28 19:28 [PATCH 0/8] kernel/kernel-yocto: consolidated M3 feature pull request bruce.ashfield
` (5 preceding siblings ...)
2019-08-28 19:28 ` [PATCH 6/8] perf: v5.3+ build fixes bruce.ashfield
@ 2019-08-28 19:28 ` bruce.ashfield
2019-08-28 19:28 ` [PATCH 8/8] qemu: bump linux-yocto preferred version to 5.2 bruce.ashfield
2019-08-28 19:33 ` ✗ patchtest: failure for kernel/kernel-yocto: consolidated M3 feature pull request Patchwork
8 siblings, 0 replies; 30+ messages in thread
From: bruce.ashfield @ 2019-08-28 19:28 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
We need to include a few more small files for on target module
builds for 5.3+ kernels.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/recipes-kernel/linux/kernel-devsrc.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index e17c0ea0ab..b68d945a8f 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -141,7 +141,7 @@ do_install() {
# arch/arm64/include/asm/opcodes.h references arch/arm
cp -a --parents arch/arm/include/asm/opcodes.h $kerneldir/build/
- cp -a --parents arch/arm64/kernel/vdso/gettimeofday.S $kerneldir/build/
+ cp -a --parents arch/arm64/kernel/vdso/*gettimeofday.* $kerneldir/build/
cp -a --parents arch/arm64/kernel/vdso/sigreturn.S $kerneldir/build/
cp -a --parents arch/arm64/kernel/vdso/note.S $kerneldir/build/
cp -a --parents arch/arm64/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/
@@ -179,6 +179,8 @@ do_install() {
cp -a include $kerneldir/build
+ cp -a --parents lib/vdso/* $kerneldir/build/ 2>/dev/null || :
+
cp -a --parents tools/include/tools/le_byteshift.h $kerneldir/build/
cp -a --parents tools/include/tools/be_byteshift.h $kerneldir/build/
--
2.19.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH 8/8] qemu: bump linux-yocto preferred version to 5.2
2019-08-28 19:28 [PATCH 0/8] kernel/kernel-yocto: consolidated M3 feature pull request bruce.ashfield
` (6 preceding siblings ...)
2019-08-28 19:28 ` [PATCH 7/8] devsrc: update arm64 scripts/prepare for kernels 5.3+ bruce.ashfield
@ 2019-08-28 19:28 ` bruce.ashfield
2019-08-28 19:33 ` ✗ patchtest: failure for kernel/kernel-yocto: consolidated M3 feature pull request Patchwork
8 siblings, 0 replies; 30+ messages in thread
From: bruce.ashfield @ 2019-08-28 19:28 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/conf/machine/include/x86-base.inc | 2 +-
meta/conf/machine/qemuarmv5.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc
index 686f938233..0227f3c289 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0"
# kernel-related variables
#
PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ??= "5.0%"
+PREFERRED_VERSION_linux-yocto ??= "5.2%"
#
# XSERVER subcomponents, used to build the XSERVER variable
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf
index 1c21d3342d..fb4789fdac 100644
--- a/meta/conf/machine/qemuarmv5.conf
+++ b/meta/conf/machine/qemuarmv5.conf
@@ -17,7 +17,7 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet"
# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0"
-PREFERRED_VERSION_linux-yocto ??= "5.0%"
+PREFERRED_VERSION_linux-yocto ??= "5.2%"
QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"
KMACHINE_qemuarmv5 = "qemuarm"
--
2.19.1
^ permalink raw reply related [flat|nested] 30+ messages in thread* ✗ patchtest: failure for kernel/kernel-yocto: consolidated M3 feature pull request
2019-08-28 19:28 [PATCH 0/8] kernel/kernel-yocto: consolidated M3 feature pull request bruce.ashfield
` (7 preceding siblings ...)
2019-08-28 19:28 ` [PATCH 8/8] qemu: bump linux-yocto preferred version to 5.2 bruce.ashfield
@ 2019-08-28 19:33 ` Patchwork
8 siblings, 0 replies; 30+ messages in thread
From: Patchwork @ 2019-08-28 19:33 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: openembedded-core
== Series Details ==
Series: kernel/kernel-yocto: consolidated M3 feature pull request
Revision: 1
URL : https://patchwork.openembedded.org/series/19543/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format]
Suggested fix Add Upstream-Status: <Valid status> to the header of meta/recipes-kernel/linux/files/0001-foo.patch
Standard format Upstream-Status: <Valid status>
Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 30+ messages in thread