diff --git a/lib/functions/artifacts/artifact-armbian-base-files.sh b/lib/functions/artifacts/artifact-armbian-base-files.sh index 0d4aa2059..c4473a695 100644 --- a/lib/functions/artifacts/artifact-armbian-base-files.sh +++ b/lib/functions/artifacts/artifact-armbian-base-files.sh @@ -17,7 +17,6 @@ function artifact_armbian-base-files_config_dump() { } function artifact_armbian-base-files_prepare_version() { - : "${artifact_prefix_version:?artifact_prefix_version is not set}" : "${RELEASE:?RELEASE is not set}" : "${ARCH:?ARCH is not set}" @@ -25,7 +24,7 @@ function artifact_armbian-base-files_prepare_version() { artifact_version_reason="undetermined" # outer scope declare short_hash_size=4 - declare fake_unchanging_base_version="${RELEASE}-1armbian1" + declare fake_unchanging_base_version="1-${RELEASE}-1armbian1" declare found_package_version="undetermined" found_package_filename="undetermined" found_package_down_url="undetermined" sleep_seconds="15" do_with_retries 10 apt_find_upstream_package_version_and_download_url "base-files" @@ -45,7 +44,7 @@ function artifact_armbian-base-files_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}${fake_unchanging_base_version}-B${bash_hash_short}" + artifact_version="${fake_unchanging_base_version}-B${bash_hash_short}" declare -a reasons=("Armbian armbian-base-files" "original ${RELEASE} version \"${base_files_wanted_upstream_version}\"" "framework bash hash \"${bash_hash}\"") diff --git a/lib/functions/artifacts/artifact-armbian-bsp-cli.sh b/lib/functions/artifacts/artifact-armbian-bsp-cli.sh index 0c0da0bb8..80941c70a 100644 --- a/lib/functions/artifacts/artifact-armbian-bsp-cli.sh +++ b/lib/functions/artifacts/artifact-armbian-bsp-cli.sh @@ -14,7 +14,6 @@ function artifact_armbian-bsp-cli_config_dump() { } function artifact_armbian-bsp-cli_prepare_version() { - : "${artifact_prefix_version:?artifact_prefix_version is not set}" : "${BRANCH:?BRANCH is not set}" : "${BOARD:?BOARD is not set}" @@ -87,7 +86,7 @@ function artifact_armbian-bsp-cli_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}${fake_unchanging_base_version}-PC${packages_config_hash_short}-V${var_config_hash_short}-H${hash_hooks_short}-B${bash_hash_short}" + artifact_version="${fake_unchanging_base_version}-PC${packages_config_hash_short}-V${var_config_hash_short}-H${hash_hooks_short}-B${bash_hash_short}" declare -a reasons=( "Armbian package armbian-bsp-cli" @@ -124,7 +123,7 @@ function artifact_armbian-bsp-cli_prepare_version() { } function artifact_armbian-bsp-cli_build_from_sources() { - # Generate transitional package when needed. + # Generate transitional package when needed. if artifact_armbian-bsp-cli_needs_transitional_package ; then LOG_SECTION="compile_armbian-bsp-cli" do_with_logging compile_armbian-bsp-cli-transitional fi diff --git a/lib/functions/artifacts/artifact-armbian-bsp-desktop.sh b/lib/functions/artifacts/artifact-armbian-bsp-desktop.sh index 940cea66d..ea0ef455a 100644 --- a/lib/functions/artifacts/artifact-armbian-bsp-desktop.sh +++ b/lib/functions/artifacts/artifact-armbian-bsp-desktop.sh @@ -18,7 +18,6 @@ function artifact_armbian-bsp-desktop_config_dump() { } function artifact_armbian-bsp-desktop_prepare_version() { - : "${artifact_prefix_version:?artifact_prefix_version is not set}" : "${BRANCH:?BRANCH is not set}" : "${BOARD:?BOARD is not set}" : "${RELEASE:?RELEASE is not set}" @@ -43,7 +42,7 @@ function artifact_armbian-bsp-desktop_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}${fake_unchanging_base_version}-B${bash_hash_short}" + artifact_version="${fake_unchanging_base_version}-B${bash_hash_short}" declare -a reasons=( "Armbian armbian-bsp-desktop" diff --git a/lib/functions/artifacts/artifact-armbian-config.sh b/lib/functions/artifacts/artifact-armbian-config.sh index b89e157fb..d7233656f 100644 --- a/lib/functions/artifacts/artifact-armbian-config.sh +++ b/lib/functions/artifacts/artifact-armbian-config.sh @@ -41,7 +41,7 @@ function artifact_armbian-config_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}${fake_unchanging_base_version}-SA${short_sha1}-B${bash_hash_short}" + artifact_version="${fake_unchanging_base_version}-SA${short_sha1}-B${bash_hash_short}" declare -a reasons=( "Armbian armbian-config git revision \"${GIT_INFO_ARMBIAN_CONFIG[SHA1]}\"" diff --git a/lib/functions/artifacts/artifact-armbian-desktop.sh b/lib/functions/artifacts/artifact-armbian-desktop.sh index 5d241e867..e32032348 100644 --- a/lib/functions/artifacts/artifact-armbian-desktop.sh +++ b/lib/functions/artifacts/artifact-armbian-desktop.sh @@ -18,7 +18,6 @@ function artifact_armbian-desktop_config_dump() { } function artifact_armbian-desktop_prepare_version() { - : "${artifact_prefix_version:?artifact_prefix_version is not set}" : "${RELEASE:?RELEASE is not set}" : "${DESKTOP_ENVIRONMENT:?DESKTOP_ENVIRONMENT is not set}" @@ -48,7 +47,7 @@ function artifact_armbian-desktop_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}${fake_unchanging_base_version}-V${var_config_hash_short}-B${bash_hash_short}" + artifact_version="${fake_unchanging_base_version}-V${var_config_hash_short}-B${bash_hash_short}" declare -a reasons=( "Armbian armbian-desktop" diff --git a/lib/functions/artifacts/artifact-armbian-plymouth-theme.sh b/lib/functions/artifacts/artifact-armbian-plymouth-theme.sh index 2754775c3..a581346de 100644 --- a/lib/functions/artifacts/artifact-armbian-plymouth-theme.sh +++ b/lib/functions/artifacts/artifact-armbian-plymouth-theme.sh @@ -27,7 +27,7 @@ function artifact_armbian-plymouth-theme_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}-B${bash_hash_short}" + artifact_version="${fake_unchanging_base_version}-B${bash_hash_short}" declare -a reasons=( "Armbian armbian-plymouth-theme" diff --git a/lib/functions/artifacts/artifact-armbian-zsh.sh b/lib/functions/artifacts/artifact-armbian-zsh.sh index d59498d90..0c32c0752 100644 --- a/lib/functions/artifacts/artifact-armbian-zsh.sh +++ b/lib/functions/artifacts/artifact-armbian-zsh.sh @@ -42,7 +42,7 @@ function artifact_armbian-zsh_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}${fake_unchanging_base_version}-SA${short_sha1}-B${bash_hash_short}" + artifact_version="${fake_unchanging_base_version}-SA${short_sha1}-B${bash_hash_short}" declare -a reasons=( "Armbian armbian-zsh git revision \"${GIT_INFO_ARMBIAN_ZSH[SHA1]}\"" diff --git a/lib/functions/artifacts/artifact-fake-ubuntu-advantage-tools.sh b/lib/functions/artifacts/artifact-fake-ubuntu-advantage-tools.sh index adfe5ba06..56a4ee28c 100644 --- a/lib/functions/artifacts/artifact-fake-ubuntu-advantage-tools.sh +++ b/lib/functions/artifacts/artifact-fake-ubuntu-advantage-tools.sh @@ -27,7 +27,7 @@ function artifact_fake_ubuntu_advantage_tools_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}${fake_unchanging_base_version}-B${bash_hash_short}" + artifact_version="${fake_unchanging_base_version}-B${bash_hash_short}" declare -a reasons=( "Armbian fake-ubuntu-advantage-tools" diff --git a/lib/functions/artifacts/artifact-firmware.sh b/lib/functions/artifacts/artifact-firmware.sh index 7fedde1ee..e86e0293c 100644 --- a/lib/functions/artifacts/artifact-firmware.sh +++ b/lib/functions/artifacts/artifact-firmware.sh @@ -42,7 +42,7 @@ function artifact_firmware_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}${fake_unchanging_base_version}-SA${short_sha1}-B${bash_hash_short}" + artifact_version="${fake_unchanging_base_version}-SA${short_sha1}-B${bash_hash_short}" declare -a reasons=( "Armbian firmware git revision \"${GIT_INFO_ARMBIAN_FIRMWARE[SHA1]}\"" diff --git a/lib/functions/artifacts/artifact-full_firmware.sh b/lib/functions/artifacts/artifact-full_firmware.sh index dbf3a4f03..72f0ea19f 100644 --- a/lib/functions/artifacts/artifact-full_firmware.sh +++ b/lib/functions/artifacts/artifact-full_firmware.sh @@ -15,7 +15,6 @@ function artifact_full_firmware_config_dump() { function artifact_full_firmware_prepare_version() { artifact_version="undetermined" # outer scope artifact_version_reason="undetermined" # outer scope - [[ -z "${artifact_prefix_version}" ]] && exit_with_error "artifact_prefix_version is not set" local ARMBIAN_FIRMWARE_SOURCE="${ARMBIAN_FIRMWARE_GIT_SOURCE:-"https://github.com/armbian/firmware"}" local ARMBIAN_FIRMWARE_BRANCH="branch:${ARMBIAN_FIRMWARE_GIT_BRANCH:-"master"}" @@ -52,7 +51,7 @@ function artifact_full_firmware_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}${fake_unchanging_base_version}-SA${short_sha1}-SM${short_sha1_mainline}-B${bash_hash_short}" + artifact_version="${fake_unchanging_base_version}-SA${short_sha1}-SM${short_sha1_mainline}-B${bash_hash_short}" declare -a reasons=( "Armbian firmware git revision \"${GIT_INFO_ARMBIAN_FIRMWARE[SHA1]}\"" diff --git a/lib/functions/artifacts/artifact-kernel.sh b/lib/functions/artifacts/artifact-kernel.sh index 66e0ae190..d782de704 100644 --- a/lib/functions/artifacts/artifact-kernel.sh +++ b/lib/functions/artifacts/artifact-kernel.sh @@ -26,7 +26,6 @@ function artifact_kernel_config_dump() { function artifact_kernel_prepare_version() { artifact_version="undetermined" # outer scope artifact_version_reason="undetermined" # outer scope - [[ -z "${artifact_prefix_version}" ]] && exit_with_error "artifact_prefix_version is not set" # - Given KERNELSOURCE and KERNELBRANCH, get: # - SHA1 of the commit (this is generic... and used for other pkgs) @@ -63,7 +62,6 @@ function artifact_kernel_prepare_version() { debug_var BOARDFAMILY # Heh. debug_var KERNEL_MAJOR_MINOR # Double heh. transitional stuff, from when armbian-next began. 🤣 debug_var BRANCH - debug_var REVISION debug_var KERNELSOURCE debug_var KERNELBRANCH debug_var LINUXFAMILY @@ -175,9 +173,9 @@ function artifact_kernel_prepare_version() { # outer scope if [[ "${KERNEL_SKIP_MAKEFILE_VERSION:-"no"}" == "yes" ]]; then - artifact_version="${artifact_prefix_version}${common_version_suffix}" + artifact_version="${common_version_suffix}" else - artifact_version="${artifact_prefix_version}${GIT_INFO_KERNEL[MAKEFILE_VERSION]}-${common_version_suffix}" + artifact_version="${GIT_INFO_KERNEL[MAKEFILE_VERSION]}-${common_version_suffix}" fi declare -a reasons=( diff --git a/lib/functions/artifacts/artifact-rootfs.sh b/lib/functions/artifacts/artifact-rootfs.sh index 5421cb4e2..74a443e08 100644 --- a/lib/functions/artifacts/artifact-rootfs.sh +++ b/lib/functions/artifacts/artifact-rootfs.sh @@ -24,7 +24,6 @@ function artifact_rootfs_config_dump() { function artifact_rootfs_prepare_version() { artifact_version="undetermined" # outer scope artifact_version_reason="undetermined" # outer scope - [[ -z "${artifact_prefix_version}" ]] && exit_with_error "artifact_prefix_version is not set" assert_requires_aggregation # Bombs if aggregation has not run @@ -48,8 +47,7 @@ function artifact_rootfs_prepare_version() { reasons+=("desktop_appgroups_selected \"${DESKTOP_APPGROUPS_SELECTED}\"") fi - # rootfs does NOT include ${artifact_prefix_version} -- there's no reason to, since rootfs is not in an apt repo - # instead, we use YYYYMM to make a new rootfs cache version per-month, even if nothing else changes. + # we use YYYYMM to make a new rootfs cache version per-month, even if nothing else changes. declare yyyymm="undetermined" yyyymm="$(date +%Y%m)" diff --git a/lib/functions/artifacts/artifact-uboot.sh b/lib/functions/artifacts/artifact-uboot.sh index 9bbe20ef9..7b9246e7e 100644 --- a/lib/functions/artifacts/artifact-uboot.sh +++ b/lib/functions/artifacts/artifact-uboot.sh @@ -19,7 +19,6 @@ function artifact_uboot_config_dump() { function artifact_uboot_prepare_version() { artifact_version="undetermined" # outer scope artifact_version_reason="undetermined" # outer scope - [[ -z "${artifact_prefix_version}" ]] && exit_with_error "artifact_prefix_version is not set" # Prepare the version, "sans-repos": just the armbian/build repo contents are available. # It is OK to reach out to the internet for a curl or ls-remote, but not for a git clone/fetch. @@ -111,7 +110,7 @@ function artifact_uboot_prepare_version() { declare bash_hash_short="${bash_hash:0:${short_hash_size}}" # outer scope - artifact_version="${artifact_prefix_version}${GIT_INFO_UBOOT[MAKEFILE_VERSION]}-S${short_sha1}-P${uboot_patches_hash_short}-H${hash_hooks_and_functions_short}-V${var_config_hash_short}-B${bash_hash_short}" + artifact_version="${GIT_INFO_UBOOT[MAKEFILE_VERSION]}-S${short_sha1}-P${uboot_patches_hash_short}-H${hash_hooks_and_functions_short}-V${var_config_hash_short}-B${bash_hash_short}" declare -a reasons=( "version \"${GIT_INFO_UBOOT[MAKEFILE_FULL_VERSION]}\"" diff --git a/lib/functions/artifacts/artifacts-obtain.sh b/lib/functions/artifacts/artifacts-obtain.sh index 4bc2c574b..b25529466 100644 --- a/lib/functions/artifacts/artifacts-obtain.sh +++ b/lib/functions/artifacts/artifacts-obtain.sh @@ -68,8 +68,6 @@ function initialize_artifact() { } function obtain_complete_artifact() { - : "${artifact_prefix_version:?artifact_prefix_version is not set}" - declare -g artifact_name="undetermined" declare -g artifact_type="undetermined" declare -g artifact_version="undetermined" @@ -81,9 +79,6 @@ function obtain_complete_artifact() { declare -A -g artifact_map_packages=() declare -A -g artifact_map_debs=() - # Check if REVISION is set, otherwise exit_with_error - [[ "x${REVISION}x" == "xx" ]] && exit_with_error "REVISION is not set" - # Contentious; it might be that prepare_version is complex enough to warrant more than 1 logging section. LOG_SECTION="artifact_prepare_version" do_with_logging artifact_prepare_version @@ -104,9 +99,9 @@ function obtain_complete_artifact() { [[ "x${artifact_base_dir}x" == "xx" || "${artifact_base_dir}" == "undetermined" ]] && exit_with_error "artifact_base_dir is not set after artifact_prepare_version" [[ "x${artifact_final_file}x" == "xx" || "${artifact_final_file}" == "undetermined" ]] && exit_with_error "artifact_final_file is not set after artifact_prepare_version" - # validate artifact_version begins with artifact_prefix_version when building deb packages (or deb-tar) + # validate artifact_version begins with a digit when building deb packages (or deb-tar); dpkg requires it if [[ "${artifact_type}" != "tar.zst" ]]; then - [[ "${artifact_version}" =~ ^${artifact_prefix_version} ]] || exit_with_error "artifact_version '${artifact_version}' does not begin with artifact_prefix_version '${artifact_prefix_version}'" + [[ "${artifact_version}" =~ ^[0-9] ]] || exit_with_error "${artifact_type}: artifact_version '${artifact_version}' does not begin with a digit" fi declare -a artifact_map_debs_values=() artifact_map_packages_values=() artifact_map_debs_keys=() artifact_map_packages_keys=() diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 3f2a8e896..caf54728c 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -33,9 +33,6 @@ function do_main_configuration() { declare -g -r REVISION="${REVISION}" display_alert "Using revision from" "${revision_from}: '${REVISION}'" "info" - # This is the prefix used by all artifacts. Readonly. It's just $REVISION and a double dash. - declare -r -g artifact_prefix_version="${REVISION}--" - [[ -z $VENDOR ]] && VENDOR="Armbian" [[ -z $VENDORURL ]] && VENDORURL="https://www.armbian.com" [[ -z $VENDORSUPPORT ]] && VENDORSUPPORT="https://forum.armbian.com"