Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH In review [email protected] 2 participants 6 messages Mar 1, 2019

lore
Share & tools
lore
#0 lore raw

cover linux-yocto: consolidated pull request

From: Bruce Ashfield <[email protected]>

Hi all,

Here's my latest consolidated pull request.

These two changes are routine cleanups/tidying of configs that are no longer valid in the supported kernels:

linux-yocto: netfilter: Enable CONFIG_NETFILTER_XT_TARGET_LOG linux-yocto/4.19: configuration cleanups

This change are the integration of the qemuarm* graphics support from John Mason, along with a change that I made to map qemuarm -> qemuarma15 for the 4.19 kernel. This KMACHINE mapping allows us to test the switch to qemuarma15 as the default quemuarm without impacting any other branches or users of the 4.19 linux-yocto kernel.

linux-yocto: qemuarm|qemuarm64: graphics support

And finally, we have an objtool -> kernel shared dir fix that was posted some time ago, and has recently been reported as breaking exernal module builds.

kernel: add objtool to shared workdir when CONFIG_UNWINDER_ORC is set

I grabbed the change, tweaked it a bit and it tests fine here, so I've included it in my series.

Cheers,

Bruce

The following changes since commit 4d275d97b6c572fe11668ac16d2c77c018340c7c:

perl: apply a native-only patch only to -native (2019-02-28 17:49:40 +0000)

are available in the Git repository at:

git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (3):
linux-yocto: netfilter: Enable CONFIG_NETFILTER_XT_TARGET_LOG linux-yocto/4.19: configuration cleanups
linux-yocto: qemuarm|qemuarm64: graphics support

Justin Bronder (1):
kernel: add objtool to shared workdir when CONFIG_UNWINDER_ORC is set

 meta/classes/kernel.bbclass                        | 9 +++++++++
 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.19.bb      | 5 ++++-
 4 files changed, 15 insertions(+), 3 deletions(-)
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/4 linux-yocto: netfilter: Enable CONFIG_NETFILTER_XT_TARGET_LOG

From: Bruce Ashfield <[email protected]>

[
In order for logging to work, as for example seen with the default configuration of 'ufw' we need to have logging support enabled. This is currently gated on the CONFIG_NETFILTER_XT_TARGET_LOG option, so enable it here.

Fixes f56608b405f0 ("meta: cleanup invalid/obselete 3.4 CONFIG options")

]

---
 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.19.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +1 -1
index 345073bceb..328cd2ac12 100644
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "3059029718900250904b9f587e37ba22fb949ea6"
-SRCREV_meta ?= "8d7d003531151ba0a0e0cdb3cefa0bf9b0e84b55"
+SRCREV_meta ?= "83d017da0cc6c84b0167eafcf2811d0717c35b86"
 
 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-4.19;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +1 -1
index df8ecb6cee..b52c82d569 100644
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine_qemuarm ?= "6cc861e796ab19a6827cf9996e7755f1875d553e"
 SRCREV_machine ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
-SRCREV_meta ?= "8d7d003531151ba0a0e0cdb3cefa0bf9b0e84b55"
+SRCREV_meta ?= "83d017da0cc6c84b0167eafcf2811d0717c35b86"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_4.19.bb +1 -1
index 48949d3f9b..bfc9285ccd 100644
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
 SRCREV_machine_qemux86-64 ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
 SRCREV_machine_qemumips64 ?= "fc7a2bf24e0e39b6a260f8650a3c8d497b8cdcfd"
 SRCREV_machine ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
-SRCREV_meta ?= "8d7d003531151ba0a0e0cdb3cefa0bf9b0e84b55"
+SRCREV_meta ?= "83d017da0cc6c84b0167eafcf2811d0717c35b86"
 
 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-4.19;destsuffix=${KMETA}"
Signature · 1 line
2.19.1
#2 lore raw

PATCH 2/4 linux-yocto/4.19: configuration cleanups

In reply to [email protected]

From: Bruce Ashfield <[email protected]>

Integrating the following configuration tweaks (which were already on yocto-4.18):

9bddc4aa1eb bsp/intel-x86: Rename CONFIG_R8723BE to CONFIG_RTL8723BE 6504b0ed616 features: drop the obsolete kernel option 5d18756a7fc features/hostapd: drop obsolete configs bdf91f835b9 bsp/intel-x86: Drop configs that has been removed by kernel 0f8bb536c22 intel-x86: Drop configs which are not defined in kernel

---
 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.19.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +1 -1
index 328cd2ac12..18f84827fd 100644
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "3059029718900250904b9f587e37ba22fb949ea6"
-SRCREV_meta ?= "83d017da0cc6c84b0167eafcf2811d0717c35b86"
+SRCREV_meta ?= "17912f45855984e53a3416a88699c9f0f2233972"
 
 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-4.19;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +1 -1
index b52c82d569..8efa9cbe3e 100644
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine_qemuarm ?= "6cc861e796ab19a6827cf9996e7755f1875d553e"
 SRCREV_machine ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
