Skip to content

Commit e0f0af8

Browse files
authored
Merge branch 'testing' into package/perf/initial
2 parents 2aed7f5 + 809c86d commit e0f0af8

File tree

2 files changed

+31
-8
lines changed

2 files changed

+31
-8
lines changed

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=2023-04-16T20:53:38Z
7+
timestamp=2023-08-27T02:39:10Z
88
maintainer="raisjn <[email protected]>"
99
license=MIT
1010
url="https://github.com/ddvk/remarkable2-framebuffer"
11-
pkgver=1:0.0.31-2
11+
pkgver=1:0.0.32-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-
c27081be9b4fa000e41489b42d53fb8254bd8bf348a34756799488827dbc0f0b
26+
603eef1688a8c3adb1df23f4f00fe12b80938fe99801b515cd74f84c8cede5b1
2727
SKIP
2828
SKIP
2929
SKIP

package/linux-stracciatella/package

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,39 @@
44

55
archs=(rm1 rm2)
66
pkgnames=(linux-stracciatella linux-stracciatella-perf)
7-
pkgver=5.4.70-2
8-
timestamp=2022-09-26T21:23:39Z
7+
pkgdesc="RemarkableAS's vanilla kernel with a few extra flakes"
8+
url=https://github.com/Etn40ff/linux-remarkable
9+
pkgver=5.4.70-4
10+
timestamp=2023-09-23T00:12:00Z
11+
section="kernel"
912
maintainer="Salvatore Stella <[email protected]>"
1013
makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev build:kmod build:python-is-python3)
1114
license=GPL-2.0-only
1215
flags=(nostrip)
16+
installdepends=(kernelctl)
17+
image=base:v3.1
18+
_wireguard_version=1.0.20220627
19+
source=(
20+
https://github.com/Etn40ff/linux-remarkable/archive/c908b16d6b848964ecc9b116a024f247c290a1bf.tar.gz
21+
"https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz"
22+
)
23+
sha256sums=(
24+
2075b9eb69172751b3e8e0d3a40d63c0c05982e79a2724ed7c3bdfc4f7988eea
25+
362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0
26+
)
27+
noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz")
1328

14-
image=base:v2.3
15-
source=(https://github.com/Etn40ff/linux-remarkable/archive/41121ea10ed2235c441cfe717461988859d7f5b6.tar.gz)
16-
sha256sums=(ade87a10bfa7069222cbf8eb1d00ca460d38aab9685223d2fa3ee4f363a75cfa)
29+
prepare() {
30+
# Jury-rig the wireguard module into sources and enable it
31+
mkdir "$srcdir/net/wireguard"
32+
bsdtar --strip-components 2 -xJ -C "$srcdir/net/wireguard" \
33+
-f "$srcdir/wireguard-linux-compat-$_wireguard_version.tar.xz" \
34+
"wireguard-linux-compat-$_wireguard_version/src"
35+
sed -i "/^obj-\\\$(CONFIG_NETFILTER).*+=/a obj-\$(CONFIG_WIREGUARD) += wireguard/" "$srcdir/net/Makefile"
36+
sed -i "/^if INET\$/a source \"net/wireguard/Kconfig\"" "$srcdir/net/Kconfig"
37+
echo "CONFIG_WIREGUARD=m" >> "$srcdir/arch/arm/configs/zero-gravitas_defconfig"
38+
echo "CONFIG_WIREGUARD=m" >> "$srcdir/arch/arm/configs/zero-sugar_defconfig"
39+
}
1740

1841
build() {
1942
if [[ $arch = rm1 ]]; then

0 commit comments

Comments
 (0)