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

debian: add Trixie (Debian 13, testing) csc target & build host (#5621)

Browse Source 
- Trixie, like Bookworm and Sid, does not have python2 anymore
This commit is contained in:
Ricardo Pardini
2023-08-22 08:14:55 +02:00
committed by GitHub
parent 78507bd48c
commit 64b5220853
9 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/cli/trixie Symbolic link
View File

@@ -0,0 +1 @@
bookworm

1
config/desktop/trixie Symbolic link
View File

@@ -0,0 +1 @@
bookworm

1
config/distributions/trixie/architectures Normal file
View File

@@ -0,0 +1 @@
arm64,armhf,amd64

1
config/distributions/trixie/name Normal file
View File

@@ -0,0 +1 @@
Debian 13 Trixie

1
config/distributions/trixie/support Normal file
View File

@@ -0,0 +1 @@
csc

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

@@ -118,6 +118,7 @@ function docker_cli_prepare() {
# @TODO: Make sure we can access docker, on Linux; gotta be part of 'docker' group: grep -q "$(whoami)" <(getent group docker) # @TODO: Make sure we can access docker, on Linux; gotta be part of 'docker' group: grep -q "$(whoami)" <(getent group docker)
declare -g DOCKER_ARMBIAN_INITIAL_IMAGE_TAG="armbian.local.only/armbian-build:initial" declare -g DOCKER_ARMBIAN_INITIAL_IMAGE_TAG="armbian.local.only/armbian-build:initial"
# 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:-"debian:bullseye"}"

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 sid focal impish hirsute jammy kinetic lunar ulyana ulyssa uma una vanessa vera victoria" != *"$HOSTRELEASE"* ]]; then if [[ -z $HOSTRELEASE || "bullseye bookworm trixie sid focal impish hirsute jammy kinetic lunar ulyana ulyssa uma una 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"

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

@@ -294,7 +294,7 @@ function adaptative_prepare_host_dependencies() {
# Python2 -- required for some older u-boot builds # Python2 -- required for some older u-boot builds
# Debian 'sid'/'bookworm' and Ubuntu 'lunar' does not carry python2 anymore; in this case some u-boot's might fail to build. # Debian 'sid'/'bookworm' and Ubuntu 'lunar' does not carry python2 anymore; in this case some u-boot's might fail to build.
if [[ "sid bookworm lunar" == *"${host_release}"* ]]; then if [[ "sid bookworm trixie lunar" == *"${host_release}"* ]]; then
display_alert "Python2 not available on host release '${host_release}'" "old(er) u-boot builds might/will fail" "wrn" display_alert "Python2 not available on host release '${host_release}'" "old(er) u-boot builds might/will fail" "wrn"
else else
host_dependencies+=("python2" "python2-dev") host_dependencies+=("python2" "python2-dev")

4
lib/functions/rootfs/distro-specific.sh
View File

@@ -118,7 +118,7 @@ function create_sources_list_and_deploy_repo_key() {
EOF EOF
;; ;;
bullseye | trixie) bullseye)
cat <<- EOF > "${basedir}"/etc/apt/sources.list cat <<- EOF > "${basedir}"/etc/apt/sources.list
deb http://${DEBIAN_MIRROR} $release main contrib non-free deb http://${DEBIAN_MIRROR} $release main contrib non-free
#deb-src http://${DEBIAN_MIRROR} $release main contrib non-free #deb-src http://${DEBIAN_MIRROR} $release main contrib non-free
@@ -134,7 +134,7 @@ function create_sources_list_and_deploy_repo_key() {
EOF EOF
;; ;;
bookworm) bookworm | trixie)
# non-free firmware in bookworm and later has moved from the non-free archive component to a new non-free-firmware component (alongside main/contrib/non-free). This was implemented on 2023-01-27, see also https://lists.debian.org/debian-boot/2023/01/msg00235.html # non-free firmware in bookworm and later has moved from the non-free archive component to a new non-free-firmware component (alongside main/contrib/non-free). This was implemented on 2023-01-27, see also https://lists.debian.org/debian-boot/2023/01/msg00235.html
cat <<- EOF > "${basedir}"/etc/apt/sources.list cat <<- EOF > "${basedir}"/etc/apt/sources.list
deb http://${DEBIAN_MIRROR} $release main contrib non-free non-free-firmware deb http://${DEBIAN_MIRROR} $release main contrib non-free non-free-firmware