Commit 465162d
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
| 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