From 38f3bb5fd7702a74ee5eb16ee59c6d8221aed452 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 20 Jul 2024 22:16:57 +0200 Subject: [PATCH] configs/beaglebone_qt5: move patches to beaglebone-qt5 folder Compared to the beaglebone_defconfig, updating the Linux kernel for beaglebone_qt5 is more tricky because it may also involve updating the ti-sgx-{km,um} packages. Therefore, it is unlikely that the two configurations can share the same software versions for the Linux kernel, and consequently a single path for the patches. For this reason, and with the foresight of adding the hash files for the beaglebone_defconfig as well, the hash files and patches are moved to a separate board/beagleboard/beaglebone-qt5/patches/ directory. This way, future conflicts in managing the patches for the two configurations (i.e., beaglebone[_qt5]_defconfig) are avoided. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 +- .../patches/linux-headers/linux-headers.hash | 0 .../patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch | 0 ...2-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch | 0 ...03-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch | 0 .../linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch | 0 .../{beaglebone => beaglebone-qt5}/patches/linux/linux.hash | 0 .../{beaglebone => beaglebone-qt5}/patches/uboot/uboot.hash | 0 configs/beaglebone_qt5_defconfig | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux-headers/linux-headers.hash (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/linux/linux.hash (100%) rename board/beagleboard/{beaglebone => beaglebone-qt5}/patches/uboot/uboot.hash (100%) diff --git a/.checkpackageignore b/.checkpackageignore index b10a277eae..b488a05902 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -8,7 +8,7 @@ board/arcturus/aarch64-ucls1012a/post-image.sh Shellcheck board/aspeed/common/post-image.sh Shellcheck board/asus/tinker/post-build.sh Shellcheck board/atmel/flasher.sh Shellcheck -board/beagleboard/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch lib_patch.Upstream +board/beagleboard/beaglebone-qt5/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch lib_patch.Upstream board/beagleboard/beaglebone/post-build.sh Shellcheck board/beagleboard/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch lib_patch.Upstream board/beagleboard/beagleboneai/post-build.sh Shellcheck diff --git a/board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash b/board/beagleboard/beaglebone-qt5/patches/linux-headers/linux-headers.hash similarity index 100% rename from board/beagleboard/beaglebone/patches/linux-headers/linux-headers.hash rename to board/beagleboard/beaglebone-qt5/patches/linux-headers/linux-headers.hash diff --git a/board/beagleboard/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch b/board/beagleboard/beaglebone-qt5/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch similarity index 100% rename from board/beagleboard/beaglebone/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch rename to board/beagleboard/beaglebone-qt5/patches/linux/0001-keep-jtag-clock-alive-for-debugger.patch diff --git a/board/beagleboard/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/board/beagleboard/beaglebone-qt5/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch similarity index 100% rename from board/beagleboard/beaglebone/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch rename to board/beagleboard/beaglebone-qt5/patches/linux/0002-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch diff --git a/board/beagleboard/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch b/board/beagleboard/beaglebone-qt5/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch similarity index 100% rename from board/beagleboard/beaglebone/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch rename to board/beagleboard/beaglebone-qt5/patches/linux/0003-ata-ahci-Match-EM_MAX_SLOTS-with-SATA_PMP_MAX_PORTS.patch diff --git a/board/beagleboard/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch b/board/beagleboard/beaglebone-qt5/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch similarity index 100% rename from board/beagleboard/beaglebone/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch rename to board/beagleboard/beaglebone-qt5/patches/linux/0004-ata-ahci-fix-enum-constants-for-gcc-13.patch diff --git a/board/beagleboard/beaglebone/patches/linux/linux.hash b/board/beagleboard/beaglebone-qt5/patches/linux/linux.hash similarity index 100% rename from board/beagleboard/beaglebone/patches/linux/linux.hash rename to board/beagleboard/beaglebone-qt5/patches/linux/linux.hash diff --git a/board/beagleboard/beaglebone/patches/uboot/uboot.hash b/board/beagleboard/beaglebone-qt5/patches/uboot/uboot.hash similarity index 100% rename from board/beagleboard/beaglebone/patches/uboot/uboot.hash rename to board/beagleboard/beaglebone-qt5/patches/uboot/uboot.hash diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index e58255a108..4121065ee3 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a8=y -BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone/patches" +BR2_GLOBAL_PATCH_DIR="board/beagleboard/beaglebone-qt5/patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y