diff mbox series

[mickledore,2/3] arm/linux-yocto: move 6.1 patches to a unique bbappend

Message ID 20230814175042.3629846-2-jon.mason@arm.com
State New
Headers show
Series [mickledore,1/3] CI: remove master refspec for meta-virtualization yml file | expand

Commit Message

Jon Mason Aug. 14, 2023, 5:50 p.m. UTC 
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).

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 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
diff mbox series

Patch

diff --git a/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
index 883ed2ca..0a42ce4a 100644
--- a/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
+++ b/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend
@@ -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 = " \
diff --git a/meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend
new file mode 100644
index 00000000..e6d50a4b
--- /dev/null
+++ b/meta-arm/recipes-kernel/linux/linux-yocto-rt_6.1%.bbappend
@@ -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 \
+    "
diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend
new file mode 100644
index 00000000..e6d50a4b
--- /dev/null
+++ b/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend
@@ -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 \
+    "