meson-{sm1|g12a|g12b}: default, but don't override, ASOUND_STATE; this way board-specific asound.state's are honored

- add logging during actual deployment so we know what is happening
This commit is contained in:
Ricardo Pardini
2023-06-24 17:55:55 +02:00
parent 81125507f9
commit 8b0fb1537b
4 changed files with 7 additions and 4 deletions

View File

@@ -7,7 +7,7 @@
# https://github.com/armbian/build/
#
source "${BASH_SOURCE%/*}/include/meson64_common.inc"
ASOUND_STATE="asound.state.meson64"
ASOUND_STATE="${ASOUND_STATE:-"asound.state.meson64"}"
CPUMIN=1000000
CPUMAX=1800000

View File

@@ -7,7 +7,7 @@
# https://github.com/armbian/build/
#
source "${BASH_SOURCE%/*}/include/meson64_common.inc"
ASOUND_STATE="asound.state.meson64"
ASOUND_STATE="${ASOUND_STATE:-"asound.state.meson64"}"
# Mainline u-boot, everything is done by meson64_common.inc, we just need to handle FIP blobs

View File

@@ -7,7 +7,7 @@
# https://github.com/armbian/build/
#
source "${BASH_SOURCE%/*}/include/meson64_common.inc"
ASOUND_STATE="asound.state.meson64"
ASOUND_STATE="${ASOUND_STATE:-"asound.state.meson64"}"
CPUMIN=667000
CPUMAX=2100000
GOVERNOR=ondemand

View File

@@ -507,7 +507,10 @@ function install_distribution_agnostic() {
# install initial asound.state if defined
mkdir -p "${SDCARD}"/var/lib/alsa/
[[ -n $ASOUND_STATE ]] && cp "${SRC}/packages/blobs/asound.state/${ASOUND_STATE}" "${SDCARD}"/var/lib/alsa/asound.state
if [[ -n ${ASOUND_STATE} ]]; then
display_alert "Installing initial asound.state" "${ASOUND_STATE} for board ${BOARD}" "info"
run_host_command_logged cp -v "${SRC}/packages/blobs/asound.state/${ASOUND_STATE}" "${SDCARD}"/var/lib/alsa/asound.state
fi
# save initial armbian-release state
cp "${SDCARD}"/etc/armbian-release "${SDCARD}"/etc/armbian-image-release