APA bootstrapping

Author: tabrisnet

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

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"