Skip to content

Commit

Permalink
aml-s9xx-box: move files included in bsp-cli from `packages/bsp/aml-s…
Browse files Browse the repository at this point in the history
…9xx-box` to `config/optional/boards/aml-s9xx-box/_packages/bsp-cli`; fixes armbian#6817

- with this:
  - those files are automatically hashed by the bsp-cli hashing mechanism
  - no need to copy them manually any more
  • Loading branch information
rpardini authored and igorpecovnik committed Jul 1, 2024
1 parent a0bf4c1 commit ffe83ab
Show file tree
Hide file tree
Showing 17 changed files with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions config/boards/aml-s9xx-box.tvb
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
File renamed without changes.

0 comments on commit ffe83ab

Please sign in to comment.