From b3cb907471c3ae9a9f16edb1a23c32f4edf63b2a Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@postmarketos.org>
Date: Wed, 4 Feb 2026 10:48:15 +0100
Subject: [PATCH] main/devicepkg-dev: add comment about modules-extra-initfs

The package currently handles only modules in modules-initfs, as
modules in modules-extra-initfs are handled automatically through
udev.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7916>
---
 main/devicepkg-dev/APKBUILD                       | 6 +++---
 main/devicepkg-dev/devicepkg_package.sh           | 5 ++++-
 main/devicepkg-dev/devicepkg_subpackage_kernel.sh | 3 +++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index 6eb2f67a0..dabde6ac1 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,6 +1,6 @@
 maintainer=""
 pkgname=devicepkg-dev
-pkgver=0.22.0
+pkgver=0.22.1
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -75,10 +75,10 @@ package() {
 sha512sums="
 d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
 1ed82c638bda2c2edff4f2f314b466a3ce0e8a2a33b05e5f31ddc2b06fc06d2d8ea4dca7cc354262ac28402c90ea36d77b0347fafeccee8894c9ff013911a7d1  devicepkg_build.sh
-72bb56338a2945670594300052fe688b9fa9277fd6cd9857e60f90de4f64b772190535e1579616d8a32e7bbbffde06923ffd89f6c6c63c7de4b4259b52b5a350  devicepkg_package.sh
+a2b9848480e3200d2a4053ce18989e5d711b95abf3e383f5ad67bda5e2e5c1d63c1e9b142d6c02be079a8402197a2049e7008aa0cf90a765ed2ca8ed981b1f63  devicepkg_package.sh
 f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6  downstreamkernel_prepare.sh
 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe  downstreamkernel_package.sh
-2c5147b3a9e4a75ae7ea898732d62252aa18f9ea1fa2889f1211aceefc7acac8e856fa5d53b5d29d010349f5c944cb34f47a3bb7cc055c546442f64a2e28731f  devicepkg_subpackage_kernel.sh
+4b807ea2e773a66f699bba9f76fbb6349b0ca6f6fc6d867b540c2327b304f82d57365a0e9f5b7cae30ad5c5990553162152d1947aca5335a53e641b0c6b08ef6  devicepkg_subpackage_kernel.sh
 ca330f9f6771bdb13fe973c9a57a7718958b515e81ddb8a1ce54c4f8c7ef5907c8ab346e7aa1628e237945fccab0b3b70bf782c00ad318f71f0adcd839c1d966  deviceinfo
 9df20672cd7e6ee836a821cb671ec333beef4dfc1160c81d2afa007d1abe04a27798678a0a9def9ab4e9046e334fe7c4373b453994ffdc852b454db112702a9d  expected-deviceinfo-downstream
 a37dd9e355abf74d47f8e365fcd4876d99ef9a63bbb7be9e529057cb1e91778433d83e99339ee6401003f77cbc40ad3f14562bf9716b107ebad9da84b19ced0d  expected-deviceinfo-mainline
diff --git a/main/devicepkg-dev/devicepkg_package.sh b/main/devicepkg-dev/devicepkg_package.sh
index 8c4052829..80af80926 100644
--- a/main/devicepkg-dev/devicepkg_package.sh
+++ b/main/devicepkg-dev/devicepkg_package.sh
@@ -35,7 +35,10 @@ if [ -f "$srcdir/initfs-hook.sh" ]; then
 fi
 
 # All the installation paths for the modules conflict with those from
-# devicepkg_subpackage_kernel. See comment there for details
+# devicepkg_subpackage_kernel. See comment there for details.  For
+# modules in initramfs-extra, specified in modules-extra-initfs, they
+# are handled by udev, so do not need to be specified in
+# initramfs.load.
 if [ -f "$srcdir/modules-initfs" ]; then
 	install -Dm644 "$srcdir/modules-initfs" \
 		"$pkgdir/usr/share/mkinitfs/modules/00-$pkgname.modules"
diff --git a/main/devicepkg-dev/devicepkg_subpackage_kernel.sh b/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
index c33031de3..3b6190c23 100644
--- a/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
+++ b/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
@@ -30,6 +30,9 @@ kernel=$(echo "$subpkgname" | sed -n "s/.*-kernel-\(.*\)/\1/p" | tr - _)
 # a modules.$kernel file, it should instead be more than one modules.$kernel
 # files, with different $kernel values. The conflict between the package and
 # the subpackage aims to prevent the unsupported situation to slip through.
+# For modules in initramfs-extra, specified in modules-extra-initfs.$kernel,
+# they are handled by udev, so do not need to be specified in
+# initramfs.load.
 if [ -f "$srcdir/modules-initfs.$kernel" ]; then
 	install -Dm644 "$srcdir/modules-initfs.$kernel" \
 		"$subpkgdir/usr/share/mkinitfs/modules/00-$pkgname.modules"