From 22f96f6dba171e1de8447d6adf43dead84e7e5b2 Mon Sep 17 00:00:00 2001 From: Stephan Gerhold Date: Fri, 18 Oct 2024 13:00:29 +0200 Subject: [PATCH] main/postmarketos-initramfs: add missing USB gadget modules (MR 5795) init_functions.sh makes use of the mass_storage and acm USB gadget functions for error reporting, but the necessary kernel modules are not included in the initramfs at the moment. Because of this, the functionality works only on kernels where all these USB gadget functions are built-in and not built as modules. Add the missing modules and fix the sort order while at it. [ci:skip-build]: bug in CI prevents build testing armv7, succeeded locally --- main/postmarketos-initramfs/00-default.modules | 4 +++- main/postmarketos-initramfs/APKBUILD | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/main/postmarketos-initramfs/00-default.modules b/main/postmarketos-initramfs/00-default.modules index 41e941017..1823b3f0d 100644 --- a/main/postmarketos-initramfs/00-default.modules +++ b/main/postmarketos-initramfs/00-default.modules @@ -17,8 +17,10 @@ nls_cp437 nls_iso8859_1 nls_utf8 uinput -usb_f_rndis +usb_f_acm usb_f_ncm +usb_f_mass_storage +usb_f_rndis usb-storage vfat xts diff --git a/main/postmarketos-initramfs/APKBUILD b/main/postmarketos-initramfs/APKBUILD index dfe5ebcf2..1940fc9f2 100644 --- a/main/postmarketos-initramfs/APKBUILD +++ b/main/postmarketos-initramfs/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Caleb Connolly # Co-Maintainer: Clayton Craft pkgname=postmarketos-initramfs -pkgver=3.4.3 +pkgver=3.4.4 pkgrel=0 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra" url="https://postmarketos.org" @@ -101,7 +101,7 @@ package() { } sha512sums=" -20bc7a21f4f59548b8179c5cb1fc2b3db64eb355988bce992db3bc4075d65b4135ff9dd7d754215d0402978811494449cce476a26cda6bb2f0f8b53ae8e36bd7 00-default.modules +911ff425021fb59061cae182ddab3c6fd6e93fb126e2e45ccdb74f73b3d65b0f454f86a533364dc7cdc94f79538aec53a168f2d83c38218dc82a19cb0bf9b244 00-default.modules 9c0e8f6f61d5da191e03a1aa9d5d0ceb5baf1eae6dbb9bfb0af59817783525119ac8394b135f303f7b6434a3eab0b49185fb90379e06823db847a4999c75ce33 00-initramfs-base.dirs c0233d22858a5901db64e1d2fe1f6d39a2e2cfd1b94a10932483f55fed9461e9b8aa2d73b154b9d99a7a8b49ee02abfbddfe917ce0c6d7576601ba2668589c01 00-initramfs-base.files d0f35562365756d93066ce45924d17fb347b54095179c3262daa2f073e12743505cd5d9372ad30485915ca754d95a8edba9a74314e7949e0b3cf6978a87d03a5 00-initramfs-extra-base.files