From 4db63c062727c2093dc70537af53b868b6203207 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Sat, 4 Apr 2020 16:06:27 +0200
Subject: [PATCH] main/devicepkg-dev: install modules-load.conf/modprobe.conf 
 (!1124)

Many device ports install extra modules-load.conf/modprobe.conf
configurations. Simplify this a bit by installing these automatically
to appropriate locations in the file system.
---
 main/devicepkg-dev/APKBUILD             |  4 ++--
 main/devicepkg-dev/devicepkg_package.sh | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index 6861cf7d7..08d4d7a50 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,5 +1,5 @@
 pkgname="devicepkg-dev"
-pkgver=0.11.3
+pkgver=0.12.0
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -62,7 +62,7 @@ package() {
 }
 sha512sums="d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
 332f693abfb3260ad6c1ef5d245062af8cc8eedba7db360d54db5a7fcf7b301a37a299a0004e9ff4de80b5dfcd260d0cd0f99f96ed6d56080bb4dea81116cc82  devicepkg_build.sh
-5ac4a5087c598582cb12278a4ce0c2dccfe7f91c1620d3328d1d0944c89eff81f8afcc681506d73a80d69615401f96a99fb1fdaa755fea101e0d36ec6ef2d5d0  devicepkg_package.sh
+10bda1a999891d6234bcfa3eb277b125c02361a031c5ff8445dabaae11e289321a6227f9f0973c7aa143a3df0512399bd0e3b2aa5a8ee560b28e1b135bad8635  devicepkg_package.sh
 69dad4bde05377ec235d72789c80cdfbdaa5a19b97defe9d4c19e0e12aa2c081d6dcf19fb80ebe33c2d6539ce8a39d36d98413404852d6bb2d56cc75d2f1ee95  downstreamkernel_prepare.sh
 8a6a0afa6e499b59c5433194298d13eb07712c4344e1dd4f71fdc34a2836950a12247c61aa7563bd646efff6118b377ceb387f09170282896809a160b3d9cd04  downstreamkernel_package.sh
 cf5ee240cd1c1e9d30cdec833b4a007fd2e00f9a32ba3f265f99aa2e3dd3601cf43c08d3f3e01bade1d5b2648a6754b2f236e5cb4a9945e18e5c4e97aa2ed7c8  devicepkg_subpackage_kernel.sh
diff --git a/main/devicepkg-dev/devicepkg_package.sh b/main/devicepkg-dev/devicepkg_package.sh
index 9aa74d839..86ad28625 100644
--- a/main/devicepkg-dev/devicepkg_package.sh
+++ b/main/devicepkg-dev/devicepkg_package.sh
@@ -31,3 +31,13 @@ if [ -f "$srcdir/initfs-hook.sh" ]; then
 	install -Dm644 "$srcdir/initfs-hook.sh" \
 		"$pkgdir/etc/postmarketos-mkinitfs/hooks/00-$pkgname.sh"
 fi
+
+if [ -f "$srcdir/modules-load.conf" ]; then
+	install -Dm644 "$srcdir/modules-load.conf" \
+		"$pkgdir/etc/modules-load.d/00-$pkgname.conf"
+fi
+
+if [ -f "$srcdir/modprobe.conf" ]; then
+	install -Dm644 "$srcdir/modprobe.conf" \
+		"$pkgdir/etc/modprobe.d/$pkgname.conf"
+fi