armbian · tabrisnet · Dec 10, 2025 · Dec 10, 2025 · Dec 10, 2025 · Dec 10, 2025
@@ -1,4 +1,4 @@
-verbosity=1
+verbosity=7
 console=both
 disp_mode=1080p60
 fb0_width=1280

@@ -1,4 +1,4 @@
-verbosity=1
+verbosity=7
 bootlogo=false
 console=both
 disp_mode=1920x1080p60
@@ -0,0 +1 @@
+../../common/debootstrap/components.ubuntu
@@ -0,0 +1,2 @@
+locales
+apt
@@ -0,0 +1 @@
+../../common/main/config_desktop
@@ -0,0 +1 @@
+../debootstrap/packages
@@ -0,0 +1 @@
+apa
@@ -0,0 +1 @@
+apa
@@ -0,0 +1 @@
+../plucky/appgroups
@@ -0,0 +1 @@
+arm64, amd64
@@ -0,0 +1 @@
+../../../plucky/environments/cinnamon/armbian
@@ -0,0 +1 @@
+../../gnome/config_base/packages
@@ -0,0 +1 @@
+../../../plucky/environments/cinnamon/debian
@@ -0,0 +1 @@
+supported
@@ -0,0 +1 @@
+arm64, amd64
@@ -0,0 +1 @@
+../../../plucky/environments/gnome/armbian
@@ -0,0 +1,2 @@
+locales
+apt
@@ -0,0 +1 @@
+../../../plucky/environments/gnome/debian
@@ -0,0 +1 @@
+supported
@@ -0,0 +1 @@
+../../../common/environments/i3-wm/architectures
@@ -0,0 +1 @@
+../../../common/environments/i3-wm/armbian
@@ -0,0 +1 @@
+../../gnome/config_base/packages
@@ -0,0 +1 @@
+../../../common/environments/i3-wm/debian
@@ -0,0 +1 @@
+../../../common/environments/i3-wm/support
@@ -0,0 +1 @@
+kde-plasma
@@ -0,0 +1 @@
+arm64, amd64
@@ -0,0 +1 @@
+../../gnome/config_base/packages
@@ -0,0 +1 @@
+../../../plucky/environments/kde-plasma/debian
@@ -0,0 +1 @@
+csc
@@ -0,0 +1 @@
+arm64, amd64, armhf, riscv64
@@ -0,0 +1 @@
+../../../plucky/environments/xfce/armbian
@@ -0,0 +1 @@
+../../gnome/config_base/packages
@@ -0,0 +1 @@
+../../../plucky/environments/xfce/debian
@@ -0,0 +1 @@
+supported
@@ -0,0 +1 @@
+apa
@@ -0,0 +1 @@
+apa
@@ -9,10 +9,15 @@ function custom_apt_repo__add_apa() {
 	run_host_command_logged echo "deb [signed-by=${APT_SIGNING_KEY_FILE}] http://github.armbian.com/apa current main" "|" tee "${SDCARD}"/etc/apt/sources.list.d/armbian-apa.list
 }
 
