Skip to content

Commit 94c486b

Browse files
EeemsEeems
authored
Merge branch 'testing' into package/perf/initial
2 parents e909c5b + 68fbf4d commit 94c486b

File tree

17 files changed

+161
-46
lines changed

17 files changed

+161
-46
lines changed

‎.github/actions/setup/action.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ runs:
88
sudo apt-get update -yq
99
echo "aptVersion=libarchive-tools-$(apt-cache policy libarchive-tools | grep -oP '(?<=Candidate:\s)(.+)')" >> $GITHUB_ENV
1010
- name: Cache Apt packages
11-
uses: actions/cache@v2
11+
uses: actions/cache@v3
1212
id: cache-apt
1313
with:
1414
path: ~/.aptcache
@@ -26,7 +26,7 @@ runs:
2626
sudo cp --verbose --force --recursive ~/.aptcache/* /
2727
fi
2828
- name: Cache shfmt
29-
uses: actions/cache@v2
29+
uses: actions/cache@v3
3030
with:
3131
path: /usr/local/bin/shfmt
3232
key: 43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be
@@ -44,7 +44,7 @@ runs:
4444
sudo chmod a+x "$install_dir"/shfmt
4545
fi
4646
- name: Cache Shellcheck
47-
uses: actions/cache@v2
47+
uses: actions/cache@v3
4848
with:
4949
path: /usr/local/bin/shellcheck
5050
key: 64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8
@@ -68,7 +68,7 @@ runs:
6868
sudo mv shellcheck "$install_dir"
6969
fi
7070
- name: Cache Python environment
71-
uses: actions/cache@v2
71+
uses: actions/cache@v3
7272
id: cache-python
7373
with:
7474
path: ${{ env.pythonLocation }}

‎.github/workflows/pr.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77
runs-on: ubuntu-20.04
88
steps:
99
- name: Checkout the Git repository
10-
uses: actions/checkout@v2
10+
uses: actions/checkout@v3
1111
- name: Setup Python
12-
uses: actions/setup-python@v2
12+
uses: actions/setup-python@v4
1313
with:
1414
python-version: '3.8'
1515
- name: Setup Toltec dependencies
@@ -24,17 +24,17 @@ jobs:
2424
needs: lint
2525
steps:
2626
- name: Checkout the Git repository
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
2828
- name: Setup Python
29-
uses: actions/setup-python@v2
29+
uses: actions/setup-python@v4
3030
with:
3131
python-version: '3.8'
3232
- name: Setup Toltec dependencies
3333
uses: ./.github/actions/setup
3434
- name: Build packages
3535
run: make repo-new FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}'
3636
- name: Save the build output
37-
uses: actions/upload-artifact@v2
37+
uses: actions/upload-artifact@v3
3838
with:
3939
name: repo
4040
path: build/repo

‎.github/workflows/stable.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
runs-on: ubuntu-20.04
1010
steps:
1111
- name: Checkout the Git repository
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313
- name: Setup Python
14-
uses: actions/setup-python@v2
14+
uses: actions/setup-python@v4
1515
with:
1616
python-version: '3.8'
1717
- name: Setup Toltec dependencies

‎.github/workflows/testing.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
runs-on: ubuntu-20.04
1010
steps:
1111
- name: Checkout the Git repository
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313
- name: Setup Python
14-
uses: actions/setup-python@v2
14+
uses: actions/setup-python@v4
1515
with:
1616
python-version: '3.8'
1717
- name: Setup Toltec dependencies

‎package/ddvk-hacks/package‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ archs=(rm1 rm2)
66
pkgnames=(ddvk-hacks)
77
pkgdesc="Enhance Xochitl with additional features"
88
url=https://github.com/ddvk/remarkable-hacks
9-
pkgver=38.03-1
10-
timestamp=2022-10-18T16:35:20Z
9+
pkgver=39.01-1
10+
timestamp=2022-11-09T18:31:51Z
1111
section="readers"
1212
maintainer="Mattéo Delabre <spam@delab.re>"
1313
license=MIT
1414
flags=(nostrip)
1515

16-
source=(https://github.com/ddvk/remarkable-hacks/archive/49a6117b2a9ae3d5116069670702e7aa28ed1584.zip)
17-
sha256sums=(099d65801eda0e38a7f65a40659d32d1b37239deb2a3c4a896e37a7ed0b4f0a4)
16+
source=(https://github.com/ddvk/remarkable-hacks/archive/90e7e3e7ffc269373de191085453be50c9f8da0c.zip)
17+
sha256sums=(d3b1413bb9219804581afab598e7f5308233e7467d64e8084e67aae7346beaba)
1818

1919
_patches_dir="/opt/share/ddvk-hacks"
2020
_xochitl_path="/usr/bin/xochitl"
@@ -42,6 +42,7 @@ package() {
4242
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2143977_rm1/patch_36.1.01
4343
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21431047_rm1/patch_37.1.01
4444
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21501067_rm1/patch_38.1.03
45+
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21511189_rm1/patch_39.1.01
4546
elif [[ $arch = rm2 ]]; then
4647
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/26171_rm2/patch_19.2.02
4748
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/26275_rm2/patch_20.2.03
@@ -63,6 +64,7 @@ package() {
6364
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2143977_rm2/patch_36.2.01
6465
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21431047_rm2/patch_37.2.01
6566
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21501067_rm2/patch_38.2.03
67+
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21511189_rm2/patch_39.2.01
6668
fi
6769
}
6870

@@ -76,6 +78,11 @@ configure() {
7678
if [[ $arch = rm1 ]]; then
7779
device="reMarkable 1"
7880
case "$build_date" in
81+
"20221026103859")
82+
patch_version="39.1.01"
83+
original_hash="1c01bae469a2e29846c68758e2cae4a2b8b5055d"
84+
xochitl_version="2.15.1.1189"
85+
;;
7986
"20221003074737")
8087
patch_version="38.1.03"
8188
original_hash="a3ce408c8a717d48746e361336532924f5ff40f2"
@@ -172,6 +179,11 @@ configure() {
172179
elif [[ $arch = rm2 ]]; then
173180
device="reMarkable 2"
174181
case "$build_date" in
182+
"20221026104022")
183+
patch_version="39.2.01"
184+
original_hash="64e3cb3d05aec4a40624ebfc730e480358e1b184"
185+
xochitl_version="2.15.1.1189"
186+
;;
175187
"20221003075633")
176188
patch_version="38.2.03"
177189
original_hash="fcd3c84215c5457d455419831760304736f3b694"

‎package/kernelctl/force_reinstall_on_toltecctl_reenable‎

Whitespace-only changes.

‎package/kernelctl/kernelctl‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ help() {
2525
${bf} list ${sf}List available kernels.
2626
${bf} show ${sf}Show the current configured kernel.
2727
${bf} delete <kernel> ${sf}Delete kernel from the staging dir. WARNING this is irreversible.
28+
${bf} prune ${sf}Delete all backups of vanilla kernels older than the one that shipped with the current software version. WARNING this is irreversible.
2829
${bf} set <kernel> ${sf}Change booting kernel.
2930
3031
${bf} <kernel> ${sf}Kernel name or number (from 'list' command) or "default" to revert to the upstram kernel.
@@ -66,7 +67,11 @@ get_kernel_names() {
6667

6768
# get current kernel
6869
get_current_kernel_name() {
69-
current_kernel_name=$(find "$kernelctl_dir" -samefile "$kernelctl_dir"/current.tar.bz2 ! -name current.tar.bz2 -print0 | xargs -0 -I"{}" basename {} .tar.bz2)
70+
if [[ -e "$kernelctl_dir"/current.tar.bz2 ]]; then
71+
current_kernel_name=$(find "$kernelctl_dir" -samefile "$kernelctl_dir"/current.tar.bz2 ! -name current.tar.bz2 -print0 | xargs -0 -I"{}" basename {} .tar.bz2)
72+
else
73+
current_kernel_name=''
74+
fi
7075
}
7176

7277
# translate input into a kernel name
@@ -103,8 +108,12 @@ list() {
103108
# show the current configured kernel
104109
show() {
105110
get_current_kernel_name
106-
echo -e "${gr}Current kernel:${sf}"
107-
echo -e " ${bf}${current_kernel_name}${sf}"
111+
if [[ "$current_kernel_name" = "" ]]; then
112+
echo -e "${bf}There is no link to the current running kernel in the staging area.${sf}"
113+
else
114+
echo -e "${gr}Current kernel:${sf}"
115+
echo -e " ${bf}${current_kernel_name}${sf}"
116+
fi
108117
}
109118

110119
# actually switch kernels
@@ -171,6 +180,18 @@ delete() {
171180
fi
172181
}
173182

183+
prune() {
184+
echo "Deleting backups of old vanilla kernel(s) from the staging area is irreversible."
185+
echo -n "Do you want to proceed? [N/y]: "
186+
read -r ans
187+
if [[ "$ans" = "y" || "$ans" = "Y" ]]; then
188+
mapfile -t filenames < <(find "$kernelctl_dir" -path "*vanilla-*.tar.bz2" ! -name vanilla-"$(< /etc/version)".tar.bz2)
189+
for filename in "${filenames[@]}"; do
190+
rm "$filename"
191+
done
192+
fi
193+
}
194+
174195
if [[ $0 = "${BASH_SOURCE[0]}" ]]; then
175196
if [[ $# -eq 0 ]]; then
176197
help
@@ -211,6 +232,9 @@ if [[ $0 = "${BASH_SOURCE[0]}" ]]; then
211232
fi
212233
delete "$1"
213234
;;
235+
prune)
236+
prune
237+
;;
214238
*)
215239
echo -e "Error: Invalid command '$action'\n"
216240
help

‎package/kernelctl/package‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,29 @@
55
pkgnames=(kernelctl)
66
pkgdesc="Manage aftermarket kernels"
77
url=https://toltec-dev.org/
8-
pkgver=0.1-2
9-
timestamp=2022-03-14T00:00Z
8+
pkgver=0.1-5
9+
timestamp=2022-11-12T00:00Z
1010
section="utils"
1111
maintainer="Salvatore Stella <etn45p4m@gmail.com>"
1212
license=MIT
1313

1414
source=(
1515
kernelctl
16-
force_reinstall_on_toltecctl_reenable
1716
)
1817
sha256sums=(
1918
SKIP
20-
SKIP
2119
)
2220

2321
package() {
22+
touch "$srcdir"/emptyfile
2423
install -D -m 744 -t "$pkgdir"/opt/bin "$srcdir"/kernelctl
2524
install -d "$pkgdir"/opt/usr/share/kernelctl
26-
install -D -m 666 -t "$pkgdir"/usr/share/kernelctl/ "$srcdir"/force_reinstall_on_toltecctl_reenable
25+
install -D -m 666 -t "$pkgdir"/usr/share/toltec/reenable.d/kernelctl "$srcdir"/emptyfile
2726
}
2827

2928
configure() {
3029
if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$(< /etc/version)")" == "" ]]; then
31-
read -r -d '' msg <<- EOM
32-
It looks like there is no backup of the upstream kernel for the
33-
installed version of codex.
34-
35-
Please standby while one is produced (assuming that the
36-
currently running kernel is upstream).
37-
EOM
38-
echo -e "$msg"
30+
echo "Creating a backup of the currently running kernel."
3931
kernelctl backup vanilla
4032
fi
4133
}

‎package/linux-mainline/package‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ archs=(rm2)
66
pkgnames=(linux-mainline)
77
pkgdesc="reMarkable 2 kernel based on the mainline kernel"
88
url=https://www.kernel.org
9-
pkgver=5.19.0-1
9+
pkgver=6.0.0-1
1010
timestamp=2022-05-22T21:50:09Z
1111
section=kernel
1212
maintainer="Alistair Francis <alistair@alistair23.me>"
@@ -15,8 +15,8 @@ license=GPL-2.0-only
1515
flags=(nostrip)
1616

1717
image=base:v2.3
18-
source=("https://github.com/alistair23/linux/archive/6df274810d20448125834115e2181de288fdc8a4.tar.gz")
19-
sha256sums=(a7538198dbef21868d2c52e8b379576c8791726809bd5886176ab88d1f9df49f)
18+
source=("https://github.com/alistair23/linux/archive/4c2ef4e3bba89a8d767eccb85a242b2cd8850146.tar.gz")
19+
sha256sums=(1583d553380a656ecaac8dab89558051e9165983381adc9c3d52fb8ac0ce19fd)
2020

2121
build() {
2222
ARCH=arm make imx_v6_v7_defconfig

‎package/oxide/package‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,22 @@
33
# SPDX-License-Identifier: MIT
44

55
pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry)
6-
pkgver=2.4-1
6+
pkgver=2.4-2
77
_sentryver=0.4.17
88
timestamp=2022-05-22T03:18:32Z
99
maintainer="Eeems <eeems@eeems.email>"
1010
url=https://oxide.eeems.codes
1111
license=MIT
1212
flags=(patch_rm2fb)
1313
image=qt:v2.3
14-
source=("https://github.com/Eeems-Org/oxide/archive/e6c62a6860b52cd1cbd47e21377f8d1ecf72bb0a.tar.gz")
15-
sha256sums=(a29cf455d5f66fee4ee67722c6f1d20627930920286398932c3d5c813d58ebee)
14+
source=(
15+
"https://github.com/Eeems-Org/oxide/archive/e6c62a6860b52cd1cbd47e21377f8d1ecf72bb0a.tar.gz"
16+
toltec-override.conf
17+
)
18+
sha256sums=(
19+
a29cf455d5f66fee4ee67722c6f1d20627930920286398932c3d5c813d58ebee
20+
SKIP
21+
)
1622

1723
build() {
1824
find . -name "*.pro" -type f -print0 \
@@ -84,6 +90,8 @@ tarnish() {
8490
install -D -m 644 -t "$pkgdir"/etc/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.oxide.conf
8591
install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/release/etc/systemd/system/tarnish.service
8692
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/tarnish
93+
install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \
94+
"$srcdir"/toltec-override.conf
8795
}
8896
configure() {
8997
systemctl daemon-reload

0 commit comments

Comments
 (0)