-SRCREV_meta ?= "83d017da0cc6c84b0167eafcf2811d0717c35b86"
+SRCREV_meta ?= "17912f45855984e53a3416a88699c9f0f2233972"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_4.19.bb +1 -1
index bfc9285ccd..9e29379a73 100644
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
 SRCREV_machine_qemux86-64 ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
 SRCREV_machine_qemumips64 ?= "fc7a2bf24e0e39b6a260f8650a3c8d497b8cdcfd"
 SRCREV_machine ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
-SRCREV_meta ?= "83d017da0cc6c84b0167eafcf2811d0717c35b86"
+SRCREV_meta ?= "17912f45855984e53a3416a88699c9f0f2233972"
 
 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-4.19;destsuffix=${KMETA}"
Signature · 1 line
2.19.1
#3 lore raw

PATCH 3/4 linux-yocto: qemuarm|qemuarm64: graphics support

In reply to [email protected]

From: Bruce Ashfield <[email protected]>

Integrating the configuration changes from Jon Mason <[email protected]> to enable graphics for qemuarm/qemuarm64.

Note: we are also remapping qemuarm to qemuarma15 in the 4.19 kernel
as part of this graphics enablement.

Note2: This requires the machine/configuration changes also sent by
John to have working graphics.

---
 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.19.bb      | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +1 -1
index 18f84827fd..07dc5b77a1 100644
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "3059029718900250904b9f587e37ba22fb949ea6"
-SRCREV_meta ?= "17912f45855984e53a3416a88699c9f0f2233972"
+SRCREV_meta ?= "41fe45f7c5e69f6ec26c657fea16c459544042cf"
 
 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-4.19;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +1 -1
index 8efa9cbe3e..c6d1594a82 100644
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine_qemuarm ?= "6cc861e796ab19a6827cf9996e7755f1875d553e"
 SRCREV_machine ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
-SRCREV_meta ?= "17912f45855984e53a3416a88699c9f0f2233972"
+SRCREV_meta ?= "41fe45f7c5e69f6ec26c657fea16c459544042cf"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_4.19.bb +4 -1
index 9e29379a73..5a64e1babe 100644
@@ -19,7 +19,10 @@ SRCREV_machine_qemux86 ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
 SRCREV_machine_qemux86-64 ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
 SRCREV_machine_qemumips64 ?= "fc7a2bf24e0e39b6a260f8650a3c8d497b8cdcfd"
 SRCREV_machine ?= "11e0e616ed095bb8012e1b4a231254c9656a0193"
-SRCREV_meta ?= "17912f45855984e53a3416a88699c9f0f2233972"
+SRCREV_meta ?= "41fe45f7c5e69f6ec26c657fea16c459544042cf"
+
+# remap qemuarm to qemuarma15 for the 4.19 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-4.19;destsuffix=${KMETA}"
Signature · 1 line
2.19.1
#5 lore raw

PATCH 4/4 kernel: add objtool to shared workdir when CONFIG_UNWINDER_ORC is set

In reply to [email protected]

From: Justin Bronder <[email protected]>

Based on: https://patchwork.openembedded.org/patch/148047/

When x86_64 enables CONFIG_UNWINDER_ORC [ORC (Oops Rewind Capability) unwinder for unwinding kernel stack traces], objtool is required to generate the required information.

If we don't copy objtool to the shared workdir, out-of-tree modules cannot generate object files.

For instance, meta-skeleton/hello-mod fails with:
| make[3]: *** No rule to make target 'tools/objtool/objtool', needed by ...

---
 meta/classes/kernel.bbclass | 9 +++++++++
 1 file changed, 9 insertions(+)
meta/classes/kernel.bbclass +9 -0
index a5b1df1b0d..9da9818962 100644
@@ -487,6 +487,15 @@ do_shared_workdir () {
 		mkdir -p $kerneldir/arch/${ARCH}/include/generated/
 		cp -fR arch/${ARCH}/include/generated/* $kerneldir/arch/${ARCH}/include/generated/
 	fi
+
+	if (grep -q -i -e '^CONFIG_UNWINDER_ORC=y$' $kerneldir/.config); then
+		# With CONFIG_UNWINDER_ORC (the default in 4.14), objtool is required for
+		# out-of-tree modules to be able to generate object files.
+		if [ -x tools/objtool/objtool ]; then
+			mkdir -p ${kerneldir}/tools/objtool
+			cp tools/objtool/objtool ${kerneldir}/tools/objtool/
+		fi
+	fi
 }
 
 # We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware
Signature · 1 line
2.19.1
#4 lore raw

Re: [PATCH 3/4] linux-yocto: qemuarm|qemuarm64: graphics support

In reply to [email protected]
Quoted 12 lines · On Fri, 2019-03-01 at 00:34 -0500, [email protected] wrote:

From: Bruce Ashfield <[email protected]>

Integrating the configuration changes from Jon Mason < [email protected]>
to enable graphics for qemuarm/qemuarm64.

Note: we are also remapping qemuarm to qemuarma15 in the 4.19 kernel
as part of this graphics enablement.

Note2: This requires the machine/configuration changes also sent by
John to have working graphics.

Quoted 6 lines
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.19.bb      | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

I'm testing this minus the KMACHINE piece (commit message suitably adjusted). I'd suggest Jon add in the KMACHINE piece in his qemuarm patch so it becomes a bisectable change.

Thanks!

Ruchard