Skip to content

Commit

Permalink
stable merge for week XX of 2021:
Browse files Browse the repository at this point in the history
new packages:
    [ddvk-hacks] Add ddvk-hacks (toltec-dev#247)

updated packages:
    [wireguard][1.0.20210219] - Updated package (and include wireguard-tools) (toltec-dev#285)
    [rm2fb] update rm2fb to work with xochitl 2.6 (v1.0.1) (toltec-dev#301)
    [recrossable] Update recrossable (toltec-dev#312)
    [wikipedia] Initial wikipedia package.
    [appmarkable] Update appmarkable to 0.0.0-9 and rmservewacominput to 0.3.0-1 (toltec-dev#308) with rm2 support
    [rmkit] patch genie to fix crash in testing (toltec-dev#304)
    [oxide] Update Oxide to v2.1.2 (toltec-dev#241)
    [rm2fb] update rm2fb with wait ioctl and no-op on rM1 (toltec-dev#298)
    [rmkit] add bufshot app, add lamp, add iago, add changelog (toltec-dev#276)
    [rmkit] update rmkit to latest (2021-02-17) (toltec-dev#286)
    [zshelf][0.3.1] - Updated Package (toltec-dev#287)

tooling:
    Pin the Ubuntu version used in workflows to 20.04 (toltec-dev#316)
    Provide better version number error messages (toltec-dev#314)
    util.auto_extract: Extract broken symlinks and missing directories (toltec-dev#302)
    change web background color to #fcfaf8 (toltec-dev#280)
    Implement build-time package dependencies (toltec-dev#274)
    Rewrite repo-build-web in Python (toltec-dev#266)
    Print last 50 lines of output on build error (toltec-dev#263)
    Hardcode REMOTE_HTTP secret in PR workflows (toltec-dev#262)
    Rewrite repo-build and package-build in Python (toltec-dev#218)
    Make bootstrap execution conditional on hash verification (toltec-dev#257)
    Add Toltec web home page (toltec-dev#193)
  • Loading branch information
okay committed Mar 23, 2021
1 parent 5bb5008 commit e3a11cf
Show file tree
Hide file tree
Showing 48 changed files with 1,752 additions and 385 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
check-labels:
name: Check that PRs against the stable branch are labelled correctly
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Check labels
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
jobs:
lint:
name: Check that it conforms to the style guide
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v2
Expand All @@ -20,7 +20,7 @@ jobs:
run: make lint
pr:
name: Check that it builds without error
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
needs: lint
steps:
- name: Checkout the Git repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
stable:
name: Build and publish the stable channel
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
testing:
name: Build and publish the testing channel
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ repo-local:
./scripts/repo_build.py --local $(FLAGS)

repo-new:
./scripts/repo_build.py --no-fetch $(FLAGS)
./scripts/repo_build.py --diff $(FLAGS)

repo-check:
./scripts/repo-check build/repo
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ To automatically install Opkg, Entware and Toltec, run the bootstrap script in a

```sh
$ wget http://toltec-dev.org/bootstrap
$ echo "46f556b06f5624b48e974ae040b6213828eff6aa2cc78618a4d8961a27cdc8b3 bootstrap" | sha256sum -c && bash bootstrap
$ echo "5b494f5b98c4cb5f1d9836f966075026abf48a0cd320a99c026c4b18d76c8a0b bootstrap" | sha256sum -c && bash bootstrap
```

> **Warning:**
Expand Down
42 changes: 36 additions & 6 deletions docs/package.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,44 @@ Note that this may be different from the license of the recipe itself, which is
</tr>
<tr>
<th>Type</th>
<td>Array of strings</td>
<td>Array of dependency specifications (strings)</td>
</tr>
</table>

The list of Toltec or Entware packages that are needed to build, configure and use this package.
Dependency specifications have the following format: `package-name[(<<|<=|=|=>|>>)version]`.
For example, `xochitl`, `oxide=1.2`, and `draft<<2.0` are valid dependency specifications.

*At build time,* all the dependencies of a recipe are offline-installed (i.e., no [install script](#install-section) is run) in the build container’s `$SYSROOT` before its build script is executed (see [below](#build-section)).
For [split packages](#split-packages), only recipe-level dependencies are honoured at this stage.
Circular dependencies are disallowed.

*At install time,* it is guaranteed that all needed packages are unpacked and configured before this package is configured (i.e., before its `configure()` script is run).

A version constraint can be added after each dependency declaration.
Repeat the dependency twice to specify the two ends of a version range.
Version constraints are only checked at install time.

#### `makedepends`

<table>
<tr>
<th>Required?</th>
<td>No, defaults to <code>()</code></th>
</tr>
<tr>
<th>Type</th>
<td>Array of dependency specifications (strings)</td>
</tr>
</table>

A list of package names that must be installed on the device before this package can be configured and used.
The list of Debian, Toltec or Entware packages that are needed only to build this package.
Dependency specifications have the following format: `[host:|build:]package-name`.
For example, `build:autotools` and `libvncserver>=0.9.13` are valid dependency specifications.

See <https://www.debian.org/doc/debian-policy/ch-relationships.html#binary-dependencies-depends-recommends-suggests-enhances-pre-depends>.
*Host-type dependencies* (prefixed with `host:`) are packages from Toltec or Entware that will be installed in the container’s `$SYSROOT` before the recipe’s build script is executed.

*Build-type dependencies* (prefixed with `build:`) are packages from Debian that will be installed in the container’s root system before the recipe’s build script is executed.

#### `conflicts`

Expand All @@ -207,9 +238,8 @@ See <https://www.debian.org/doc/debian-policy/ch-relationships.html#binary-depen
</tr>
</table>

A list of package names that must **NOT** be unpacked at the same time as this package.

See <https://www.debian.org/doc/debian-policy/ch-relationships.html#conflicting-binary-packages-conflicts>.
A list of package names that cannot be installed at the same time as this package.
Note that providing the same functionality as another package is not a sufficient reason for declaring a conflict, unless that package cannot be used in the presence of the other package.

#### `image`

Expand Down
10 changes: 5 additions & 5 deletions package/appmarkable/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
pkgnames=(appmarkable)
pkgdesc="Front-end for apps that do not have a graphical user interface"
url="https://github.com/LinusCDE/appmarkable"
pkgver=0.0.0-8
timestamp=2020-09-07T00:16Z
pkgver=0.0.0-9
timestamp=2021-03-10T18:36Z
section="devel"
maintainer="Linus K. <linus@cosmos-ink.net>"
license=MIT

image=rust:v1.1
source=(https://github.com/LinusCDE/appmarkable/archive/b4226e896f441af9895ed5a4ff183af7f93b11ae.zip)
sha256sums=(0422cee28668d4e7ff554c26884e45ec63feff840eec92e6b8b2e8a7905a9d3b)
image=rust:v1.4
source=(https://github.com/LinusCDE/appmarkable/archive/c44ee87ea2b1f1e41c9592476c076150c9a1acf4.zip)
sha256sums=(76e151aeae0f18b206dd3c6258bf74bcb5256ee2f803e1ed2073278831158f60)

build() {
rm -r .cargo/
Expand Down
9 changes: 1 addition & 8 deletions package/calculator/package
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ timestamp=2020-08-20T12:28Z
section="math"
maintainer="Mattéo Delabre <spam@delab.re>"
license=GPL-3.0-or-later
makedepends=(build:imagemagick build:librsvg2-bin)

image=qt:v1.1
source=(
Expand All @@ -24,14 +25,6 @@ sha256sums=(
)

build() {
# Get needed build packages
export DEBIAN_FRONTEND=noninteractive
apt-get update -y
apt-get install -y \
--no-install-recommends \
-o Dpkg::Options::="--force-confdef" \
imagemagick librsvg2-bin

qmake Calculator.pro
make

Expand Down
180 changes: 180 additions & 0 deletions package/ddvk-hacks/package
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
#!/usr/bin/env bash
# Copyright (c) 2021 The Toltec Contributors
# SPDX-License-Identifier: MIT

pkgnames=(ddvk-hacks)
pkgdesc="Enhance Xochitl with additional features"
url=https://github.com/ddvk/remarkable-hacks
pkgver=17.04-1
timestamp=2020-12-25T14:32Z
section="readers"
maintainer="Mattéo Delabre <spam@delab.re>"
license=MIT
flags=(nostrip)

source=(https://github.com/ddvk/remarkable-hacks/archive/4b75aeaffa2794ff7d4c106c75e47278d5855401.zip)
sha256sums=(41b2e2c3c740c109bc33bb3a2d6db9d52bfe8a282a10029d9da07fa70e0808d3)

_patches_dir="/opt/share/ddvk-hacks"
_xochitl_path="/usr/bin/xochitl"
_work_dir="/home/root/.local/share/ddvk-hacks"
_backup_path="$_work_dir/xochitl.backup"
_old_backup_path="$_backup_path.old"
_patched_path="$_work_dir/xochitl.patched"

package() {
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2113/patch_09
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/22048/patch_10.10
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/22182/patch_11.01
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/23016/patch_12.11
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/23023/patch_13.07
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/23127/patch_14.01
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/24027_rm1/patch_15.1.02
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/24027_rm2/patch_15.2.01
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/24130_rm1/patch_16.1.06
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/24130_rm2/patch_16.2.03
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/25027_rm1/patch_17.1.04
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/25027_rm2/patch_17.2.04
}

configure() {
local build_date
build_date="$(cat /etc/version)"
local patch_version
local device
local original_hash
local xochitl_version

case "$build_date" in
"20201127104549")
patch_version="17.2.04"
device="reMarkable 2"
original_hash="0ed1af968a31e816513d15321bd02b9625ccb073"
xochitl_version="2.5.0.27"
;;
"20201127104105")
patch_version="17.1.04"
device="reMarkable 1"
original_hash="4296b9c6d7a66aadd12e1cf61a13b7b19504673d"
xochitl_version="2.5.0.27"
;;
"20201028164335")
patch_version="16.1.06"
device="reMarkable 1"
original_hash="336529ce6e7ef9d6fadd30872708556ca8711f0b"
xochitl_version="2.4.1.30"
;;
"20201028163830")
patch_version="16.2.03"
device="reMarkable 2"
original_hash="c88d155b7ca8c770240b2c00048968f8445f8115"
xochitl_version="2.4.1.30"
;;
"20201016123042")
patch_version="15.2.01"
device="reMarkable 2"
original_hash="797f58ed93d2e22e7d77fcd9de6c6eb5d49a3a7f"
xochitl_version="2.4.0.27"
;;
"20201016123325")
patch_version="15.1.02"
device="reMarkable 1"
original_hash="891e06535c0ae742eeaa3b9a20e9ff03d0f659d3"
xochitl_version="2.4.0.27"
;;
"20200914085553" | "20200914090635")
patch_version="14.01"
device="reMarkable 2"
original_hash="596b02f401fb0ceb6a73df470fbab418b305cdbc"
xochitl_version="2.3.1.27"
;;
"20200904144143")
patch_version="13.07"
device="reMarkable 2"
original_hash="7eb1ed8b75b1b282fd4ecf30ef19118d3a41fcc7"
xochitl_version="2.3.0.23"
;;
"20200709160645")
patch_version="12.11"
device="reMarkable 1"
original_hash="005b05ef64f079aaf377d373cb7e2889a2aa774a"
xochitl_version="2.3.0.16"
;;
"20200805214933")
patch_version="11.01"
device="reMarkable 2"
original_hash="c7d965972a5a6d2bf8503b1b09b52a89c422505b"
xochitl_version="2.2.1.82"
;;
"20200528081414")
patch_version="10.10"
device="reMarkable 1"
original_hash="7e92c177df685972a699db6c4a7a918296447f74"
xochitl_version="2.2.0.48"
;;
"20200320131825")
patch_version="09"
device="reMarkable 1"
original_hash="c8661fbd74a049134509dc22da415bb651d7feac"
xochitl_version="2.1.1.3"
;;
*)
echo
echo "Error: The version the device is running is not supported, yet."
echo "Build date: $build_date"
echo
exit 1
;;
esac

echo
echo "Device: $device"
echo "Xochitl version: $xochitl_version"
echo "Patch version: $patch_version"
echo

if ! sha1sum -c <(echo "$original_hash $_xochitl_path") > /dev/null 2>&1; then
echo "Error: Invalid Xochitl checksum"
echo "Maybe ddvk-hacks are already installed?"
echo
exit 1
fi

if [[ -f "$_backup_path" ]]; then
mv "$_backup_path" "$_old_backup_path"
fi

mkdir -p "$(dirname "$_backup_path")"
cp "$_xochitl_path" "$_backup_path"

echo "Patching Xochitl"
bspatch "$_backup_path" "$_patched_path" "$_patches_dir"/patch_"$patch_version"
cp "$_patched_path" "$_xochitl_path"
rm -rf /home/root/.cache/remarkable/xochitl/qmlcache/*

echo "Please restart Xochitl to use the patches"
echo
}

_restore() {
echo
echo "Restoring the original Xochitl binary"

if ! diff "$_xochitl_path" "$_patched_path" > /dev/null 2>&1; then
echo "Warning: Xochitl binary has changed!"
echo "Not restoring the backup"
else
cp "$_backup_path" "$_xochitl_path"
rm -rf /home/root/.cache/remarkable/xochitl/qmlcache/*
fi

echo
}

preremove() {
_restore
}

preupgrade() {
_restore
}
2 changes: 1 addition & 1 deletion package/draft/package
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ maintainer="Mattéo Delabre <spam@delab.re>"
license=Apache-2.0
depends=(xochitl)

image=qt:v1.1
image=qt:v1.3.2
source=(
https://github.com/dixonary/draft-reMarkable/archive/5bd660a2fd07eba166c6110d2b48cfc58ee67e58.zip
draft.service
Expand Down
7 changes: 2 additions & 5 deletions package/evtest/package
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@ timestamp=2020-12-30T02:52Z
section="utils"
maintainer="Linus K. <linus@cosmos-ink.net>"
license=GPL-2.0-only
makedepends=(build:automake)

image=base:v1.2.1
source=(https://gitlab.freedesktop.org/libevdev/evtest/-/archive/evtest-1.34/evtest-evtest-1.34.zip)
source=("https://gitlab.freedesktop.org/libevdev/evtest/-/archive/evtest-${pkgver%-*}/evtest-evtest-${pkgver%-*}.zip")
sha256sums=(62f7e34c5bab91b5015de5b056d79051c677c5bd5702facb2885f8e4ba0df84c)

build() {
apt-get update
apt-get install -y autoconf

export CC=arm-linux-gnueabihf-gcc

./autogen.sh --host armv7
./configure --host armv7
make
Expand Down
Loading

0 comments on commit e3a11cf

Please sign in to comment.