Merge branch 'testing' into package/perf/initial

toltec-dev · Dec 6, 2023 · e0f0af8 · e0f0af8
2 parents 2aed7f5 + 809c86d
commit e0f0af8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/package/display/package b/package/display/package
@@ -4,11 +4,11 @@
 
 archs=(rm1 rm2)
 pkgnames=(display rm2fb-client)
-timestamp=2023-04-16T20:53:38Z
+timestamp=2023-08-27T02:39:10Z
 maintainer="raisjn <of.raisjn@gmail.com>"
 license=MIT
 url="https://github.com/ddvk/remarkable2-framebuffer"
-pkgver=1:0.0.31-2
+pkgver=1:0.0.32-1
 _release="${pkgver%-*}"
 _release="v${_release#*:}"
 _libver=1.0.1
@@ -23,7 +23,7 @@ source=(
     rm2fb-preload.env
 )
 sha256sums=(
-    c27081be9b4fa000e41489b42d53fb8254bd8bf348a34756799488827dbc0f0b
+    603eef1688a8c3adb1df23f4f00fe12b80938fe99801b515cd74f84c8cede5b1
     SKIP
     SKIP
     SKIP

diff --git a/package/linux-stracciatella/package b/package/linux-stracciatella/package
@@ -4,16 +4,39 @@
 
 archs=(rm1 rm2)
 pkgnames=(linux-stracciatella linux-stracciatella-perf)
-pkgver=5.4.70-2
-timestamp=2022-09-26T21:23:39Z
+pkgdesc="RemarkableAS's vanilla kernel with a few extra flakes"
+url=https://github.com/Etn40ff/linux-remarkable
+pkgver=5.4.70-4
+timestamp=2023-09-23T00:12:00Z
+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 build:python-is-python3)
 license=GPL-2.0-only
 flags=(nostrip)
+installdepends=(kernelctl)
+image=base:v3.1
+_wireguard_version=1.0.20220627
+source=(
+    https://github.com/Etn40ff/linux-remarkable/archive/c908b16d6b848964ecc9b116a024f247c290a1bf.tar.gz
+    "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz"
+)
+sha256sums=(
+    2075b9eb69172751b3e8e0d3a40d63c0c05982e79a2724ed7c3bdfc4f7988eea
+    362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0
+)
+noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz")
 
-image=base:v2.3
-source=(https://github.com/Etn40ff/linux-remarkable/archive/41121ea10ed2235c441cfe717461988859d7f5b6.tar.gz)
-sha256sums=(ade87a10bfa7069222cbf8eb1d00ca460d38aab9685223d2fa3ee4f363a75cfa)
+prepare() {
+    # Jury-rig the wireguard module into sources and enable it
+    mkdir "$srcdir/net/wireguard"
+    bsdtar --strip-components 2 -xJ -C "$srcdir/net/wireguard" \
+        -f "$srcdir/wireguard-linux-compat-$_wireguard_version.tar.xz" \
+        "wireguard-linux-compat-$_wireguard_version/src"
+    sed -i "/^obj-\\\$(CONFIG_NETFILTER).*+=/a obj-\$(CONFIG_WIREGUARD) += wireguard/" "$srcdir/net/Makefile"
+    sed -i "/^if INET\$/a source \"net/wireguard/Kconfig\"" "$srcdir/net/Kconfig"
+    echo "CONFIG_WIREGUARD=m" >> "$srcdir/arch/arm/configs/zero-gravitas_defconfig"
+    echo "CONFIG_WIREGUARD=m" >> "$srcdir/arch/arm/configs/zero-sugar_defconfig"
+}
 
 build() {
     if [[ $arch = rm1 ]]; then