qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shellfmt: lib/functions; no changes

This commit is contained in:
Ricardo Pardini 2024-11-23 10:36:35 +01:00 committed by Igor
parent 92e4ba979f
commit 6d9a06bf72
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ function artifact_armbian-bsp-cli_prepare_version() {
"INITRD_ARCH: ${INITRD_ARCH}" # /etc/armbian-release
"KERNEL_IMAGE_TYPE: ${KERNEL_IMAGE_TYPE}" # /etc/armbian-release
"VENDOR: ${VENDOR}" # /etc/armbian-release
"OVERLAY_DIR: ${OVERLAY_DIR}" # /etc/armbian-release
"OVERLAY_DIR: ${OVERLAY_DIR}" # /etc/armbian-release
"KERNEL_TARGET: ${KERNEL_TARGET}" # /etc/armbian-release
"KERNEL_TEST_TARGET: ${KERNEL_TEST_TARGET}" # /etc/armbian-release
"BOOT_SOC: ${BOOT_SOC}" # /etc/armbian-release # See https://github.com/armbian/build/pull/6411

2
lib/functions/compilation/kernel-make.sh
View File

@ -53,7 +53,7 @@ function run_kernel_make_internal() {
"ARCH=${ARCHITECTURE}" # Key param. Everything depends on this.
"LOCALVERSION=-${BRANCH}-${LINUXFAMILY}" # Change the internal kernel version to include the family. Changing this causes recompiles # @TODO change hack at .config; that might handles mtime better
"${cc_name}=${CCACHE} ${DISTCC_CROSS_COMPILE_PREFIX[@]} ${KERNEL_COMPILER}" # added as prefix to every compiler invocation by make
"${cc_name}=${CCACHE} ${DISTCC_CROSS_COMPILE_PREFIX[@]} ${KERNEL_COMPILER}" # added as prefix to every compiler invocation by make
"KCFLAGS=-fdiagnostics-color=always -Wno-error=misleading-indentation ${extra_warnings} ${KERNEL_EXTRA_CFLAGS:-""}" # Force GCC colored messages, downgrade misleading indentation to warning
"SOURCE_DATE_EPOCH=${kernel_base_revision_ts}" # https://reproducible-builds.org/docs/source-date-epoch/ and https://www.kernel.org/doc/html/latest/kbuild/reproducible-builds.html

2
lib/functions/compilation/packages/armbian-config-deb.sh
View File

@ -66,7 +66,7 @@ compile_armbian-config() {
# Add development repository to keep rooling release of this tool
cat <<- END > ${tmp_dir}/${armbian_config_dir}/etc/apt/sources.list.d/armbian-config.list
deb [signed-by=/usr/share/keyrings/armbian.gpg] https://github.armbian.com/configng stable main
deb [signed-by=/usr/share/keyrings/armbian.gpg] https://github.armbian.com/configng stable main
END
dpkg_deb_build "${tmp_dir}/${armbian_config_dir}" "armbian-config"

2
lib/functions/compilation/patch/drivers_network.sh
View File

@ -381,7 +381,7 @@ driver_rtl8852bs() {
# Bugfix/workaround: Comment undefined RTW_WARN_LMT
# @TODO Check on update if this fix is still needed (added 2024-July-10)
sed -i "s/RTW_WARN_LMT(/\/\/RTW_WARN_LMT(/g" \
sed -i "s/RTW_WARN_LMT(/\/\/RTW_WARN_LMT(/g" \
"$kerneldir/drivers/net/wireless/realtek/rtl8852bs/core/rtw_xmit.c"
# Add to section Makefile

2
lib/functions/general/oci-oras.sh
View File

@ -85,7 +85,7 @@ function run_tool_oras() {
display_alert "Running ORAS ${ACTUAL_VERSION}" "HOME='${ORAS_HOME}'; retries='${retries:-1}'; cmdline: $*" "debug"
if [[ "${retries:-1}" -gt 1 ]]; then
display_alert "Calling ORAS with retries ${retries}" "$*" "debug"
sleep_seconds="30" do_with_retries "${retries}" env -i "HOME=${ORAS_HOME}" "HTTPS_PROXY=${HTTPS_PROXY}" "${ORAS_BIN}" "$@"
sleep_seconds="30" do_with_retries "${retries}" env -i "HOME=${ORAS_HOME}" "HTTPS_PROXY=${HTTPS_PROXY}" "${ORAS_BIN}" "$@"
else
# If any parameters passed, call ORAS, otherwise exit. We call it this way (sans-parameters) early to prepare ORAS tooling.
if [[ $# -eq 0 ]]; then

2
lib/functions/rootfs/apt-install.sh
View File

@ -103,7 +103,7 @@ function install_deb_chroot() {
# install in chroot via apt-get, not dpkg, so dependencies are also installed from repo if needed.
declare -g if_error_detail_message="Installation of $install_target failed ${BOARD} ${RELEASE} ${BUILD_DESKTOP} ${LINUXFAMILY}"
declare -a extra_apt_envs=()
extra_apt_envs+=("ARMBIAN_IMAGE_BUILD_BOOTFS_TYPE=${BOOTFS_TYPE:-"unset"}") # used by package postinst scripts to bevahe
extra_apt_envs+=("ARMBIAN_IMAGE_BUILD_BOOTFS_TYPE=${BOOTFS_TYPE:-"unset"}") # used by package postinst scripts to bevahe
DONT_MAINTAIN_APT_CACHE="yes" chroot_sdcard_apt_get --no-install-recommends "${apt_options}" install "${install_target}" # don't auto-maintain apt cache when installing from packages.
unset extra_apt_envs

10
lib/functions/rootfs/distro-agnostic.sh
View File

@ -390,11 +390,11 @@ function install_distribution_agnostic() {
# enable additional services, if they exist.
display_alert "Enabling Armbian services" "systemd" "info"
if [[ -f "${SDCARD}"/lib/systemd/system/armbian-firstrun.service ]]; then
# Note: armbian-firstrun starts before the user has a chance to edit the env file's values.
# Exceptionaly, the env file can be edited during image build time
if test -n "$OPENSSHD_REGENERATE_HOST_KEYS"; then
sed -i "s/\(^OPENSSHD_REGENERATE_HOST_KEYS *= *\).*/\1$OPENSSHD_REGENERATE_HOST_KEYS/" "${SDCARD}"/etc/default/armbian-firstrun
fi
# Note: armbian-firstrun starts before the user has a chance to edit the env file's values.
# Exceptionaly, the env file can be edited during image build time
if test -n "$OPENSSHD_REGENERATE_HOST_KEYS"; then
sed -i "s/\(^OPENSSHD_REGENERATE_HOST_KEYS *= *\).*/\1$OPENSSHD_REGENERATE_HOST_KEYS/" "${SDCARD}"/etc/default/armbian-firstrun
fi
chroot_sdcard systemctl --no-reload enable armbian-firstrun.service
fi
[[ -f "${SDCARD}"/lib/systemd/system/armbian-zram-config.service ]] && chroot_sdcard systemctl --no-reload enable armbian-zram-config.service