From 85ab7c0c23effb2e0c4ee71afc70814ea17507aa Mon Sep 17 00:00:00 2001 From: unitexe Date: Fri, 3 Apr 2026 08:37:40 -0500 Subject: Whinlatter -> wrynose --- .../layers/meta-freescale-3rdparty/main.yml | 2 +- .../patches/whinlatter/patches.yml | 9 ------ ...ntainer-builddir-change-for-olimex-u-boot.patch | 33 ---------------------- .../patches/whinlatter/quilt/series | 1 - .../patches/wrynose/patches.yml | 9 ++++++ ...ntainer-builddir-change-for-olimex-u-boot.patch | 33 ++++++++++++++++++++++ .../patches/wrynose/quilt/series | 1 + .../layers/meta-freescale-3rdparty/whinlatter.yml | 7 ----- 8 files changed, 44 insertions(+), 51 deletions(-) delete mode 100644 meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/patches.yml delete mode 100644 meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/quilt/follow-imx-boot-container-builddir-change-for-olimex-u-boot.patch delete mode 100644 meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/quilt/series create mode 100644 meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/patches.yml create mode 100644 meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/quilt/follow-imx-boot-container-builddir-change-for-olimex-u-boot.patch create mode 100644 meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/quilt/series delete mode 100644 meta-unit-kas/include/layers/meta-freescale-3rdparty/whinlatter.yml (limited to 'meta-unit-kas/include/layers/meta-freescale-3rdparty') diff --git a/meta-unit-kas/include/layers/meta-freescale-3rdparty/main.yml b/meta-unit-kas/include/layers/meta-freescale-3rdparty/main.yml index d1291c2..df7cdbd 100644 --- a/meta-unit-kas/include/layers/meta-freescale-3rdparty/main.yml +++ b/meta-unit-kas/include/layers/meta-freescale-3rdparty/main.yml @@ -4,4 +4,4 @@ header: repos: meta-freescale-3rdparty: branch: master - commit: ace8c35a7815aea11b36563f5bea6fe5591d0622 + commit: 693bdfd123b98df86735d7419c9a8f9ed55951cf diff --git a/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/patches.yml b/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/patches.yml deleted file mode 100644 index f338177..0000000 --- a/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/patches.yml +++ /dev/null @@ -1,9 +0,0 @@ -header: - version: 20 - -repos: - meta-freescale-3rdparty: - patches: - quilt: - repo: meta-unit - path: meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/quilt/ diff --git a/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/quilt/follow-imx-boot-container-builddir-change-for-olimex-u-boot.patch b/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/quilt/follow-imx-boot-container-builddir-change-for-olimex-u-boot.patch deleted file mode 100644 index 6004fba..0000000 --- a/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/quilt/follow-imx-boot-container-builddir-change-for-olimex-u-boot.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/recipes-bsp/u-boot/u-boot-olimex_2024.04.bb b/recipes-bsp/u-boot/u-boot-olimex_2024.04.bb -index 01c121f..e35fff2 100644 ---- a/recipes-bsp/u-boot/u-boot-olimex_2024.04.bb -+++ b/recipes-bsp/u-boot/u-boot-olimex_2024.04.bb -@@ -25,11 +25,13 @@ do_deploy:append:mx8m-generic-bsp() { - for config in ${UBOOT_MACHINE}; do - i=$(expr $i + 1); - for type in ${UBOOT_CONFIG}; do -+ builddir="${config}-${type}" - j=$(expr $j + 1); - if [ $j -eq $i ] - then -+ builddir="${config}-${type}" - install -d ${DEPLOYDIR}/${BOOT_TOOLS} -- install -m 0644 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type} -+ install -m 0644 ${B}/${builddir}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type} - UBOOT_DTB_NAME_FLAGS="${type}:${UBOOT_DTB_NAME}" - for key_value in ${UBOOT_DTB_NAME_FLAGS}; do - local type_key="${key_value%%:*}" -@@ -39,11 +41,11 @@ do_deploy:append:mx8m-generic-bsp() { - bbnote "UBOOT_CONFIG = $type, UBOOT_DTB_NAME = $dtb_name" - # There is only one ${dtb_name}, the first one. All the other are with the type appended - if [ ! -f "${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}" ]; then -- install -m 0644 ${B}/${config}/arch/arm/dts/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name} -+ install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name} - else - bbwarn "Use custom wks.in for $dtb_name = $type" - fi -- install -m 0644 ${B}/${config}/arch/arm/dts/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type} -+ install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type} - fi - unset type_key - unset dtb_name diff --git a/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/quilt/series b/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/quilt/series deleted file mode 100644 index 3d27041..0000000 --- a/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/whinlatter/quilt/series +++ /dev/null @@ -1 +0,0 @@ -follow-imx-boot-container-builddir-change-for-olimex-u-boot.patch \ No newline at end of file diff --git a/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/patches.yml b/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/patches.yml new file mode 100644 index 0000000..e237eb4 --- /dev/null +++ b/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/patches.yml @@ -0,0 +1,9 @@ +header: + version: 20 + +repos: + meta-freescale-3rdparty: + patches: + quilt: + repo: meta-unit + path: meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/quilt/ diff --git a/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/quilt/follow-imx-boot-container-builddir-change-for-olimex-u-boot.patch b/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/quilt/follow-imx-boot-container-builddir-change-for-olimex-u-boot.patch new file mode 100644 index 0000000..6004fba --- /dev/null +++ b/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/quilt/follow-imx-boot-container-builddir-change-for-olimex-u-boot.patch @@ -0,0 +1,33 @@ +diff --git a/recipes-bsp/u-boot/u-boot-olimex_2024.04.bb b/recipes-bsp/u-boot/u-boot-olimex_2024.04.bb +index 01c121f..e35fff2 100644 +--- a/recipes-bsp/u-boot/u-boot-olimex_2024.04.bb ++++ b/recipes-bsp/u-boot/u-boot-olimex_2024.04.bb +@@ -25,11 +25,13 @@ do_deploy:append:mx8m-generic-bsp() { + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do ++ builddir="${config}-${type}" + j=$(expr $j + 1); + if [ $j -eq $i ] + then ++ builddir="${config}-${type}" + install -d ${DEPLOYDIR}/${BOOT_TOOLS} +- install -m 0644 ${B}/${config}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type} ++ install -m 0644 ${B}/${builddir}/u-boot-nodtb.bin ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${type} + UBOOT_DTB_NAME_FLAGS="${type}:${UBOOT_DTB_NAME}" + for key_value in ${UBOOT_DTB_NAME_FLAGS}; do + local type_key="${key_value%%:*}" +@@ -39,11 +41,11 @@ do_deploy:append:mx8m-generic-bsp() { + bbnote "UBOOT_CONFIG = $type, UBOOT_DTB_NAME = $dtb_name" + # There is only one ${dtb_name}, the first one. All the other are with the type appended + if [ ! -f "${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}" ]; then +- install -m 0644 ${B}/${config}/arch/arm/dts/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name} ++ install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name} + else + bbwarn "Use custom wks.in for $dtb_name = $type" + fi +- install -m 0644 ${B}/${config}/arch/arm/dts/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type} ++ install -m 0644 ${B}/${builddir}/arch/arm/dts/${dtb_name} ${DEPLOYDIR}/${BOOT_TOOLS}/${dtb_name}-${type} + fi + unset type_key + unset dtb_name diff --git a/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/quilt/series b/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/quilt/series new file mode 100644 index 0000000..3d27041 --- /dev/null +++ b/meta-unit-kas/include/layers/meta-freescale-3rdparty/patches/wrynose/quilt/series @@ -0,0 +1 @@ +follow-imx-boot-container-builddir-change-for-olimex-u-boot.patch \ No newline at end of file diff --git a/meta-unit-kas/include/layers/meta-freescale-3rdparty/whinlatter.yml b/meta-unit-kas/include/layers/meta-freescale-3rdparty/whinlatter.yml deleted file mode 100644 index 4cd50c6..0000000 --- a/meta-unit-kas/include/layers/meta-freescale-3rdparty/whinlatter.yml +++ /dev/null @@ -1,7 +0,0 @@ -header: - version: 20 - -repos: - meta-freescale-3rdparty: - branch: whinlatter - commit: b2b1987841018013006f909f817a3e9b034c6227 -- cgit v1.2.3