From 5736661c3c9b9758943583ae3e71aefb9537169f Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Tue, 7 May 2024 18:46:59 +0300 Subject: [PATCH] bsp: linux-lmp: simplify patches versioning Use newly presented KSHORT_VER to simplify versioning of the same patches applied to different kernel versions. Signed-off-by: Oleksandr Suvorov --- meta-lmp-bsp/recipes-kernel/linux/linux-lmp_%.bbappend | 5 +++++ meta-lmp-bsp/recipes-kernel/linux/linux-lmp_6.1.bbappend | 5 ----- meta-lmp-bsp/recipes-kernel/linux/linux-lmp_6.6.bbappend | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) create mode 100644 meta-lmp-bsp/recipes-kernel/linux/linux-lmp_%.bbappend delete mode 100644 meta-lmp-bsp/recipes-kernel/linux/linux-lmp_6.1.bbappend delete mode 100644 meta-lmp-bsp/recipes-kernel/linux/linux-lmp_6.6.bbappend diff --git a/meta-lmp-bsp/recipes-kernel/linux/linux-lmp_%.bbappend b/meta-lmp-bsp/recipes-kernel/linux/linux-lmp_%.bbappend new file mode 100644 index 0000000000..18b64b0d4b --- /dev/null +++ b/meta-lmp-bsp/recipes-kernel/linux/linux-lmp_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${KSHORT_VER}:${THISDIR}/${PN}:" + +SRC_URI:append:stm32mp15-disco = " \ + ${@bb.utils.contains('MACHINE_FEATURES', 'se05x', "file://0001-FIO-internal-arch-arm-dts-stm32mp157c-dk2-enable-I2C.patch", '', d)} \ +" diff --git a/meta-lmp-bsp/recipes-kernel/linux/linux-lmp_6.1.bbappend b/meta-lmp-bsp/recipes-kernel/linux/linux-lmp_6.1.bbappend deleted file mode 100644 index 87095cb47a..0000000000 --- a/meta-lmp-bsp/recipes-kernel/linux/linux-lmp_6.1.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI:append:stm32mp15-disco = " \ - ${@bb.utils.contains('MACHINE_FEATURES', 'se05x', 'file://6.1/0001-FIO-internal-arch-arm-dts-stm32mp157c-dk2-enable-I2C.patch', '', d)} \ -" diff --git a/meta-lmp-bsp/recipes-kernel/linux/linux-lmp_6.6.bbappend b/meta-lmp-bsp/recipes-kernel/linux/linux-lmp_6.6.bbappend deleted file mode 100644 index 2887c41b1b..0000000000 --- a/meta-lmp-bsp/recipes-kernel/linux/linux-lmp_6.6.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI:append:stm32mp15-disco = " \ - ${@bb.utils.contains('MACHINE_FEATURES', 'se05x', 'file://6.6/0001-FIO-internal-arch-arm-dts-stm32mp157c-dk2-enable-I2C.patch', '', d)} \ -"