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

Drop HOST OS that doesnot support crust compilation

Browse Source
This commit is contained in:
Gunjan Gupta
2023-08-21 16:51:21 +05:30
committed by Igor
parent 67f916cd73
commit 1d6a779ed1
4 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/sources/families/include/crust_firmware.inc
View File

@@ -19,17 +19,3 @@ declare -g CRUST_TARGET_MAP="scp;;build/scp/scp.bin"
# Use a different BOOTDIR so that we don't leave scp.bin behind for non crust builds # Use a different BOOTDIR so that we don't leave scp.bin behind for non crust builds
[[ -n "${CRUSTCONFIG}" ]] && BOOTDIR="u-boot-crust" [[ -n "${CRUSTCONFIG}" ]] && BOOTDIR="u-boot-crust"
# complain about system not being supported for building crust image
function add_host_dependencies__dont_try_to_build_crust_on_unsupported_systems() {
if [[ -n "${CRUSTCONFIG}" ]] ; then
if [[ -z $HOSTRELEASE || "bookworm sid jammy kinetic lunar vanessa vera" != *"$HOSTRELEASE"* ]] ; then
if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then
display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn"
display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn"
else
exit_with_error "Unsupported build system for images with crust-firmware: '${HOSTRELEASE:-(unknown)}'"
fi
fi
fi
}

2
extensions/sunxi-tools.sh
View File

@@ -9,10 +9,8 @@ function add_host_dependencies__sunxi_add_32_bit_c_compiler() {
# Install gcc-or1k-elf for crust compilation # Install gcc-or1k-elf for crust compilation
function add_host_dependencies__sunxi_add_or1k_c_compiler() { function add_host_dependencies__sunxi_add_or1k_c_compiler() {
if [[ -n "$HOSTRELEASE" && "bookworm sid jammy kinetic lunar vanessa vera" == *"$HOSTRELEASE"* ]] ; then
display_alert "Adding or1k C compiler to host dependencies" "for sunxi bootloader compile" "debug" display_alert "Adding or1k C compiler to host dependencies" "for sunxi bootloader compile" "debug"
declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} gcc-or1k-elf" declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} gcc-or1k-elf"
fi
} }
function fetch_sources_tools__sunxi_tools() { function fetch_sources_tools__sunxi_tools() {

2
lib/functions/host/docker.sh
View File

@@ -121,8 +121,6 @@ function docker_cli_prepare() {
# declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"debian:trixie"}" # declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"debian:trixie"}"
# declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"debian:bookworm"}" # declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"debian:bookworm"}"
# declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"debian:sid"}" # declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"debian:sid"}"
# declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"debian:bullseye"}"
# declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"ubuntu:focal"}"
# declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"ubuntu:kinetic"}" # declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"ubuntu:kinetic"}"
declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"ubuntu:jammy"}" declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"ubuntu:jammy"}"
declare -g DOCKER_ARMBIAN_TARGET_PATH="${DOCKER_ARMBIAN_TARGET_PATH:-"/armbian"}" declare -g DOCKER_ARMBIAN_TARGET_PATH="${DOCKER_ARMBIAN_TARGET_PATH:-"/armbian"}"

2
lib/functions/host/host-release.sh
View File

@@ -33,7 +33,7 @@ function obtain_and_check_host_release_and_arch() {
# #
# NO_HOST_RELEASE_CHECK overrides the check for a supported host system # NO_HOST_RELEASE_CHECK overrides the check for a supported host system
# Disable host OS check at your own risk. Any issues reported with unsupported releases will be closed without discussion # Disable host OS check at your own risk. Any issues reported with unsupported releases will be closed without discussion
if [[ -z $HOSTRELEASE || "bullseye bookworm trixie sid focal impish hirsute jammy kinetic lunar ulyana ulyssa uma una vanessa vera victoria" != *"$HOSTRELEASE"* ]]; then if [[ -z $HOSTRELEASE || "bookworm trixie sid jammy kinetic lunar vanessa vera victoria" != *"$HOSTRELEASE"* ]]; then
if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then
display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn" display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn"
display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn" display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn"