From 7213fd54ca31766eeb1e82920765b2f885ce4499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Fri, 28 Jul 2023 13:11:54 +0200
Subject: [PATCH] main/devicepkg-dev: use modules-initfs to install modules
 into initramfs (MR 4169)

Since the modules are going to be installed into the initfs, it makes
sense to use a more verbose naming for the file. Otherwise there's the
risk of getting confused with other type of module files that exist in
device packages.

Fixes 65be0d7e81895801e5995866568316ceb4f39cb5
---
 main/devicepkg-dev/APKBUILD                       | 6 +++---
 main/devicepkg-dev/devicepkg_package.sh           | 4 ++--
 main/devicepkg-dev/devicepkg_subpackage_kernel.sh | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index 13f2aa9c6..00315e2a7 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=devicepkg-dev
-pkgver=0.15.2
+pkgver=0.15.3
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -62,10 +62,10 @@ package() {
 sha512sums="
 d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
 54b369ff87e017114edae03986dec79742280c55a156a98ea8c6a1c740632e904e51c01810e7dac99add0d9d06c0fcebb040fed595348f180233b3ec810443ba  devicepkg_build.sh
-626573802ad713e61194c9215e9b4dc6f521604b79c6aa4fe2eba4bc5ecf894b874110b7d310f4a49391a949bae80abcf0a4a3117b8a577a7c01bca7c51a54a3  devicepkg_package.sh
+33e3ce8fde0989ec3e367055199625de7c131c4b1f8a72cefc13bfde96604ff440afe2519d357827a3fe43c90b34736cf455b6f886a25f1217464457d8e94905  devicepkg_package.sh
 f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6  downstreamkernel_prepare.sh
 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe  downstreamkernel_package.sh
-30382c01e7f75165e98f1693143bdda08aacd733658a06640ad7c7ad0a8c2aff1b3aaa82d2b6a45749feaf131ff58c74b3c1f57755f72be5b2b26a55da2ad313  devicepkg_subpackage_kernel.sh
+6e64a78dcb768fe7d40e9eeef6147084567168a3f3238b836bd518adb48c9d2bfeb6e96a4bde0d47cc4a69d8dba680631612aff4f6393a44b3bd9d4bf5ac9608  devicepkg_subpackage_kernel.sh
 9bb7f2a0930f397a713e9f4b6d5b83a426d9a2a3f692dcc42ac30717bf26ead869d8823a38f3ad388af12b2b9a02e8ec4d4418e9c2062389ed06d2b891a49ff3  deviceinfo
 136247a16ec91dc0c7241eeddb28c2196ae3b29946a9bc7e9566f848491ef1c53b12d05bf2dbc1cc352986712fd76f25c1510bcc8f301af540a2f01c33b299e1  expected-deviceinfo-downstream
 8cdbf149e1bdfaf4d4a246a208732836956fd81a3aa01ef968e4c2e2cca4027f71cfc38e22debade83ddfca4e05267983c1c8a9c1aa9461a8cf493ef7e893097  expected-deviceinfo-mainline
diff --git a/main/devicepkg-dev/devicepkg_package.sh b/main/devicepkg-dev/devicepkg_package.sh
index b574b88d7..bf0c47906 100644
--- a/main/devicepkg-dev/devicepkg_package.sh
+++ b/main/devicepkg-dev/devicepkg_package.sh
@@ -35,8 +35,8 @@ fi
 
 # All the installation paths for the modules conflict with those from
 # devicepkg_subpackage_kernel. See comment there for details
-if [ -f "$srcdir/modules" ]; then
-	install -Dm644 "$srcdir/modules" \
+if [ -f "$srcdir/modules-initfs" ]; then
+	install -Dm644 "$srcdir/modules-initfs" \
 		"$pkgdir/usr/share/mkinitfs/modules/00-$pkgname.modules"
 	mkdir -p "$pkgdir/usr/share/mkinitfs/files"
 	echo "/usr/share/mkinitfs/modules/00-$pkgname.modules:/lib/modules/initramfs.load" \
diff --git a/main/devicepkg-dev/devicepkg_subpackage_kernel.sh b/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
index c9bd3d9aa..70d8cce82 100644
--- a/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
+++ b/main/devicepkg-dev/devicepkg_subpackage_kernel.sh
@@ -28,8 +28,8 @@ 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.
-if [ -f "$srcdir/modules.$kernel" ]; then
-	install -Dm644 "$srcdir/modules.$kernel" \
+if [ -f "$srcdir/modules-initfs.$kernel" ]; then
+	install -Dm644 "$srcdir/modules-initfs.$kernel" \
 		"$subpkgdir/usr/share/mkinitfs/modules/00-$pkgname.modules"
 	mkdir -p "$subpkgdir/usr/share/mkinitfs/files"
 	echo "/usr/share/mkinitfs/modules/00-$pkgname.modules:/lib/modules/initramfs.load" \