Skip to content

Fix bootstrap script dep error during toltec-bootstrap install #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matteodelabre merged 1 commit into from
Nov 21, 2021
Merged

Fix bootstrap script dep error during toltec-bootstrap install #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ To automatically install Opkg, Entware and Toltec, make sure your device is conn

```sh
wget http://toltec-dev.org/bootstrap
echo "2d1233271e0cc8232e86827bcb37ab2a44be2c5675cd15f32952614916ae246a bootstrap" | sha256sum -c && bash bootstrap
echo "aa808c87fae9a9ad8c5f264044f8d770f7cd8ac07f96d2c5df648f7a20856d3d bootstrap" | sha256sum -c && bash bootstrap
```

> **Warning:**
Expand Down
2 changes: 2 additions & 0 deletions package/toltec-bootstrap/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ timestamp=2021-10-06T07:51Z
section="utils"
maintainer="Eeems <eeems@eeems.email>"
license=MIT
# NOTE: The following dependencies will NOT be honored during bootstrap
# and will only be available after the install is completed
installdepends=(coreutils-tsort)

source=(
Expand Down
10 changes: 6 additions & 4 deletions scripts/bootstrap/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ main() {
# Remove those binaries in any case when the script exits
trap cleanup EXIT

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

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

# shellcheck source=../../package/toltec-bootstrap/toltecctl
Expand Down Expand Up @@ -235,8 +237,8 @@ main() {
opkg install "$@"
fi

# Reinstall toltec-bootstrap to mark toltecctl file as managed
# and set the user’s PATH in configure
# Reinstall toltec-bootstrap to mark its files as managed,
# to install its dependencies, and to set the user’s PATH
opkg install toltec-bootstrap
log "After each system upgrade, run 'toltecctl reenable' to re-enable Toltec"
}
Expand Down