Skip to content

Commit af9bced

Browse files
authored
Merge branch 'testing' into package/perf/initial
2 parents 4a45df8 + b0a9a7c commit af9bced

File tree

4 files changed

+36
-14
lines changed

4 files changed

+36
-14
lines changed

package/ddvk-hacks/package

Lines changed: 17 additions & 5 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=36.01-1
10-
timestamp=2022-09-07T00:05:57+0200
9+
pkgver=37.01-1
10+
timestamp=2022-09-28T20:38:22Z
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/c3ec0b6aa480baaaaf63460c99796f952265bf19.zip)
17-
sha256sums=(7ce383e5be058fa7bd90ec069211a74c737c36ef61a1c767bff9a352963d94a0)
16+
source=(https://github.com/ddvk/remarkable-hacks/archive/9ff935ef09efe4bdb9f9371b84bef21ef1b766e2.zip)
17+
sha256sums=(55818b14839301aa3f8da5ba70ef9de3f92bcab8ea9f72b9c6ab20d27e6b5655)
1818

1919
_patches_dir="/opt/share/ddvk-hacks"
2020
_xochitl_path="/usr/bin/xochitl"
@@ -40,6 +40,7 @@ package() {
4040
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2140861_rm1/patch_34.1.01
4141
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2141866_rm1/patch_35.1.01
4242
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2143977_rm1/patch_36.1.01
43+
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21431047_rm1/patch_37.1.01
4344
elif [[ $arch = rm2 ]]; then
4445
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/26171_rm2/patch_19.2.02
4546
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/26275_rm2/patch_20.2.03
@@ -59,6 +60,7 @@ package() {
5960
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2140861_rm2/patch_34.2.01
6061
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2141866_rm2/patch_35.2.01
6162
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2143977_rm2/patch_36.2.01
63+
install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21431047_rm2/patch_37.2.01
6264
fi
6365
}
6466

@@ -72,14 +74,19 @@ configure() {
7274
if [[ $arch = rm1 ]]; then
7375
device="reMarkable 1"
7476
case "$build_date" in
77+
"20220921102803")
78+
patch_version="37.1.01"
79+
original_hash="011742f027b70f37a0da293132daafcfc82b537d"
80+
xochitl_version="2.14.3.1047"
81+
;;
7582
"20220825122914")
7683
patch_version="36.1.01"
7784
original_hash="a88faec812ae20960bfbab38be0aa49aafec902a"
7885
xochitl_version="2.14.3.977"
7986
;;
8087
"20220617142418")
8188
patch_version="35.1.01"
82-
original_hash="d172016ac8a97ca5df3c551648e0b3314f17f72a"
89+
original_hash="a052dfbe587851d17146e586e4be65819f1360e3"
8390
xochitl_version="2.14.1.866"
8491
;;
8592
"20220615075543")
@@ -158,6 +165,11 @@ configure() {
158165
elif [[ $arch = rm2 ]]; then
159166
device="reMarkable 2"
160167
case "$build_date" in
168+
"20220921101206")
169+
patch_version="37.2.01"
170+
original_hash="47c3ad26651f604be5de901881a8a44f9124a79c"
171+
xochitl_version="2.14.3.1047"
172+
;;
161173
"20220825124750")
162174
patch_version="36.2.01"
163175
original_hash="470e88f8d5fb62f64939fe4ea3b89c515113f7e5"

package/display/package

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
archs=(rm1 rm2)
66
pkgnames=(display rm2fb-client)
7-
timestamp=2022-09-10T09:40:15Z
7+
timestamp=2022-09-17T16:14:01Z
88
maintainer="raisjn <of.raisjn@gmail.com>"
99
license=MIT
1010
url="https://github.com/ddvk/remarkable2-framebuffer"
11-
pkgver=1:0.0.23-1
11+
pkgver=1:0.0.26-1
1212
_release="${pkgver%-*}"
1313
_release="v${_release#*:}"
1414
_libver=1.0.1
@@ -23,7 +23,7 @@ source=(
2323
rm2fb-preload.env
2424
)
2525
sha256sums=(
26-
f29fc4c1683a4833059291ccc1a8b472be1e4cdbdd4f1f3f39317b9e994e840c
26+
dbed22e7e5b8e9f64d64d37301ed53e99ed8369236468bec1bdd03050f2737b2
2727
SKIP
2828
SKIP
2929
SKIP

package/kernelctl/package

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(kernelctl)
66
pkgdesc="Manage aftermarket kernels"
77
url=https://toltec-dev.org/
8-
pkgver=0.1-1
8+
pkgver=0.1-2
99
timestamp=2022-03-14T00:00Z
1010
section="utils"
1111
maintainer="Salvatore Stella <etn45p4m@gmail.com>"
@@ -27,5 +27,15 @@ package() {
2727
}
2828

2929
configure() {
30-
kernelctl backup vanilla
30+
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"
39+
kernelctl backup vanilla
40+
fi
3141
}

package/linux-stracciatella/package

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ archs=(rm1 rm2)
66
pkgnames=(linux-stracciatella)
77
pkgdesc="RemarkableAS's vanilla kernel with a few extra flakes"
88
url=https://github.com/Etn40ff/linux-remarkable
9-
pkgver=5.4.70-1
10-
timestamp=2022-06-26T23:50:04+02:00
9+
pkgver=5.4.70-2
10+
timestamp=2022-09-26T21:23:39Z
1111
section="kernel"
1212
maintainer="Salvatore Stella <etn45p4m@gmail.com>"
1313
makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev build:kmod)
1414
license=GPL-2.0-only
1515
flags=(nostrip)
1616
installdepends=(kernelctl)
1717
image=base:v2.3
18-
source=(https://github.com/Etn40ff/linux-remarkable/archive/c6aa07709109f9b5879628396052f60a97ec9197.tar.gz)
19-
sha256sums=(529fe57ddc25bbaed5f0b3a9f7f79b51ab9ea3388d2acf8a933a8a4c77bd93c0)
18+
source=(https://github.com/Etn40ff/linux-remarkable/archive/41121ea10ed2235c441cfe717461988859d7f5b6.tar.gz)
19+
sha256sums=(ade87a10bfa7069222cbf8eb1d00ca460d38aab9685223d2fa3ee4f363a75cfa)
2020

2121
build() {
2222
if [[ $arch = rm1 ]]; then

0 commit comments

Comments
 (0)