Commit ca3f9e9
committed
artifact-rootfs: stop forcing SKIP_ARMBIAN_REPO=yes; default to no
With the new armbian-config-driven desktop install path running
inside rootfs-create.sh (module_desktops install mode="build"),
the rootfs-build chroot needs apt.armbian.com's <release>-utils
and <release>-desktop components reachable: armbian-config itself
lives in -utils, and firefox / chromium / gnome-branded packages
live in -desktop. Forcing SKIP_ARMBIAN_REPO=yes at artifact-rootfs
time meant create_sources_list_and_deploy_repo_key renamed
armbian.sources to armbian.sources.disabled before the desktop
install ran, so every apt install for those packages 404'd and
the rootfs cache shipped without them.
Drop the force. Default is now "no" (repo enabled, components
still intentionally exclude 'main' at this stage — see
distro-specific.sh:295 — so armbian/build's own .debs don't
collide). Boards / userpatches that specifically want the
repo-free rootfs behaviour can still set SKIP_ARMBIAN_REPO=yes
explicitly, and the existing downstream readers (rootfs-image.sh,
distro-specific.sh, bcm2711.conf, change-tracking.sh) honour it
unchanged.
Also fix the inverted documentation in config/boards/README.md:
it claimed SKIP_ARMBIAN_REPO=yes meant "Include (default)" and
no meant "Do NO include", which is the opposite of what the
variable name and all readers in the codebase actually do.1 parent e8caacf commit ca3f9e9
File tree
2 files changed
+12
-6
lines changed- config/boards
- lib/functions/artifacts
2 files changed
+12
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
| 64 | + | |
65 | 65 | | |
66 | | - | |
67 | | - | |
| 66 | + | |
| 67 | + | |
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
151 | 151 | | |
152 | 152 | | |
153 | 153 | | |
154 | | - | |
155 | | - | |
156 | | - | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
157 | 163 | | |
158 | 164 | | |
159 | 165 | | |
| |||
0 commit comments