-function post_armbian_repo_customize_image__install_from_apa() {
+# this variable is a temporary hack, remove as soon as it's not needed
+declare -g apa_additional_packages="libpam-systemd dbus-user-session curl iw less locales"
+function post_debootstrap_install_additional_packages__install_from_apa_stage1() { #FIXME: we need a better hook name that fits into the extensions system
+	[[ $APA_IS_ACTIVE ]] || return 0
+
 	# do not install armbian recommends for minimal images
 	[[ "${BUILD_MINIMAL,,}" =~ ^(true|yes)$ ]] && INSTALL_RECOMMENDS="no-install-recommends" || INSTALL_RECOMMENDS="install-recommends"
-	chroot_sdcard_apt_get install --$INSTALL_RECOMMENDS armbian-common armbian-bsp
+	display_alert "installing armbian-common and friends" "APA: armbian-common $apa_additional_packages" "info"
+	chroot_sdcard_apt_get install --$INSTALL_RECOMMENDS armbian-common $apa_additional_packages
 	chroot_sdcard rm -f /etc/apt/sources.list.d/armbian-apa.list.inactive
 
 	# install desktop environment if requested
@@ -23,3 +28,33 @@ function post_armbian_repo_customize_image__install_from_apa() {
 			;;
 	esac
 }
+
+#FIXME: still need a better name, this implies it is possible to delete pkgs
+# NOTE: this is only used for hashing, so it probably isn't that important
+# to delete pkgs from any lists as much as indicate they won't be present.
+# NOTE: /tmp/rootfs_customize_package_list.txt is a special file that all
+# callers of this hook need to append to, as there is no mechanism for
+# returning data from hooks.
+function rootfs_customize_package_list__get_apa_packages() { 
+	[[ $APA_IS_ACTIVE ]] || return 0
+
+	local apa_package_list=""
+
+	# do not install armbian recommends for minimal images
+	[[ "${BUILD_MINIMAL,,}" =~ ^(true|yes)$ ]] && INSTALL_RECOMMENDS="no-install-recommends" || INSTALL_RECOMMENDS="install-recommends"
+	apa_package_list+= "${INSTALL_RECOMMENDS} armbian-common $apa_additional_packages"
+
+	case ${DESKTOP_ENVIRONMENT^^} in
+		XFCE|KDE|GNOME)
+			apa_package_list+= "armbian-desktop-${DESKTOP_ENVIRONMENT,,}"
+			;;
+	esac
+	echo $apa_package_list >> "/tmp/rootfs_customize_package_list.txt"
+}
+
+function post_armbian_repo_customize_image__install_from_apa_stage2() {
+	# do not install armbian recommends for minimal images
+	[[ "${BUILD_MINIMAL,,}" =~ ^(true|yes)$ ]] && INSTALL_RECOMMENDS="no-install-recommends" || INSTALL_RECOMMENDS="install-recommends"
+	display_alert "installing armbian-bsp" "APA" "info"
+	chroot_sdcard_apt_get install --$INSTALL_RECOMMENDS armbian-bsp
+}
@@ -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, fdisk, parted, 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

@@ -129,6 +129,9 @@ function prepare_partitions() {
 	# stage: calculate rootfs size
 	declare -g -i rootfs_size
 	rootfs_size=$(du --apparent-size -sm "${SDCARD}"/ | cut -f1) # MiB
+	if [[ $APA_IS_ACTIVE ]]; then # FIXME: APA takes up more space
+		rootfs_size=$(($rootfs_size*11/10))
+	fi
 	display_alert "Current rootfs size" "$rootfs_size MiB" "info"
 
 	call_extension_method "prepare_image_size" "config_prepare_image_size" <<- 'PREPARE_IMAGE_SIZE'

@@ -45,7 +45,7 @@ function determine_artifacts_to_build_for_image() {
 	artifacts_to_build+=("armbian-bsp-cli")
 
 	# Userspace, RELEASE-specific artifacts.
-	if [[ -n "${RELEASE}" ]]; then
+	if [[ -n "${RELEASE}" && ! $APA_IS_ACTIVE ]]; then
 		if [[ -n "${DESKTOP_ENVIRONMENT}" ]]; then
 			artifacts_to_build+=("armbian-desktop")
 			artifacts_to_build+=("armbian-bsp-desktop")

@@ -28,8 +28,10 @@ function prep_conf_main_build_single() {
 
 	LOG_SECTION="do_main_configuration" do_with_conditional_logging do_main_configuration # This initializes the extension manager among a lot of other things, and call extension_prepare_config() hook
 
-	interactive_desktop_main_configuration
-	interactive_finish # cleans up vars used for interactive
+	if [[ ! $APA_IS_ACTIVE ]]; then
+		interactive_desktop_main_configuration
+		interactive_finish # cleans up vars used for interactive
+	fi
 
 	LOG_SECTION="do_extra_configuration" do_with_conditional_logging do_extra_configuration
 

@@ -18,6 +18,18 @@ function calculate_rootfs_cache_id() {
 
 	declare -i short_hash_size=6
 
+	call_extension_method "rootfs_customize_package_list" <<- ROOTFS_CUSTOMIZE_PACKAGE_LIST
+		expected to append arbitrary data about package list
+		modifications to /tmp/rootfs_customize_package_list.txt.
+		NOTE: hook implementations that do not write to this
+		file will have no effect on the rootfs hashing.
+	ROOTFS_CUSTOMIZE_PACKAGE_LIST
+	local rootfs_customize_package_list_hash=""
+	if [[ -e '/tmp/rootfs_customize_package_list.txt' ]]; then
+		rootfs_customize_package_list_hash=$(sha256sum /tmp/rootfs_customize_package_list.txt)
+		rm /tmp/rootfs_customize_package_list.txt
+	fi
+
 	# get the hashes of the lib/ bash sources involved...
 	declare hash_files="undetermined"
 	calculate_hash_for_files "${SRC}"/lib/functions/rootfs/create-cache.sh "${SRC}"/lib/functions/rootfs/rootfs-create.sh
@@ -29,6 +41,7 @@ function calculate_rootfs_cache_id() {
 	declare -a extension_hooks_hashed=("$(dump_extension_method_sources_functions "${extension_hooks_to_hash[@]}")")
 	declare hash_hooks="undetermined"
 	declare legacy_debootstrap="${LEGACY_DEBOOTSTRAP:-"no"}"
+	extension_hooks_hashed+=("rootfs_customize_package_list=${rootfs_customize_package_list_hash}")
 	hash_hooks="$(echo "${extension_hooks_hashed[@]}" LDB=${legacy_debootstrap,,} | sha256sum | cut -d' ' -f1)"
 	declare hash_hooks_short="${hash_hooks:0:${short_hash_size}}"
 

@@ -407,7 +407,7 @@ function install_distribution_agnostic() {
 	install_artifact_deb_chroot "armbian-bsp-cli"
 
 	# install armbian-desktop
-	if [[ $BUILD_DESKTOP == yes ]]; then
+	if [[ ! $APA_IS_ACTIVE && $BUILD_DESKTOP == yes ]]; then
 		install_artifact_deb_chroot "armbian-desktop"
 		install_artifact_deb_chroot "armbian-bsp-desktop"
 		# install display manager and PACKAGE_LIST_DESKTOP_FULL packages if enabled per board

@@ -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"
@@ -300,6 +310,10 @@ function create_new_rootfs_cache_via_debootstrap() {
 		chroot_sdcard_apt_get_install "${AGGREGATED_PACKAGES_DESKTOP[@]}"
 	fi
 
+	call_extension_method "post_debootstrap_install_additional_packages" <<- 'POST_DEBOOTSTRAP_INSTALL_ADDITIONAL_PACKAGES'
+		*installs packages not handled by aggregation/debootstrap*
+	POST_DEBOOTSTRAP_INSTALL_ADDITIONAL_PACKAGES
+
 	# stage: check md5 sum of installed packages. Just in case. @TODO: rpardini: this should also be done when a cache is used, not only when it is created
 	# lets check only for supported targets only unless forced
 	if [[ "${DISTRIBUTION_STATUS}" == "supported" && "${FORCE_CHECK_MD5_PACKAGES:-"no"}" == "yes" ]]; then
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../common/environments/i3-wm/architectures