Skip to content

Commit

Permalink
Merge branch 'testing' into Eeems-patch-10
Browse files Browse the repository at this point in the history
  • Loading branch information
Eeems authored Sep 18, 2024
2 parents 3cd792e + 02cafa5 commit 3e5c0a1
Show file tree
Hide file tree
Showing 20 changed files with 91 additions and 91 deletions.
10 changes: 5 additions & 5 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ runs:
sudo apt-get update -yq
echo "aptVersion=libarchive-tools-$(apt-cache policy libarchive-tools | grep -oP '(?<=Candidate:\s)(.+)')" >> $GITHUB_ENV
- name: Cache Apt packages
uses: actions/cache@v3
uses: actions/cache@v4
id: cache-apt
with:
path: ~/.aptcache
Expand All @@ -26,7 +26,7 @@ runs:
sudo cp --verbose --force --recursive ~/.aptcache/* /
fi
- name: Cache shfmt
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /usr/local/bin/shfmt
key: 43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be
Expand All @@ -44,7 +44,7 @@ runs:
sudo chmod a+x "$install_dir"/shfmt
fi
- name: Cache Shellcheck
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /usr/local/bin/shellcheck
key: 64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8
Expand All @@ -68,11 +68,11 @@ runs:
sudo mv shellcheck "$install_dir"
fi
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Cache Python environment
uses: actions/cache@v3
uses: actions/cache@v4
id: cache-python
with:
path: .venv
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Toltec dependencies
uses: ./.github/actions/setup
- name: Check formatting
Expand All @@ -20,13 +20,13 @@ jobs:
needs: lint
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Toltec dependencies
uses: ./.github/actions/setup
- name: Build packages
run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new
- name: Save the build output
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: repo
path: build/repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Toltec dependencies
uses: ./.github/actions/setup
- name: Build packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Toltec dependencies
uses: ./.github/actions/setup
- name: Build packages
Expand Down
1 change: 1 addition & 0 deletions docs/package.md
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ screensharing | Apps for streaming the display between the PC and tablet.
templates | Templates for xochitl notebooks.
splashscreens | Splashscreens for device startup, poweroff, suspend, etc.
utils | System tools and various apps.
writing | Apps for writing text.

If the package does not fit into one of the existing sections, you are free to create a new one and document it here.

Expand Down
13 changes: 5 additions & 8 deletions package/innernet/package
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
#!/usr/bin/env bash
# Copyright (c) 2021 The Toltec Contributors
# Copyright (c) 2024 The Toltec Contributors
# SPDX-License-Identifier: MIT

archs=(rmallos2)
pkgnames=(innernet-client)
pkgdesc="A private network system that uses WireGuard under the hood."
url="https://github.com/tonarino/innernet"
pkgver=1.5.3-3
timestamp=2022-01-31T20:08:43Z
pkgver=1.6.1-1
timestamp=2024-01-19T14:24:40Z
section="utils"
maintainer="plan5 <[email protected]>"
license=MIT
installdepends=(wireguard)
makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang)

image=rust:v2.2.2
image=rust:v3.1
_srcver="v${pkgver%-*}"
source=(
"https://github.com/tonarino/innernet/archive/refs/tags/$_srcver.zip"
)
sha256sums=(
2f7ca1d802d898b1c4fd090cba9e0562a1e80d617b55f23ba596e81c99441a1c
fd9ec6eb75dcc46c818696e7fcb87eb772dc024e0c326360f0f8c473c937c37c
)

prepare() {
Expand All @@ -43,9 +43,6 @@ package() {
install -D -m 700 -t "$pkgdir"/opt/bin "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/innernet
install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir/client/[email protected]"
install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir/client/innernet.target"

# Link /opt/bin/innernet to /opt/bin/inn
ln -s /opt/bin/innernet "$pkgdir"/opt/bin/inn
}

configure() {
Expand Down
6 changes: 3 additions & 3 deletions package/koreader/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
pkgnames=(koreader)
pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats"
url=https://github.com/koreader/koreader
pkgver=2024.04-5
timestamp=2024-04-29T19:56:05Z
pkgver=2024.07-1
timestamp=2024-07-15T16:21:26Z
section="readers"
maintainer="raisjn <[email protected]>"
license=AGPL-3.0-or-later
Expand All @@ -22,7 +22,7 @@ source=(
launcherctl-koreader
)
sha256sums=(
e6b3a5a2c8cde8ca0c469fe542d6e170502fcf39b9a55e4447a7acd02b4a12c0
1040894434421b52076473f7947f139e2c98fcc04b1acadfe29b3362f262f9b7
SKIP
SKIP
SKIP
Expand Down
4 changes: 2 additions & 2 deletions package/launcherctl/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
pkgnames=(launcherctl)
pkgdesc="Manage your installed launcher"
url=https://toltec-dev.org/
pkgver=0.0.2-2
pkgver=0.0.2-1
timestamp=2023-12-18T03:32Z
section="launcher"
section="launchers"
maintainer="Eeems <[email protected]>"
license=MIT
installdepends=('findutils' 'xochitl')
Expand Down
4 changes: 2 additions & 2 deletions package/linux-mainline/package
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ archs=(rm2)
pkgnames=(linux-mainline)
pkgdesc="reMarkable 2 kernel based on the mainline kernel"
url=https://www.kernel.org
pkgver=6.3.0-1
pkgver=6.3.0-2
timestamp=2023-08-23T21:50:09Z
section=kernel
maintainer="Alistair Francis <[email protected]>"
Expand All @@ -15,7 +15,7 @@ installdepends=(kernelctl)
license=GPL-2.0-only
flags=(nostrip)

image=base:v2.3
image=base:v3.2
source=(
https://github.com/alistair23/linux/archive/1698a3bdd8d66e58873c5bb3ce370b7d48b004cf.tar.gz
remarkable_defconfig
Expand Down
8 changes: 4 additions & 4 deletions package/micro/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
pkgnames=(micro)
pkgdesc="Modern and intuitive terminal-based text editor"
url=https://micro-editor.github.io/
pkgver=2.0.13-2
timestamp=2023-10-21T22:38:29Z
pkgver=2.0.14-1
timestamp=2024-08-27T18:13:07Z
section="utils"
maintainer="Eeems <[email protected]>"
license=MIT

source=("https://github.com/zyedidia/micro/releases/download/v2.0.13/micro-2.0.13-linux-arm.tar.gz")
sha256sums=(adb9cf644354a5c85819db40e1a427f0f4951b172597bbcd3ef94ecc4a8c4b75)
source=("https://github.com/zyedidia/micro/releases/download/v2.0.14/micro-2.0.14-linux-arm.tar.gz")
sha256sums=(9f490d88bd30a548af99a905f50244dc6c80f3c7a3c6f98faeb5b0a7329f7dea)

package() {
install -Dm644 "$srcdir"/LICENSE "$pkgdir/opt/usr/share/licenses/$pkgname/LICENSE"
Expand Down
20 changes: 14 additions & 6 deletions package/mmc-utils/package
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,40 @@ archs=(rmall)
pkgnames=(mmc-utils)
pkgdesc="A tool for monitoring the eMMC protocol"
url=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/
pkgver=1.0-0
pkgver=1.0-1
timestamp=2021-08-12T19:41:07Z
section="devel"
maintainer="Alistair Francis <[email protected]>"
license=GPL-2.0-only

image=base:v2.2
source=(
"https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-7769a4d7abe339ce273c13a203394a79a11fcff9.tar.gz"
0001-Makefile-Remove-Werror.patch
)
sha256sums=(
0578e546d8893b6207180def7966e7314cae54c237a931b8f94779ce5c7d0668
SKIP
)
_commit=7769a4d7abe339ce273c13a203394a79a11fcff9

prepare() {
cd "$srcdir"
mkdir mmc-utils
cd mmc-utils
git init
git fetch --depth=1 "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git" "$_commit"
git checkout -f "$_commit"
patch < "$srcdir"/0001-Makefile-Remove-Werror.patch
}

build() {
# Use our toolchain
export AR=arm-linux-gnueabihf-ar
export CC=arm-linux-gnueabihf-gcc
export STRIP=arm-linux-gnueabihf-strip

patch < "$srcdir"/0001-Makefile-Remove-Werror.patch
make -j4
make -C "$srcdir"/mmc-utils -j4
}

package() {
DESTDIR="$pkgdir" make -C "$srcdir" install
DESTDIR="$pkgdir" make -C "$srcdir"/mmc-utils install
}
19 changes: 8 additions & 11 deletions package/quickjs/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,26 @@
pkgnames=(quickjs)
pkgdesc="A small and embeddable Javascript engine"
url=https://bellard.org/quickjs/
pkgver=2020.11.08-2
pkgver=2024.01.13-1
section="devel"
timestamp=2020-11-08T13:44Z
timestamp=2024-01-13T00:00Z
maintainer="khanhas <[email protected]>"
license=MIT

image=base:v2.1
image=base:v3.1
source=(
https://bellard.org/quickjs/quickjs-2020-11-08.tar.xz
quickjs.patch
https://bellard.org/quickjs/quickjs-2024-01-13.tar.xz
)
sha256sums=(
2e9d63dab390a95ed365238f21d8e9069187f7ed195782027f0ab311bb64187b
SKIP
3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03
)

build() {
patch -u Makefile -i quickjs.patch
make qjs.arm
make CROSS_PREFIX="$CROSS_COMPILE" qjs qjscalc
}

package() {
install -d "$pkgdir"/opt/bin
install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs.arm
mv "$pkgdir"/opt/bin/qjs.arm "$pkgdir"/opt/bin/qjs
install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs
ln -s qjs "$pkgdir"/opt/bin/qjscalc
}
13 changes: 0 additions & 13 deletions package/quickjs/quickjs.patch

This file was deleted.

4 changes: 2 additions & 2 deletions package/sysfs_preload/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
pkgnames=(sysfs_preload)
pkgdesc="A simple preload that forces any calls to /sys/power/state to use systemd instead."
url="https://github.com/Eeems-Org/sysfs_preload"
pkgver=1.0.1-1
pkgver=1.0.1-2
timestamp=2024-06-22T05:19Z
section=util
section=utils
maintainer="Eeems <[email protected]>"
license=MIT

Expand Down
23 changes: 14 additions & 9 deletions package/tilem/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
pkgnames=(tilem)
pkgdesc="TI-84+ calculator emulator"
url=https://github.com/timower/rM2-stuff/tree/master/apps/tilem
_tag=0.1.1
_tag=0.1.2
pkgver=${_tag}-1
timestamp=2023-11-25T20:49:48Z
timestamp=2024-05-29T17:05:56Z
maintainer="Mattéo Delabre <[email protected]>"
license=GPL-3.0
section="utils"
image=base:v3.1
installdepends=(display)
flags=(nostrip)

source=()
sha256sums=()
Expand All @@ -31,14 +32,18 @@ prepare() {
}

build() {
mkdir build
cd "$srcdir"
mkdir install
cd build
cmake -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \
-DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release ../tilem
cd apps/tilem
make
make install
cd tilem
cmake --preset release-toltec
cmake \
--build build/release-toltec \
--target tilem
cmake \
--install build/release-toltec \
--prefix ../install \
--component tilem \
--strip
}

package() {
Expand Down
2 changes: 1 addition & 1 deletion package/toltec-deletions/package
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ archs=(rm1os2 rm1os3 rm2os2 rm2os3)
pkgnames=(toltec-deletions)
pkgdesc="Metapackage to handle package deletions between OS versions"
url=https://toltec-dev.org/
pkgver=0.1-8
pkgver=0.1-9
timestamp=2023-12-03T04:51:58Z
section="utils"
maintainer="Eeems <[email protected]>"
Expand Down
Loading

0 comments on commit 3e5c0a1

Please sign in to comment.