rely on APA extension and packages for bootstrapping.

tabrisnet · tabrisnet · commit 45d54cddcdd3 · 2025-11-30T23:27:16.000-05:00
Cleanup config/{desktop,cli}/{questing,resolute} to absolute minimum,
so that APA can do the job instead.
diff --git a/config/cli/questing/debootstrap/components b/config/cli/questing/debootstrap/components
@@ -0,0 +1 @@
+../../common/debootstrap/components.ubuntu
diff --git a/config/cli/questing/debootstrap/packages b/config/cli/questing/debootstrap/packages
@@ -0,0 +1,2 @@
+locales
+apt
diff --git a/config/cli/questing/main/config_desktop b/config/cli/questing/main/config_desktop
@@ -0,0 +1 @@
+../../common/main/config_desktop
diff --git a/config/cli/questing/main/packages b/config/cli/questing/main/packages
@@ -0,0 +1 @@
+../debootstrap/packages
diff --git a/config/cli/resolute b/config/cli/resolute
@@ -0,0 +1 @@
+questing
diff --git a/config/desktop/questing/appgroups b/config/desktop/questing/appgroups
@@ -0,0 +1 @@
+../plucky/appgroups
diff --git a/config/desktop/questing/environments/cinnamon/architectures b/config/desktop/questing/environments/cinnamon/architectures
@@ -0,0 +1 @@
+arm64, amd64
diff --git a/config/desktop/questing/environments/cinnamon/armbian b/config/desktop/questing/environments/cinnamon/armbian
@@ -0,0 +1 @@
+../../../plucky/environments/cinnamon/armbian
diff --git a/config/desktop/questing/environments/cinnamon/config_base/packages b/config/desktop/questing/environments/cinnamon/config_base/packages
@@ -0,0 +1 @@
+../../gnome/config_base/packages
diff --git a/config/desktop/questing/environments/cinnamon/debian b/config/desktop/questing/environments/cinnamon/debian
@@ -0,0 +1 @@
+../../../plucky/environments/cinnamon/debian
diff --git a/config/desktop/questing/environments/cinnamon/support b/config/desktop/questing/environments/cinnamon/support
@@ -0,0 +1 @@
+supported
diff --git a/config/desktop/questing/environments/gnome/architectures b/config/desktop/questing/environments/gnome/architectures
@@ -0,0 +1 @@
+arm64, amd64
diff --git a/config/desktop/questing/environments/gnome/armbian b/config/desktop/questing/environments/gnome/armbian
@@ -0,0 +1 @@
+../../../plucky/environments/gnome/armbian
diff --git a/config/desktop/questing/environments/gnome/config_base/packages b/config/desktop/questing/environments/gnome/config_base/packages
@@ -0,0 +1,2 @@
+locales
+apt
diff --git a/config/desktop/questing/environments/gnome/debian b/config/desktop/questing/environments/gnome/debian
@@ -0,0 +1 @@
+../../../plucky/environments/gnome/debian
diff --git a/config/desktop/questing/environments/gnome/support b/config/desktop/questing/environments/gnome/support
@@ -0,0 +1 @@
+supported
diff --git a/config/desktop/questing/environments/i3-wm/architectures b/config/desktop/questing/environments/i3-wm/architectures
@@ -0,0 +1 @@
+../../../common/environments/i3-wm/architectures
diff --git a/config/desktop/questing/environments/i3-wm/armbian b/config/desktop/questing/environments/i3-wm/armbian
@@ -0,0 +1 @@
+../../../common/environments/i3-wm/armbian
diff --git a/config/desktop/questing/environments/i3-wm/config_base/packages b/config/desktop/questing/environments/i3-wm/config_base/packages
@@ -0,0 +1 @@
+../../gnome/config_base/packages
diff --git a/config/desktop/questing/environments/i3-wm/debian b/config/desktop/questing/environments/i3-wm/debian
@@ -0,0 +1 @@
+../../../common/environments/i3-wm/debian
diff --git a/config/desktop/questing/environments/i3-wm/support b/config/desktop/questing/environments/i3-wm/support
@@ -0,0 +1 @@
+../../../common/environments/i3-wm/support
diff --git a/config/desktop/questing/environments/kde-plasma-mobile b/config/desktop/questing/environments/kde-plasma-mobile
@@ -0,0 +1 @@
+kde-plasma
diff --git a/config/desktop/questing/environments/kde-plasma/architectures b/config/desktop/questing/environments/kde-plasma/architectures
@@ -0,0 +1 @@
+arm64, amd64
diff --git a/config/desktop/questing/environments/kde-plasma/config_base/packages b/config/desktop/questing/environments/kde-plasma/config_base/packages
@@ -0,0 +1 @@
+../../gnome/config_base/packages
diff --git a/config/desktop/questing/environments/kde-plasma/debian b/config/desktop/questing/environments/kde-plasma/debian
@@ -0,0 +1 @@
+../../../plucky/environments/kde-plasma/debian
diff --git a/config/desktop/questing/environments/kde-plasma/support b/config/desktop/questing/environments/kde-plasma/support
@@ -0,0 +1 @@
+csc
diff --git a/config/desktop/questing/environments/xfce/architectures b/config/desktop/questing/environments/xfce/architectures
@@ -0,0 +1 @@
+arm64, amd64, armhf, riscv64
diff --git a/config/desktop/questing/environments/xfce/armbian b/config/desktop/questing/environments/xfce/armbian
@@ -0,0 +1 @@
+../../../plucky/environments/xfce/armbian
diff --git a/config/desktop/questing/environments/xfce/config_base/packages b/config/desktop/questing/environments/xfce/config_base/packages
@@ -0,0 +1 @@
+../../gnome/config_base/packages
diff --git a/config/desktop/questing/environments/xfce/debian b/config/desktop/questing/environments/xfce/debian
@@ -0,0 +1 @@
+../../../plucky/environments/xfce/debian
diff --git a/config/desktop/questing/environments/xfce/support b/config/desktop/questing/environments/xfce/support
@@ -0,0 +1 @@
+supported
diff --git a/config/desktop/resolute b/config/desktop/resolute
@@ -0,0 +1 @@
+questing
diff --git a/lib/functions/bsp/armbian-bsp-cli-deb.sh b/lib/functions/bsp/armbian-bsp-cli-deb.sh
@@ -282,7 +282,7 @@ function reversion_armbian-bsp-cli_deb_contents() {
 		depends_base_files=""
 	fi
 	cat <<- EOF >> "${control_file_new}"
-		Depends: bash, linux-base, u-boot-tools, initramfs-tools, lsb-release, fping, device-tree-compiler${depends_base_files}
+		Depends: bash, linux-base, linux-image, u-boot-tools, initramfs-tools, lsb-release, fping, device-tree-compiler${depends_base_files}
 		Replaces: zram-config, armbian-bsp-cli-${BOARD}${EXTRA_BSP_NAME} (<< ${REVISION})
 		Breaks: armbian-bsp-cli-${BOARD}${EXTRA_BSP_NAME} (<< ${REVISION})
 		Provides: armbian-bsp-cli
diff --git a/lib/functions/configuration/config-desktop.sh b/lib/functions/configuration/config-desktop.sh
@@ -77,6 +77,7 @@ function desktop_environment_check_if_valid() {
 
 function interactive_desktop_main_configuration() {
 	[[ $BUILD_DESKTOP != "yes" ]] && return 0 # Only for desktops.
+	[[ $APA_IS_ACTIVE ]] || return 0 # APA takes care of installing desktop packages
 
 	DESKTOP_ELEMENTS_DIR="${SRC}/config/desktop/${RELEASE}"
 	DESKTOP_CONFIGS_DIR="${DESKTOP_ELEMENTS_DIR}/environments"
diff --git a/lib/functions/main/config-prepare.sh b/lib/functions/main/config-prepare.sh
@@ -358,7 +358,7 @@ function check_config_userspace_release_and_desktop() {
 		fi
 
 		# Desktop sanity checks, in the same vein.
-		if [[ "${DESKTOP_ENVIRONMENT}" != "" ]]; then
+		if [[ "${DESKTOP_ENVIRONMENT}" != "" && ! $APA_IS_ACTIVE ]]; then
 
 			# If DESKTOP_ENVIRONMENT is set, but BUILD_DESKTOP is not, then we have a problem.
 			if [[ "${BUILD_DESKTOP}" != "yes" ]]; then
diff --git a/lib/functions/rootfs/rootfs-create.sh b/lib/functions/rootfs/rootfs-create.sh
@@ -156,9 +156,19 @@ function create_new_rootfs_cache_via_debootstrap() {
 	declare -ga debootstrap_arguments=(
 		"--variant=minbase"                                         # minimal base variant. go ask Debian about it.
 		"--arch=${ARCH}"                                            # the arch
-		"'--include=${AGGREGATED_PACKAGES_DEBOOTSTRAP_COMMA}'"      # from aggregation.py
-		"'--components=${AGGREGATED_DEBOOTSTRAP_COMPONENTS_COMMA}'" # from aggregation.py
 	)
+	if [[ ! -z "${AGGREGATED_PACKAGES_DEBOOTSTRAP_COMMA}" ]]; then
+		# from aggregation.py
+		debootstrap_arguments+=("'--include=${AGGREGATED_PACKAGES_DEBOOTSTRAP_COMMA}'")
+	else
+		#FIXME: push the locales-gen stuff into extensions/apa.sh ?
+		# if apt isn't part of minbase, the above feels like the wrong solution.
+		debootstrap_arguments+=("'--include=locales,apt'")
+	fi
+	if [[ ! -z "${AGGREGATED_DEBOOTSTRAP_COMPONENTS_COMMA}" ]]; then
+		# from aggregation.py
+		debootstrap_arguments+=("'--components=${AGGREGATED_DEBOOTSTRAP_COMPONENTS_COMMA}'")
+	fi
 	if [[ "${LEGACY_DEBOOTSTRAP,,}" == "no" ]]; then
 		debootstrap_arguments+=("'--skip=check/empty'")             # skips check if the rootfs dir is empty at start
 		fetch_distro_keyring "$RELEASE"
@@ -324,6 +334,10 @@ function create_new_rootfs_cache_via_debootstrap() {
 	# don't touch the local cache.
 	DONT_MAINTAIN_APT_CACHE="yes" chroot_sdcard_apt_get autoremove
 
+	if [[ $APA_IS_ACTIVE ]]; then
+		post_armbian_repo_customize_image__install_from_apa #FIXME: rename this hook
+	fi
+
 	# Purge/clean apt cache in the target. It should _not_ have been used, but if it was, warn & clean.
 	apt_purge_unneeded_packages_and_clean_apt_caches
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../common/debootstrap/components.ubuntu`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../plucky/environments/cinnamon/armbian`