Skip to content

Commit 37aa056

Browse files
committed
Hotfix: Fix bootstrap script failing in stable
This brings the fix from #499 to stable.
1 parent cec7439 commit 37aa056

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ To automatically install Opkg, Entware and Toltec, make sure your device is conn
1919

2020
```sh
2121
wget http://toltec-dev.org/bootstrap
22-
echo "2d1233271e0cc8232e86827bcb37ab2a44be2c5675cd15f32952614916ae246a bootstrap" | sha256sum -c && bash bootstrap
22+
echo "aa808c87fae9a9ad8c5f264044f8d770f7cd8ac07f96d2c5df648f7a20856d3d bootstrap" | sha256sum -c && bash bootstrap
2323
```
2424

2525
> **Warning:**

package/toltec-bootstrap/package

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ timestamp=2021-10-06T07:51Z
1010
section="utils"
1111
maintainer="Eeems <eeems@eeems.email>"
1212
license=MIT
13+
# NOTE: The following dependencies will NOT be honored during bootstrap
14+
# and will only be available after the install is completed
1315
installdepends=(coreutils-tsort)
1416

1517
source=(

scripts/bootstrap/bootstrap

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ main() {
153153
# Remove those binaries in any case when the script exits
154154
trap cleanup EXIT
155155

156-
# Download and install the latest toltec-bootstrap package to load toltecctl
156+
# Download and install the latest toltec-bootstrap package (without
157+
# its dependencies) to use toltecctl definitions
157158
local pkg_basename
158159
pkg_basename="$(
159160
wget --quiet "$toltec_remote/Packages" -O - \
@@ -162,7 +163,8 @@ main() {
162163
local pkg_filename="/tmp/$pkg_basename"
163164
wget --no-verbose "$toltec_remote/$pkg_basename" -O "$pkg_filename"
164165

165-
opkg install --add-arch rmall:200 --offline-root / "$pkg_filename"
166+
opkg install --add-arch rmall:200 --offline-root / --force-depends \
167+
"$pkg_filename" > /dev/null 2>&1
166168
rm "$pkg_filename"
167169

168170
# shellcheck source=../../package/toltec-bootstrap/toltecctl
@@ -235,8 +237,8 @@ main() {
235237
opkg install "$@"
236238
fi
237239

238-
# Reinstall toltec-bootstrap to mark toltecctl file as managed
239-
# and set the user’s PATH in configure
240+
# Reinstall toltec-bootstrap to mark its files as managed,
241+
# to install its dependencies, and to set the user’s PATH
240242
opkg install toltec-bootstrap
241243
log "After each system upgrade, run 'toltecctl reenable' to re-enable Toltec"
242244
}

0 commit comments

Comments
 (0)