From d850a2b2b4190dc68be561a75df72365b14d5197 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Thu, 26 Aug 2021 21:36:40 +0200 Subject: [PATCH] device-qemu-*: add evdev module to initfs (MR 2463) The Alpine LTS kernel builds evdev as a module which means it's not automatically available in the initfs. Including evdev allows osk-sdl to properly recognise physical keyboards, just like on a real device. Fixes: #1204 [ci:skip-build] already built successfully in CI --- device/main/device-qemu-aarch64/APKBUILD | 4 ++-- device/main/device-qemu-aarch64/deviceinfo | 2 +- device/main/device-qemu-amd64/APKBUILD | 4 ++-- device/main/device-qemu-amd64/deviceinfo | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/device/main/device-qemu-aarch64/APKBUILD b/device/main/device-qemu-aarch64/APKBUILD index 7ee7d7526..c44aaf2a9 100644 --- a/device/main/device-qemu-aarch64/APKBUILD +++ b/device/main/device-qemu-aarch64/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Minecrell # Co-Maintainer: Daniele Debernardi pkgname=device-qemu-aarch64 -pkgver=2.2 +pkgver=2.3 pkgrel=1 pkgdesc="Simulated device in QEMU (aarch64)" url="https://postmarketos.org" @@ -72,7 +72,7 @@ kernel_lts() { } sha512sums=" -7f1c24697cebf795e1c997ebcca89837d42c712b7effd105e90e132f1af8f8298ccba2a4912210b83e562baeeee1040a6eca3f9f316243d9d81468dba27cf36b deviceinfo +64de08cf7f017fbb8e7825147e5e5c4520cdb40d6b48a8d57e1097ee2db71d6de45c5b4b83510288f57f58c26fa4646ec359187df228a4f068fe5538fa6e068f deviceinfo 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad mce-display-blanking.conf de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25 weston.ini " diff --git a/device/main/device-qemu-aarch64/deviceinfo b/device/main/device-qemu-aarch64/deviceinfo index cdf615e98..43a1aa075 100644 --- a/device/main/device-qemu-aarch64/deviceinfo +++ b/device/main/device-qemu-aarch64/deviceinfo @@ -6,7 +6,7 @@ deviceinfo_name="QEMU aarch64" deviceinfo_manufacturer="QEMU" deviceinfo_codename="qemu-aarch64" deviceinfo_dtb="" -deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input" +deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input evdev" deviceinfo_arch="aarch64" # Device related diff --git a/device/main/device-qemu-amd64/APKBUILD b/device/main/device-qemu-amd64/APKBUILD index db987bd1f..36d73f7e0 100644 --- a/device/main/device-qemu-amd64/APKBUILD +++ b/device/main/device-qemu-amd64/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Minecrell # Co-Maintainer: Daniele Debernardi pkgname=device-qemu-amd64 -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc="Simulated device in QEMU (x86_64)" url="https://postmarketos.org" @@ -71,7 +71,7 @@ kernel_lts() { } sha512sums=" -a82b7e7a53de0032834f93401a339c075152dd04670e4fa565666538ada268c7e1b156a9990f865e5d629f18fa28326ed528f5bcc91441cf0c263676dcad336e deviceinfo +bb68389ddbbad289881511fde2e75183b8572273bb25b1aec73870b3e3ae37c318c3eeae1bc7a2eade46fb55a35bf6e1d2851b7188e6a43d0d6a84e874f4dab5 deviceinfo 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad mce-display-blanking.conf 47b27c7572b8737988488f7eb23b9e68f9a944e22baafe1c78355d2514a2554cf41d99b29fca12238eb13a6f5d53f00ca89b94e534e8461ebab72256dcf0f142 weston.ini " diff --git a/device/main/device-qemu-amd64/deviceinfo b/device/main/device-qemu-amd64/deviceinfo index 0e7c7b5ce..08e3187d8 100644 --- a/device/main/device-qemu-amd64/deviceinfo +++ b/device/main/device-qemu-amd64/deviceinfo @@ -6,7 +6,7 @@ deviceinfo_name="QEMU amd64" deviceinfo_manufacturer="QEMU" deviceinfo_codename="qemu-amd64" deviceinfo_dtb="" -deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input" +deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input evdev" deviceinfo_arch="x86_64" # Device related