mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
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:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user