JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

bsp-cli/bsp-desktop: hashing fixes

Browse Source 
- both artifacts use functions in the bsp/utils-bsp.sh file, which wasn't being hashed
- bsp-cli hashed non-existent 'packages/bsp-cli' directory, remove
- bsp-cli: be verbose when rsync'ing `packages/bsp/common`
- force sync in a few strategic spots
- utils-bsp.sh: be verbose when copying files (incl `config/optional` stuff)
This commit is contained in:
Ricardo Pardini
2024-06-30 12:28:34 +02:00
committed by Igor
parent d27b98d78b
commit c5697cf62a
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/functions/artifacts/artifact-armbian-bsp-cli.sh
View File

@@ -70,7 +70,6 @@ function artifact_armbian-bsp-cli_prepare_version() {
declare -a dirs_to_hash=(
"${SRC}/packages/bsp/common" # common stuff
"${SRC}/packages/bsp-cli"
"${SRC}/config/optional/_any_board/_packages/bsp-cli"
"${SRC}/config/optional/architectures/${ARCH}/_packages/bsp-cli"
"${SRC}/config/optional/families/${LINUXFAMILY}/_packages/bsp-cli"
@@ -83,7 +82,7 @@ function artifact_armbian-bsp-cli_prepare_version() {
# get the hashes of the lib/ bash sources involved...
declare hash_files="undetermined"
calculate_hash_for_bash_deb_artifact "bsp/armbian-bsp-cli-deb.sh"
calculate_hash_for_bash_deb_artifact "bsp/armbian-bsp-cli-deb.sh" "bsp/utils-bsp.sh"
declare bash_hash="${hash_files}"
declare bash_hash_short="${bash_hash:0:${short_hash_size}}"

2
lib/functions/artifacts/artifact-armbian-bsp-desktop.sh
View File

@@ -37,7 +37,7 @@ function artifact_armbian-bsp-desktop_prepare_version() {
# get the hashes of the lib/ bash sources involved...
declare hash_files="undetermined"
calculate_hash_for_bash_deb_artifact "bsp/armbian-bsp-desktop-deb.sh"
calculate_hash_for_bash_deb_artifact "bsp/armbian-bsp-desktop-deb.sh" "bsp/utils-bsp.sh"
declare bash_hash="${hash_files}"
declare bash_hash_short="${bash_hash:0:${short_hash_size}}"

6
lib/functions/bsp/armbian-bsp-cli-deb.sh
View File

@@ -119,7 +119,9 @@ function compile_armbian-bsp-cli() {
# copy common files from a premade directory structure
# @TODO this includes systemd config, assumes things about serial console, etc, that need dynamism or just to not exist with modern systemd
run_host_command_logged rsync -a "${SRC}"/packages/bsp/common/* "${destination}"
display_alert "Copying common bsp files" "packages/bsp/common" "info"
run_host_command_logged rsync -av "${SRC}"/packages/bsp/common/* "${destination}"
wait_for_disk_sync "after rsync'ing package/bsp/common for bsp-cli"
mkdir -p "${destination}"/usr/share/armbian/
@@ -242,7 +244,7 @@ function reversion_armbian-bsp-cli_deb_contents() {
depends_base_files=""
fi
cat <<- EOF >> "${control_file_new}"
Depends: bash, linux-base, u-boot-tools, initramfs-tools, lsb-release, fping${depends_base_files}, device-tree-compiler
Depends: bash, linux-base, u-boot-tools, initramfs-tools, lsb-release, fping, device-tree-compiler${depends_base_files}
Replaces: zram-config, armbian-bsp-cli-${BOARD}${EXTRA_BSP_NAME} (<< ${REVISION})
Breaks: armbian-bsp-cli-${BOARD}${EXTRA_BSP_NAME} (<< ${REVISION})
EOF

5
lib/functions/bsp/utils-bsp.sh
View File

@@ -25,10 +25,11 @@ copy_all_packages_files_for() {
for package_src_dir in ${PACKAGES_SEARCH_ROOT_ABSOLUTE_DIRS}; do
local package_dirpath="${package_src_dir}/${package_name}"
if [ -d "${package_dirpath}" ]; then
display_alert "Adding found files" "${package_dirpath} for '${package_name}'" "debug"
run_host_command_logged cp -r "${package_dirpath}/"* "${destination}/"
display_alert "Adding found files" "${package_dirpath} for '${package_name}'" "info"
run_host_command_logged cp -rv "${package_dirpath}/"* "${destination}/"
else
display_alert "No files found in" "${package_dirpath} for '${package_name}'" "debug"
fi
wait_for_disk_sync "after copying ${package_src_dir} files for ${package_name} package"
done
}