Skip to content

Commit

Permalink
Stable merge for week 4 of 2024 (#830)
Browse files Browse the repository at this point in the history
### New Packages
- `move-logs-to-opt` - 0.0.1-1 (#821)
  - Move log files to `/opt` to avoid filling up the root partition.
- `oxide-extra` and `liboxide-dev` - 2.7-3 (#760)

### Updated Packages
- `folly` - 0.0.1-4 (#823)
- `koreader` - 2024.01-1 (#826)
- `linux-stracciatella` - 5.4.70.4-1 (#808)
- `oxide`,  `oxide-utils`, `inject_evdev`, and `liboxide` - 2.7-3 (#760)
- `puzzles` - 0.2.4-4 (#785)
- `rm2-suspend-fix` - 0.0.0-3 (#821)
- `genie` - 0.1.7-1 (#825)
- `harmony` - 0.2.3-1 (#825)
- `iago` - 0.1.2-1 (#825)
- `remux` - 0.3.0-1 (#825)
- `simple` - 0.2.1-1 (#825)
- `tilem` - 0.1.1-1 (#764)
- `toltec-base` - 1.3-1 (#806)
- `yaft` - 0.1.1 (#763)
- `zoneinfo-utils` - 2023c-1 (#702)
- `rmfakecloud-proxy` - 0.0.3-5 (#757 #831)

### Packages removed
- `erode`, `tarnish`, `decay`, and `corrupt`
  - Replaced by `oxide`
- `fret`, and `anxiety`
  - Replaced by `oxide-extra`
- `rot`
  - Replaced by `oxide-utils`
  • Loading branch information
Eeems authored May 21, 2024
1 parent a4a7a44 commit 80ec826
Show file tree
Hide file tree
Showing 22 changed files with 256 additions and 176 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-20.04
runs-on: ubuntu-22.04
steps:
- name: Check labels
run: |
Expand Down
6 changes: 3 additions & 3 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-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
Expand All @@ -16,15 +16,15 @@ jobs:
run: make lint
pr:
name: Check that it builds without error
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: lint
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
- name: Setup Toltec dependencies
uses: ./.github/actions/setup
- name: Build packages
run: make repo-new FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}'
run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new
- name: Save the build output
uses: actions/upload-artifact@v3
with:
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-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
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-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ RECIPES=$(shell ls package/)
RECIPES_PUSH=$(foreach app, $(RECIPES), $(app)-push)
RECIPES_CLEAN=$(foreach app, $(RECIPES), $(app)-clean)

ifeq ($(RUNNER_DEBUG), 1)
FLAGS+= --verbose
endif

define USAGE
Building packages:

Expand Down
4 changes: 2 additions & 2 deletions package/folly/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
pkgnames=(folly)
pkgdesc="Z-machine interpreter for interactive fiction"
url="https://github.com/bkirwi/folly"
pkgver=0.0.1-3
pkgver=0.0.1-4
timestamp=2022-04-18T17:50:16Z
section=games
maintainer="Ben Kirwin <ben@kirw.in>"
license=MIT
installdepends=(display)
makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang)
makedepends=(build:libclang-14-dev build:clang-14 build:llvm-14-dev)

image=rust:v2.3

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=2023.10-2
timestamp=2023-10-30T17:19:28Z
pkgver=2024.01-1
timestamp=2024-01-11T17:16:35Z
section="readers"
maintainer="raisjn <of.raisjn@gmail.com>"
license=AGPL-3.0-or-later
Expand All @@ -21,7 +21,7 @@ source=(
koreader
)
sha256sums=(
fdb72bdb80c74b6c955ffde8852ce67b77ebc7d88ceb4a439b622aff74ad858e
2616c7f0c63d54810f4ec78477ecb5dac2443990c7d2c8188c577ad5d925cca1
SKIP
SKIP
SKIP
Expand Down
8 changes: 4 additions & 4 deletions package/linux-stracciatella/package
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ archs=(rm1 rm2)
pkgnames=(linux-stracciatella)
pkgdesc="RemarkableAS's vanilla kernel with a few extra flakes"
url=https://github.com/Etn40ff/linux-remarkable
pkgver=5.4.70-3
timestamp=2023-09-23T00:12:00Z
pkgver=5.4.70.4-1
timestamp=2023-12-28T22:42:42Z
section="kernel"
maintainer="Salvatore Stella <etn45p4m@gmail.com>"
makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev build:kmod)
Expand All @@ -17,11 +17,11 @@ installdepends=(kernelctl)
image=base:v3.1
_wireguard_version=1.0.20220627
source=(
https://github.com/Etn40ff/linux-remarkable/archive/c908b16d6b848964ecc9b116a024f247c290a1bf.tar.gz
"https://github.com/Etn40ff/linux-remarkable/archive/refs/tags/${pkgver%-*}.tar.gz"
"https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz"
)
sha256sums=(
2075b9eb69172751b3e8e0d3a40d63c0c05982e79a2724ed7c3bdfc4f7988eea
29fd9d7adcb243b841d3577088dd2aec6106eaaa3bc51440411f49ea50658c01
362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0
)
noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz")
Expand Down
56 changes: 56 additions & 0 deletions package/move-logs-to-opt/package
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#!/usr/bin/env bash
# Copyright (c) 2023 The Toltec Contributors
# SPDX-License-Identifier: MIT

pkgnames=(move-logs-to-opt)
pkgdesc="Move log files to /opt to save space on the root partition"
url=https://github.com/toltec-dev/toltec
pkgver=0.0.1-1
timestamp=2024-01-07T23:55Z
section="utils"
maintainer="Eeems <eeems@eeems.email>"
license=MIT

source=(var-log.mount)
sha256sums=(SKIP)

package() {
mkdir -p "$pkgdir"/opt/var/log
install -D -m 644 -t "$pkgdir"/lib/systemd/system/ "$srcdir"/var-log.mount
}

configure() {
systemctl daemon-reload
if is-active systemd-journald.service; then
journalctl --sync --flush
systemctl stop systemd-journald.service
fi
if ! mountpoint -q /var/log; then
echo "Moving log files to new location"
local target_path=/home/root/.entware/var/log
mkdir -p "$target_path"
cp -af "/var/log/." "$target_path"
rm -rf "/var/log/"*
fi
if ! is-enabled "var-log.mount"; then
systemctl enable "var-log.mount"
fi
systemctl restart "var-log.mount"
systemctl start systemd-journald.service
}

preremove() {
if is-active systemd-journald.service; then
journalctl --sync --flush
systemctl stop systemd-journald.service
fi
disable-unit "var-log.mount"
}

postremove() {
systemctl daemon-reload
systemctl start systemd-journald.service
if mountpoint -q /var/log; then
umount -l /var/log
fi
}
15 changes: 15 additions & 0 deletions package/move-logs-to-opt/var-log.mount
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[Unit]
Description=Bind mount '/home/root/.entware/var/log' over '/var/log'
DefaultDependencies=no
Conflicts=umount.target
Before=local-fs.target umount.target systemd-journald.service
After=home.mount

[Mount]
What=/home/root/.entware/var/log
Where=/var/log
Type=none
Options=bind

[Install]
WantedBy=local-fs.target
Loading

0 comments on commit 80ec826

Please sign in to comment.