Skip to content

Commit 465162d

Browse files
committed
artifact-rootfs: stop forcing SKIP_ARMBIAN_REPO=yes; default to no
artifact_rootfs_cli_adapter_config_prep set SKIP_ARMBIAN_REPO=yes unconditionally, which made sense when rootfs assembly only needed the distro archive. It doesn't anymore: the new desktop install path runs 'armbian-config --api module_desktops install mode=build' from inside rootfs-create.sh (see earlier commit in this PR), and armbian-config itself lives in the <release>-utils component of apt.armbian.com, with firefox / chromium / GNOME branding in <release>-desktop. With SKIP_ARMBIAN_REPO=yes forced on, the install step would hit 'E: Unable to locate package armbian-config' at rootfs-create time for every desktop build. Default the variable to 'no' instead, so apt.armbian.com is attached during rootfs assembly, and make it a readonly '-g -r' declaration so a hook can't flip it back under our feet. Boards / userpatches that still need the old repo-free behaviour (air-gapped mirror setups, exotic embedded use cases) can still pre-set SKIP_ARMBIAN_REPO=yes before the function runs — the ':-' default only kicks in when it's unset.
1 parent 0fd9dbd commit 465162d

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

config/boards/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ If you are unsure about the documentation then invoke `$ grep -r -A5 -B5 "BUILD_
6161
- **MODULES_BLACKLIST_EDGE** ( space-separated list of kernel modules ): appends modules to the kernel's blacklist/deny list for **edge** kernel
6262
- **SERIALCON** ( comma-separated list of terminal interfaces [:bandwidth] ): declares which serial console should be used on the system
6363
- Example: `ttyS0:15000000,ttyGS1`
64-
- **SKIP_ARMBIAN_REPO** ( boolean ): Whether to include the armbian repository in the built image
64+
- **SKIP_ARMBIAN_REPO** ( boolean ): Whether to exclude the armbian repository from the built image
6565
- Values:
66-
- yes: Include (default)
67-
- no: Do NO include
66+
- yes: Exclude the armbian repo (armbian.sources stays `.disabled`)
67+
- no: Include the armbian repo (default)
6868
- **POWER_MANAGEMENT_FEATURES** (boolean): Controls whether system sleep functionality (suspend, hibernate, hybrid sleep) is allowed on the built image.
6969
- Values:
7070
- yes: Enable power-management sleep features (allow systemd sleep modes)

lib/functions/artifacts/artifact-rootfs.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,15 @@ function artifact_rootfs_cli_adapter_config_prep() {
151151
declare -g -r RELEASE="${RELEASE}" # make readonly for finding who tries to change it
152152
declare -g -r NEEDS_BINFMT="yes" # make sure binfmts are installed during prepare_host_interactive
153153

154-
if [[ "${SKIP_ARMBIAN_REPO}" != "yes" ]]; then # if not set to yes, force it to yes.
155-
declare -g SKIP_ARMBIAN_REPO="yes" # Using the repo during rootfs build causes insanity, so don't. Make readonly to ensure.
156-
fi
154+
# Don't force SKIP_ARMBIAN_REPO=yes for rootfs artifact builds anymore.
155+
# The new desktop install path (module_desktops install mode=build,
156+
# invoked from rootfs-create.sh) needs apt.armbian.com's
157+
# <release>-utils (armbian-config itself) and <release>-desktop
158+
# (firefox, chromium, gnome-branded bits) components to be reachable
159+
# while the rootfs is being assembled. Default to "no" (repo ON)
160+
# and let boards/userpatches opt out explicitly if they still need
161+
# the repo-free rootfs behaviour for whatever reason.
162+
declare -g SKIP_ARMBIAN_REPO="${SKIP_ARMBIAN_REPO:-no}"
157163
declare -g -r SKIP_ARMBIAN_REPO # make it readonly to ensure sanity if hooks try to change it
158164

159165
track_general_config_variables "in artifact_rootfs_cli_adapter_config_prep"

0 commit comments

Comments
 (0)