From ffe83ab5e87cf59d8fb03cb38542c60b5b1c384b Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 30 Jun 2024 12:38:14 +0200 Subject: [PATCH] aml-s9xx-box: move files included in bsp-cli from `packages/bsp/aml-s9xx-box` to `config/optional/boards/aml-s9xx-box/_packages/bsp-cli`; fixes #6817 - with this: - those files are automatically hashed by the bsp-cli hashing mechanism - no need to copy them manually any more --- config/boards/aml-s9xx-box.tvb | 13 ++++++------- .../_packages/bsp-cli}/boot/aml_autoscript | Bin .../bsp-cli}/boot/build-u-boot/readme.txt | 0 .../boot/build-u-boot/u-boot-s905x-s912.patch | 0 .../boot/build-u-boot/u-boot-s905x2-s922.patch | 0 .../boot/build-u-boot/u-boot-s905x3-ugoos-x3.patch | 0 .../bsp-cli}/boot/build-u-boot/u-boot-s905x3.patch | 0 .../_packages/bsp-cli}/boot/emmc_autoscript | Bin .../bsp-cli}/boot/extlinux/extlinux.conf.template | 0 .../_packages/bsp-cli}/boot/s905_autoscript | Bin .../_packages/bsp-cli}/boot/u-boot-s905 | Bin .../_packages/bsp-cli}/boot/u-boot-s905x-s912 | Bin .../_packages/bsp-cli}/boot/u-boot-s905x2-s922 | Bin .../_packages/bsp-cli}/boot/u-boot-s905x3 | Bin .../_packages/bsp-cli}/boot/u-boot-s905x3-ugoosx3 | Bin .../_packages/bsp-cli}/root/fstab.template | 0 .../_packages/bsp-cli}/root/install-aml.sh | 0 17 files changed, 6 insertions(+), 7 deletions(-) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/aml_autoscript (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/build-u-boot/readme.txt (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/build-u-boot/u-boot-s905x-s912.patch (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/build-u-boot/u-boot-s905x2-s922.patch (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/build-u-boot/u-boot-s905x3-ugoos-x3.patch (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/build-u-boot/u-boot-s905x3.patch (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/emmc_autoscript (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/extlinux/extlinux.conf.template (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/s905_autoscript (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/u-boot-s905 (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/u-boot-s905x-s912 (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/u-boot-s905x2-s922 (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/u-boot-s905x3 (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/boot/u-boot-s905x3-ugoosx3 (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/root/fstab.template (100%) rename {packages/bsp/aml-s9xx-box => config/optional/boards/aml-s9xx-box/_packages/bsp-cli}/root/install-aml.sh (100%) diff --git a/config/boards/aml-s9xx-box.tvb b/config/boards/aml-s9xx-box.tvb index f5771eb327ba..07b87b616f7d 100644 --- a/config/boards/aml-s9xx-box.tvb +++ b/config/boards/aml-s9xx-box.tvb @@ -23,15 +23,14 @@ function post_family_config__uboot_aml-s9xx-box() { function post_family_tweaks_bsp__config_aml-s9xx-box_bsp() { : "${destination:?destination is not set}" - display_alert "$BOARD" "Installing bsp files" "info" - - # @TODO: rpardini: these files are NOT hashed in the bsp-cli package hash! Anytime there's a change on any of those files, this hook needs to be changed/updated as well, otherwise changes will be ignored - run_host_command_logged cp -rv "${SRC}"/packages/bsp/aml-s9xx-box/boot "${destination}" - run_host_command_logged install -v -D -m 744 "${SRC}"/packages/bsp/aml-s9xx-box/root/install-aml.sh "${destination}"/root/install-aml.sh - run_host_command_logged install -v -m 644 "${SRC}"/packages/bsp/aml-s9xx-box/root/fstab.template "${destination}"/root/fstab.template + # Important: this board has board-specific bsp-cli files in config/optional/boards/aml-s9xx-box/_packages/bsp-cli + # that path is hashed by the bsp-cli hashing function automatically + display_alert "${BOARD}" "Adjusting perms of bsp-cli files for ${BOARD} in /root" "info" + run_host_command_logged chmod -v 744 "${destination}"/root/install-aml.sh + run_host_command_logged chmod -v 644 "${destination}"/root/fstab.template display_alert "${BOARD}" "Removing armbian-install" "info" - rm "${destination}"/usr/sbin/armbian-install + run_host_command_logged rm -v "${destination}"/usr/sbin/armbian-install display_alert "${BOARD}" "Adding bsp-cli preinst logic" "info" # Inline function! So this function is automatically hashed when this hook is hashed. diff --git a/packages/bsp/aml-s9xx-box/boot/aml_autoscript b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/aml_autoscript similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/aml_autoscript rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/aml_autoscript diff --git a/packages/bsp/aml-s9xx-box/boot/build-u-boot/readme.txt b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/build-u-boot/readme.txt similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/build-u-boot/readme.txt rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/build-u-boot/readme.txt diff --git a/packages/bsp/aml-s9xx-box/boot/build-u-boot/u-boot-s905x-s912.patch b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/build-u-boot/u-boot-s905x-s912.patch similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/build-u-boot/u-boot-s905x-s912.patch rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/build-u-boot/u-boot-s905x-s912.patch diff --git a/packages/bsp/aml-s9xx-box/boot/build-u-boot/u-boot-s905x2-s922.patch b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/build-u-boot/u-boot-s905x2-s922.patch similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/build-u-boot/u-boot-s905x2-s922.patch rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/build-u-boot/u-boot-s905x2-s922.patch diff --git a/packages/bsp/aml-s9xx-box/boot/build-u-boot/u-boot-s905x3-ugoos-x3.patch b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/build-u-boot/u-boot-s905x3-ugoos-x3.patch similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/build-u-boot/u-boot-s905x3-ugoos-x3.patch rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/build-u-boot/u-boot-s905x3-ugoos-x3.patch diff --git a/packages/bsp/aml-s9xx-box/boot/build-u-boot/u-boot-s905x3.patch b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/build-u-boot/u-boot-s905x3.patch similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/build-u-boot/u-boot-s905x3.patch rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/build-u-boot/u-boot-s905x3.patch diff --git a/packages/bsp/aml-s9xx-box/boot/emmc_autoscript b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/emmc_autoscript similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/emmc_autoscript rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/emmc_autoscript diff --git a/packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf.template b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/extlinux/extlinux.conf.template similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/extlinux/extlinux.conf.template rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/extlinux/extlinux.conf.template diff --git a/packages/bsp/aml-s9xx-box/boot/s905_autoscript b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/s905_autoscript similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/s905_autoscript rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/s905_autoscript diff --git a/packages/bsp/aml-s9xx-box/boot/u-boot-s905 b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/u-boot-s905 similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/u-boot-s905 rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/u-boot-s905 diff --git a/packages/bsp/aml-s9xx-box/boot/u-boot-s905x-s912 b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/u-boot-s905x-s912 similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/u-boot-s905x-s912 rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/u-boot-s905x-s912 diff --git a/packages/bsp/aml-s9xx-box/boot/u-boot-s905x2-s922 b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/u-boot-s905x2-s922 similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/u-boot-s905x2-s922 rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/u-boot-s905x2-s922 diff --git a/packages/bsp/aml-s9xx-box/boot/u-boot-s905x3 b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/u-boot-s905x3 similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/u-boot-s905x3 rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/u-boot-s905x3 diff --git a/packages/bsp/aml-s9xx-box/boot/u-boot-s905x3-ugoosx3 b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/u-boot-s905x3-ugoosx3 similarity index 100% rename from packages/bsp/aml-s9xx-box/boot/u-boot-s905x3-ugoosx3 rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/boot/u-boot-s905x3-ugoosx3 diff --git a/packages/bsp/aml-s9xx-box/root/fstab.template b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/root/fstab.template similarity index 100% rename from packages/bsp/aml-s9xx-box/root/fstab.template rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/root/fstab.template diff --git a/packages/bsp/aml-s9xx-box/root/install-aml.sh b/config/optional/boards/aml-s9xx-box/_packages/bsp-cli/root/install-aml.sh similarity index 100% rename from packages/bsp/aml-s9xx-box/root/install-aml.sh rename to config/optional/boards/aml-s9xx-box/_packages/bsp-cli/root/install-aml.sh