Skip to contentSkip to conversation

CI: remove master refspec for meta-virtualization yml file

PATCH Applied Jon Mason 2 participants 4 messages Aug 14, 2023

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/3 CI: remove master refspec for meta-virtualization yml file

---
 ci/meta-virtualization.yml | 1 -
 1 file changed, 1 deletion(-)
ci/meta-virtualization.yml +0 -1
index 8791fc3b..1cd0e21a 100644
@@ -6,4 +6,3 @@ header:
 repos:
   meta-virtualization:
     url: git://git.yoctoproject.org/meta-virtualization
-    refspec: master
Signature · 1 line
2.30.2
author
#1 lore raw

PATCH 2/3 arm/linux-yocto: move 6.1 patches to a unique bbappend

Move the 3 patches only needed by the 6.1 kernel into a unique bbappend The defconfig changes cannot be moved into a config fragment because they only exist in the defconfig file (because the patches that integrated their functionality into the kernel were not merged).

---
 meta-arm/recipes-kernel/linux/linux-yocto%.bbappend        | 6 ------
 meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend | 6 ++++++
 meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend    | 6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend
 create mode 100644 meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend
meta-arm/recipes-kernel/linux/linux-yocto%.bbappend +0 -6
index 883ed2ca..0a42ce4a 100644
@@ -1,11 +1,5 @@
 ARMFILESPATHS := "${THISDIR}/files:"
 
-FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
-SRC_URI:append:aarch64 = " \
-    file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \
-    file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \
-    "
-
 COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64"
 FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}"
 SRC_URI:append:generic-arm64 = " \
meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend new file +6 -0
new file mode 100644
index 00000000..e6d50a4b
@@ -0,0 +1,6 @@
+
+FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
+SRC_URI:append:aarch64 = " \
+    file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \
+    file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \
+    "
meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend new file +6 -0
new file mode 100644
index 00000000..e6d50a4b
@@ -0,0 +1,6 @@
+
+FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}"
+SRC_URI:append:aarch64 = " \
+    file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \
+    file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \
+    "
Signature · 1 line
2.30.2
author
#2 lore raw

PATCH 3/3 arm/recipes-kernel: Add preempt-rt support for generic-arm64

In reply to Jon Mason

From: Robbie Cao <[email protected]>

Add kernel configuration necessary to build an image with preempt-rt support for generic-arm64.

And tweak kernel configuration for preempt-rt kernel.

---
 .../generic-arm64-preempt-rt-tweaks.cfg                    | 4 ++++
 .../files/generic-arm64-kmeta/generic-arm64-preempt-rt.scc | 7 +++++++
 2 files changed, 11 insertions(+)
 create mode 100644 meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt-tweaks.cfg
 create mode 100644 meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt.scc
meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt-tweaks.cfg new file +4 -0
new file mode 100644
index 00000000..84e0dd71
@@ -0,0 +1,4 @@
+# These configurations have a dependency on !PREEMPT_RT. Set them to `n` to
+# avoid complain when do_kernel_configcheck.
+CONFIG_LEDS_TRIGGER_CPU=n
+CONFIG_TRANSPARENT_HUGEPAGE=n
meta-arm/recipes-kernel/linux/files/generic-arm64-kmeta/generic-arm64-preempt-rt.scc new file +7 -0
new file mode 100644
index 00000000..ae97c2e2
@@ -0,0 +1,7 @@
+define KMACHINE generic-arm64
+define KTYPE preempt-rt
+define KARCH arm64
+
+kconf hardware generic-arm64-preempt-rt-tweaks.cfg
+include ktypes/preempt-rt/preempt-rt.scc
+include features/bluetooth/bluetooth.scc
Signature · 1 line
2.30.2
Applied
#3 lore raw
In reply to Jon Mason
Quoted 1 line · Jon Mason

Applied, thanks!

[1/3] CI: remove master refspec for meta-virtualization yml file
(no commit info)
[2/3] arm/linux-yocto: move 6.1 patches to a unique bbappend
(no commit info)
[3/3] arm/recipes-kernel: Add preempt-rt support for generic-arm64

      commit: 992c07f7c030caf0c52665cfbd2a30899bba7015

Best regards,

Signature · 1 line
Jon Mason <[email protected]>