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

Improved debootstrap hacking support with fixes for Ubuntu Noble (#6076) 

* Remove extension for patching Deboostrap to support Ubuntu Noble
* Integrate Deboostrap patching to the build script
* fix problems related to Noble
This commit is contained in:
Igor 2023-12-22 08:04:55 +01:00 committed by GitHub
parent b8cd5dc4fe
commit f2e663f087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/optional/architectures/amd64/_config/cli/_all_distributions/main/packages
View File

@ -1,2 +0,0 @@
gpiod
nocache

1
config/optional/architectures/amd64/_config/cli/bookworm Symbolic link
View File

@ -0,0 +1 @@
sid

2
config/optional/architectures/amd64/_config/cli/bullseye
View File

@ -1 +1 @@
jammy
sid

1
config/optional/architectures/amd64/_config/cli/jammy Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/amd64/_config/cli/lunar Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/amd64/_config/cli/mantic Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/amd64/_config/cli/sid
View File

@ -1 +0,0 @@
jammy

2
config/optional/architectures/amd64/_config/cli/jammy/main/config_desktop/packages.additional → config/optional/architectures/amd64/_config/cli/sid/main/packages
View File

@ -1 +1,3 @@
gpiod
nocache
firmware-sof-signed

0
config/optional/architectures/amd64/_config/cli/_all_distributions/main/packages.additional → config/optional/architectures/amd64/_config/cli/sid/main/packages.additional
View File

1
config/optional/architectures/amd64/_config/cli/trixie Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/arm64/_config/cli/bookworm Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/arm64/_config/cli/bullseye Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/arm64/_config/cli/buster Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/arm64/_config/cli/focal Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/arm64/_config/cli/jammy Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/arm64/_config/cli/kinetic Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/arm64/_config/cli/lunar Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/arm64/_config/cli/mantic Symbolic link
View File

@ -0,0 +1 @@
sid

0
config/optional/architectures/arm64/_config/cli/_all_distributions/main/packages → config/optional/architectures/arm64/_config/cli/sid/main/packages
View File

0
config/optional/architectures/arm64/_config/cli/_all_distributions/main/packages.additional → config/optional/architectures/arm64/_config/cli/sid/main/packages.additional
View File

1
config/optional/architectures/armhf/_config/cli/bookworm Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/armhf/_config/cli/bullseye Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/armhf/_config/cli/buster Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/armhf/_config/cli/focal Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/armhf/_config/cli/jammy Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/armhf/_config/cli/kinetic Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/armhf/_config/cli/lunar Symbolic link
View File

@ -0,0 +1 @@
sid

1
config/optional/architectures/armhf/_config/cli/mantic Symbolic link
View File

@ -0,0 +1 @@
sid

0
config/optional/architectures/armhf/_config/cli/_all_distributions/main/packages → config/optional/architectures/armhf/_config/cli/sid/main/packages
View File

0
config/optional/architectures/armhf/_config/cli/_all_distributions/main/packages.additional → config/optional/architectures/armhf/_config/cli/sid/main/packages.additional
View File

1
config/optional/architectures/armhf/_config/cli/trixie Symbolic link
View File

@ -0,0 +1 @@
sid

15
extensions/ubuntu-noble.sh
View File

@ -1,15 +0,0 @@
function add_host_dependencies__patch_deboostrap(){
echo "Patching Debootstrap to support Ubuntu Noble"
NOBLE_SYMLINK=/usr/share/debootstrap/scripts/noble
if [ -L ${NOBLE_SYMLINK} ] && [ -e ${NOBLE_SYMLINK} ]; then
:
else
if ! command -v sudo &> /dev/null; then
run_host_command_logged ln -s gutsy ${NOBLE_SYMLINK}
else
run_host_command_logged sudo ln -s gutsy ${NOBLE_SYMLINK}
fi
fi
}

2
lib/functions/configuration/main-config.sh
View File

@ -310,8 +310,10 @@ function do_extra_configuration() {
if [[ "$RELEASE" =~ ^(focal|jammy|kinetic|lunar|mantic|noble)$ ]]; then
DISTRIBUTION="Ubuntu"
DEBOOTSTRAP_SOURCE="gutsy"
else
DISTRIBUTION="Debian"
DEBOOTSTRAP_SOURCE="sid"
fi
DEBIAN_MIRROR='deb.debian.org/debian'

8
lib/functions/rootfs/rootfs-create.sh
View File

@ -72,6 +72,14 @@ function create_new_rootfs_cache_via_debootstrap() {
"'--components=${AGGREGATED_DEBOOTSTRAP_COMPONENTS_COMMA}'" # from aggregation.py
)
# Hacking debootstrap to support future releases as symlink is often the only change, so we don't need to bump host OS
# This functionality is coming with debootstrap v1.0.128 (Mantic)
local debootstrap_home="/usr/share/debootstrap/scripts"
if [[ ! -L "${debootstrap_home}/${RELEASE}" && ! -e "${debootstrap_home}/${RELEASE}" ]]; then
display_alert "Making symlink as host deboostrap is missing it" "" "wrn"
run_host_command_logged ln -s "${DEBOOTSTRAP_SOURCE}" "${debootstrap_home}/${RELEASE}"
fi
# Small detour for local apt caching option.
local_apt_deb_cache_prepare "before debootstrap" # sets LOCAL_APT_CACHE_INFO
if [[ "${LOCAL_APT_CACHE_INFO[USE]}" == "yes" ]]; then