From 2472ae98d3c3d31d9e5e5c768c70c15e6de68585 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 3 Jul 2024 21:35:09 +1000 Subject: [PATCH 1/2] linux-mainline: Update base image and fix build failures Signed-off-by: Alistair Francis --- package/linux-mainline/package | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/linux-mainline/package b/package/linux-mainline/package index 1db253d36..5939125aa 100644 --- a/package/linux-mainline/package +++ b/package/linux-mainline/package @@ -6,7 +6,7 @@ archs=(rm2) pkgnames=(linux-mainline) pkgdesc="reMarkable 2 kernel based on the mainline kernel" url=https://www.kernel.org -pkgver=6.3.0-2 +pkgver=6.3.0-3 timestamp=2023-08-23T21:50:09Z section=kernel maintainer="Alistair Francis " @@ -22,13 +22,13 @@ source=( ) sha256sums=( 647f6a60adad8c4e37eeaf9114c037888cb33923e364bbf5dc0830b2661c21b7 - f4d8cbb2c0e7bff5b151729b45064eb9e95005cb91899f0a9df038343d95ebf2 + c54921f2a8ad02bfec231adf64a1a6eec9306a6ce596ff0c717bc5131b5521a6 ) build() { cp remarkable_defconfig arch/arm/configs/ ARCH=arm make remarkable_defconfig - ARCH=arm make -j8 + ARCH=arm PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ PKG_CONFIG_SYSROOT_DIR="" make -j8 } package() { @@ -40,7 +40,7 @@ package() { cp --no-dereference "$srcdir"/arch/arm/boot/dts/imx7d-remarkable2.dtb \ "$staging"/boot/zero-sugar.dtb - ARCH=arm make -C "$srcdir" modules_install INSTALL_MOD_PATH="$staging" + ARCH=arm PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ PKG_CONFIG_SYSROOT_DIR="" make -C "$srcdir" modules_install INSTALL_MOD_PATH="$staging" rm "$staging"/lib/modules/*/{source,build} # Create the kernel archive From 14faa470819d7ac05e218314ec25b57b42dfe41b Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 5 Mar 2025 21:26:45 +1000 Subject: [PATCH 2/2] linux-mainline: Enable INPUT_UINPUT Enable INPUT_UINPUT as requested [1]. 1: https://github.com/toltec-dev/toltec/pull/904#issuecomment-2336752065 Signed-off-by: Alistair Francis --- package/linux-mainline/remarkable_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/package/linux-mainline/remarkable_defconfig b/package/linux-mainline/remarkable_defconfig index 00af8d735..bfaa505e8 100644 --- a/package/linux-mainline/remarkable_defconfig +++ b/package/linux-mainline/remarkable_defconfig @@ -485,3 +485,4 @@ CONFIG_DEBUG_FS=y # CONFIG_SLUB_DEBUG is not set # CONFIG_SCHED_DEBUG is not set # CONFIG_FTRACE is not set +CONFIG_INPUT_UINPUT=y