From 3374c505d27dedfecf89424fa72d52b93f5d05f1 Mon Sep 17 00:00:00 2001 From: Salvatore Stella Date: Sat, 23 Sep 2023 08:36:01 +0200 Subject: [PATCH 1/6] linux-stracciatella: update sources to RM1XX_5.4.70_v1.3.4 --- package/linux-stracciatella/package | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-stracciatella/package b/package/linux-stracciatella/package index 74111f4a7..0d917a5f4 100644 --- a/package/linux-stracciatella/package +++ b/package/linux-stracciatella/package @@ -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-2 -timestamp=2022-09-26T21:23:39Z +pkgver=5.4.70-3 +timestamp=2023-09-23T00:12:00Z section="kernel" maintainer="Salvatore Stella " makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev build:kmod) @@ -15,8 +15,8 @@ license=GPL-2.0-only flags=(nostrip) installdepends=(kernelctl) image=base:v2.3 -source=(https://github.com/Etn40ff/linux-remarkable/archive/41121ea10ed2235c441cfe717461988859d7f5b6.tar.gz) -sha256sums=(ade87a10bfa7069222cbf8eb1d00ca460d38aab9685223d2fa3ee4f363a75cfa) +source=(https://github.com/Etn40ff/linux-remarkable/archive/43e6ecde21e2392514c85e06f53b923ec8b7a298.tar.gz) +sha256sums=(222504797152251f875ca30085a49a89ea621cb89881e1fad1640e312030bdf9) build() { if [[ $arch = rm1 ]]; then From 5f20e97c01745a2fd39e97e75848e072245bef98 Mon Sep 17 00:00:00 2001 From: Salvatore Stella Date: Tue, 26 Sep 2023 23:38:29 +0200 Subject: [PATCH 2/6] Bump build image to v3.1 --- package/linux-stracciatella/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/linux-stracciatella/package b/package/linux-stracciatella/package index 0d917a5f4..8babab0cb 100644 --- a/package/linux-stracciatella/package +++ b/package/linux-stracciatella/package @@ -14,7 +14,7 @@ makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:l license=GPL-2.0-only flags=(nostrip) installdepends=(kernelctl) -image=base:v2.3 +image=base:v3.1 source=(https://github.com/Etn40ff/linux-remarkable/archive/43e6ecde21e2392514c85e06f53b923ec8b7a298.tar.gz) sha256sums=(222504797152251f875ca30085a49a89ea621cb89881e1fad1640e312030bdf9) From bb772ce203284064670c7d638e38832baa5f7105 Mon Sep 17 00:00:00 2001 From: Salvatore Stella Date: Wed, 27 Sep 2023 00:40:01 +0200 Subject: [PATCH 3/6] Add wireguard module to linux-stracciatella --- package/linux-stracciatella/package | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/package/linux-stracciatella/package b/package/linux-stracciatella/package index 8babab0cb..9f16f8ebd 100644 --- a/package/linux-stracciatella/package +++ b/package/linux-stracciatella/package @@ -6,7 +6,7 @@ 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 +pkgver=5.4.70-4 timestamp=2023-09-23T00:12:00Z section="kernel" maintainer="Salvatore Stella " @@ -15,8 +15,25 @@ license=GPL-2.0-only flags=(nostrip) installdepends=(kernelctl) image=base:v3.1 -source=(https://github.com/Etn40ff/linux-remarkable/archive/43e6ecde21e2392514c85e06f53b923ec8b7a298.tar.gz) -sha256sums=(222504797152251f875ca30085a49a89ea621cb89881e1fad1640e312030bdf9) +_wireguard_version=1.0.20220627 +source=( + https://github.com/Etn40ff/linux-remarkable/archive/1b466a1023d16c6d54f096a51106cf1258ef1c86.tar.gz + "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz" +) +sha256sums=( + 8afd907cdfab7d786c812a85e1f954327910594074bdfe285fa95ded07c114f5 + 362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0 +) +noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz") + +prepare() { + 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" +} build() { if [[ $arch = rm1 ]]; then From 82f587e673f151d36259374cdfbc1af4a343d5c4 Mon Sep 17 00:00:00 2001 From: Salvatore Stella Date: Wed, 27 Sep 2023 00:49:16 +0200 Subject: [PATCH 4/6] Lint --- package/linux-stracciatella/package | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package/linux-stracciatella/package b/package/linux-stracciatella/package index 9f16f8ebd..355304cde 100644 --- a/package/linux-stracciatella/package +++ b/package/linux-stracciatella/package @@ -17,22 +17,22 @@ installdepends=(kernelctl) image=base:v3.1 _wireguard_version=1.0.20220627 source=( - https://github.com/Etn40ff/linux-remarkable/archive/1b466a1023d16c6d54f096a51106cf1258ef1c86.tar.gz - "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz" + https://github.com/Etn40ff/linux-remarkable/archive/1b466a1023d16c6d54f096a51106cf1258ef1c86.tar.gz + "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz" ) sha256sums=( - 8afd907cdfab7d786c812a85e1f954327910594074bdfe285fa95ded07c114f5 - 362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0 + 8afd907cdfab7d786c812a85e1f954327910594074bdfe285fa95ded07c114f5 + 362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0 ) noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz") prepare() { - 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" + 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" } build() { From 70031b427caed9b8f2223dad6e7f6394cf5e8b2a Mon Sep 17 00:00:00 2001 From: Salvatore Stella Date: Wed, 27 Sep 2023 10:04:04 +0200 Subject: [PATCH 5/6] Move wireguard config out of sources --- package/linux-stracciatella/package | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/linux-stracciatella/package b/package/linux-stracciatella/package index 355304cde..8f5bb5f21 100644 --- a/package/linux-stracciatella/package +++ b/package/linux-stracciatella/package @@ -6,7 +6,7 @@ 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-4 +pkgver=5.4.70-3 timestamp=2023-09-23T00:12:00Z section="kernel" maintainer="Salvatore Stella " @@ -17,22 +17,25 @@ installdepends=(kernelctl) image=base:v3.1 _wireguard_version=1.0.20220627 source=( - https://github.com/Etn40ff/linux-remarkable/archive/1b466a1023d16c6d54f096a51106cf1258ef1c86.tar.gz + https://github.com/Etn40ff/linux-remarkable/archive/43e6ecde21e2392514c85e06f53b923ec8b7a298.tar.gz "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz" ) sha256sums=( - 8afd907cdfab7d786c812a85e1f954327910594074bdfe285fa95ded07c114f5 + 222504797152251f875ca30085a49a89ea621cb89881e1fad1640e312030bdf9 362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0 ) noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz") 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() { From 64ae0cd669bbebb4754e3bfbc2aef1f84ae03648 Mon Sep 17 00:00:00 2001 From: Salvatore Stella Date: Tue, 28 Nov 2023 10:34:50 +0100 Subject: [PATCH 6/6] Remove debug symbols --- package/linux-stracciatella/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-stracciatella/package b/package/linux-stracciatella/package index 8f5bb5f21..e0fe100eb 100644 --- a/package/linux-stracciatella/package +++ b/package/linux-stracciatella/package @@ -17,11 +17,11 @@ installdepends=(kernelctl) image=base:v3.1 _wireguard_version=1.0.20220627 source=( - https://github.com/Etn40ff/linux-remarkable/archive/43e6ecde21e2392514c85e06f53b923ec8b7a298.tar.gz + 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=( - 222504797152251f875ca30085a49a89ea621cb89881e1fad1640e312030bdf9 + 2075b9eb69172751b3e8e0d3a40d63c0c05982e79a2724ed7c3bdfc4f7988eea 362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0 ) noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz")