device/testing/device-hisense-m470bsa/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-hisense-m470bsa"
 pkgdesc="Hisense Sero 7 Pro"
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -20,8 +20,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/01-$pkgname.conf
 	install -Dm644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
 }

device/testing/device-lg-hammerhead/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Martijn Braam <martijn@brixit.nl>
 pkgname=device-lg-hammerhead
 pkgver=2
-pkgrel=19
+pkgrel=20
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
 arch="armv7"
@@ -27,8 +27,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -D -m644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
 	install -D -m644 "$srcdir"/brcmfmac4339-sdio.txt \
 		"$pkgdir"/lib/firmware/brcm/brcmfmac4339-sdio.txt
 }

device/testing/device-medion-kai/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-medion-kai"
 pkgdesc="Lenovo Medion Lifetab S9714"
 pkgver=0.2
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,9 +21,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
 }
 
 nonfree_firmware() {

device/testing/device-pine64-pinephone/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-pine64-pinephone"
 pkgdesc="PINE64 PinePhone"
 pkgver=0.2
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -86,8 +86,8 @@ c4c57d1627dd451213e1ef20d89de9266cd4edcc2d33a69aa9a1f13e16d9f9742036b69dc149fd91
 ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648  gpsd_device-hook.sh
 aa0b7191548e89ddfc6cf5b1f637c7ee7ab4c2025cbfc6328e7e482e5b179ea072779ca332a18094e3d424708b923c2334210591fc369831426992f540c07abc  90-modem-eg25.rules
 08a019cad26a8cb298e26ab5b9360b90b981d15f8562d434a00762e4ba14e16ae11cf5e516385aa5b428b0e8b310caee1e8ef7a40bafd66ffe8dde3026c6e17e  sun50i-a64-audio.conf
-3cf0f2b0d463c1cf79156facfbddfa7e5bb9dffc54c364e0aa27e4f5e4778ec889febe8aecc819782db4f8423ac3cff2264c8e96c7e4f327519a4c403e087ce1  HiFi
-7071765039f282185d5a5f64912f41f96562785436018b4391f87e68bd9636addac496ebec239f7d82f7ef55401ac0cfe03ec1aebb454bd2eedf5b1251da758f  VoiceCall
+b93d06efb23ab3c715494d79533bdd3e09ebf49b2d2bea4bcaac2a980d33ffa8d6cbe5c6f0673aa63b0fc926e2c50858fb24f23ed1cbaaf715568c33caf983fc  HiFi
+6fc5b8eec52b6d81ff7ff57f96e66eb1f49ae61816ede80ae95c54d696bb25c8c4d9f7c44ea4bee3f7e2fa8e6f3a7a9b997ca9188ccf7f45e85f026b039f7ccd  VoiceCall
 5a1a9c774253e8211cc54f4b3961c4bdc35427726d037b0ecad099915e856590e8267a4a47943ab753772d57261eef89924b407b305b1099a9c4ecd7b5f00b35  eg25.initd
 dc110f617efe28df3001630836c7df0cab20e74e99c4bb9d2c2f86367ae024dd30060e8c051c7be0e66e86f4656bef345189a6c13276808c4301d1a6deb8be7d  setup-modem-audio.sh
 dadfb8ceb7a82fd4a684a0fd4459bfdf0330fccc1d1781dd8549ee9ab5d571b97ee1e5b8dde66ec85e08db410e2d66e63f9da3d0c327ee80bd8303bf81d03eaf  setup-modem-audio.initd"

device/testing/device-pine64-pinephone/ucm/HiFi

@@ -24,14 +24,18 @@ SectionVerb {
 
 		cset "name='Line In Capture Switch' off"
 		cset "name='Mic1 Capture Switch' off"
+		cset "name='Mic1 Boost Volume' 7"
 		cset "name='Mic2 Capture Switch' off"
+		cset "name='Mic2 Boost Volume' 7"
 		cset "name='Mixer Capture Switch' off"
 		cset "name='Mixer Reversed Capture Switch' off"
 		cset "name='ADC Capture Volume' 160"
+		cset "name='ADC Gain Capture Volume' 7"
+		cset "name='AIF1 AD0 Capture Volume' 160"
+		cset "name='AIF1 AD0 Mixer ADC Capture Switch' on"
 		cset "name='AIF2 ADC Mixer ADC Capture Switch' off"
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 		cset "name='AIF2 ADC Mixer AIF2 DAC Rev Capture Switch' off"
-		cset "name='AIF1 AD0 Capture Volume' 160"
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 	]

device/testing/device-pine64-pinephone/ucm/VoiceCall

@@ -25,15 +25,19 @@ SectionVerb {
 
 		cset "name='Line In Capture Switch' off"
 		cset "name='Mic1 Capture Switch' off"
+		cset "name='Mic1 Boost Volume' 7"
 		cset "name='Mic2 Capture Switch' off"
+		cset "name='Mic2 Boost Volume' 7"
 		cset "name='Mixer Capture Switch' off"
 		cset "name='Mixer Reversed Capture Switch' off"
 		cset "name='ADC Capture Volume' 160"
+		cset "name='ADC Gain Capture Volume' 7"
+		cset "name='AIF1 AD0 Capture Volume' 160"
+		cset "name='AIF1 AD0 Mixer ADC Capture Switch' on"
 		cset "name='AIF2 ADC Capture Volume' 160"
 		cset "name='AIF2 ADC Mixer ADC Capture Switch' on"
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 		cset "name='AIF2 ADC Mixer AIF2 DAC Rev Capture Switch' off"
-		cset "name='AIF1 AD0 Capture Volume' 160"
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 	]

device/testing/device-samsung-baffinlite/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-samsung-baffinlite
 pkgdesc="Samsung Galaxy Grand Neo"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,9 +21,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
 }
 
 nonfree_firmware() {

device/testing/device-samsung-golden/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-samsung-golden"
 pkgdesc="Samsung Galaxy S III mini"
 pkgver=1
-pkgrel=4
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -19,7 +19,7 @@ source="
 	deviceinfo
 	kwin.sh
 	downstream/init-usb-hook.sh
-	downstream/modules-load.conf
+	downstream/modules-load-wifi.conf
 	downstream/module-config.conf
 "
 
@@ -41,7 +41,7 @@ kernel_downstream() {
 		"$subpkgdir"/etc/postmarketos-mkinitfs/hooks/00-init_usb.sh
 
 	# WiFi kernel module configuration
-	install -Dm644 "$srcdir"/modules-load.conf \
+	install -Dm644 "$srcdir"/modules-load-wifi.conf \
 		"$subpkgdir"/etc/modules-load.d/00-load-wifi.conf
 	install -Dm644 "$srcdir"/module-config.conf \
 		"$subpkgdir"/etc/modprobe.d/00-module-config.conf
@@ -65,5 +65,5 @@ nonfree_firmware() {
 sha512sums="bd33d9e25ac79fdbfe25a945fd2383a439446bf53af02dd97d8cb4e2807a42e0978722041044f0b0ac0f903f2d130d810b38d9db00e82690642fac311ca2624f  deviceinfo
 685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  kwin.sh
 769f76b2b0dc5279c514181f6cc915c045562df0c1fe08c54b6588d11ff2c75441a3a4f78d6dde669c82e1c572a66bdde475da3e289d334e3255fcf15430c044  init-usb-hook.sh
-61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load.conf
+61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load-wifi.conf
 436900f627e4ec7e8359bfa6b5d0ac98c69cdd3f3b5e68d23354fa87d79beef866afd6c4cf27b97e9b608cce44fe8d116594f3b08520c9c05624bcf58b61c7f1  module-config.conf"

device/testing/device-samsung-i9070/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-samsung-i9070
 pkgver=1
-pkgrel=29
+pkgrel=30
 pkgdesc="Samsung Galaxy S Advance"
 url="https://postmarketos.org"
 arch="armhf"
@@ -23,9 +23,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
 }
 
 nonfree_firmware() {

device/testing/device-samsung-i927/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-samsung-i927"
 pkgdesc="Samsung Captivate Glide"
 pkgver=0.3
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -17,7 +17,6 @@ depends="postmarketos-base
 	pm-utils
 	libdrm-grate
 	mesa-dri-swrast
-	mesa-demos
 	libvdpau-tegra"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -40,9 +39,6 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 
-	install -D -m644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
-
 	install -D -m644 "$srcdir"/HiFi.conf \
 		"$pkgdir"/usr/share/alsa/ucm/wm8994aif1/HiFi.conf
 	install -D -m644 "$srcdir"/Voice.conf \

device/testing/device-samsung-lt01wifi/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-samsung-lt01wifi"
 pkgdesc="Samsung Galaxy Tab 3 8.0"
 pkgver=0.1
-pkgrel=4
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,11 +21,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
-	install -Dm644 "$srcdir"/modprobe.conf \
-		"$pkgdir"/etc/modprobe.d/dhd.conf
 }
 
 nonfree_firmware() {

device/testing/device-samsung-nevisp/APKBUILD

@@ -4,7 +4,7 @@
 pkgname="device-samsung-nevisp"
 pkgdesc="Samsung Galaxy Fame GT-S6810P"
 pkgver=0.2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -21,8 +21,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
 }
 
 nonfree_firmware() {

device/testing/device-samsung-p4wifi/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-samsung-p4wifi"
 pkgdesc="Galaxy Tab 10.1"
 pkgver=0.3
-pkgrel=8
+pkgrel=9
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -33,11 +33,6 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 
-	install -D -m644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
-	install -D -m644 "$srcdir"/modprobe.conf \
-		"$pkgdir"/etc/modprobe.d/00-$pkgname.conf
-
 	install -D -m644 "$srcdir"/HiFi \
 		"$pkgdir"/usr/share/alsa/ucm/wm8994aif1/HiFi
 	install -D -m644 "$srcdir"/wm8994aif1.conf \

device/testing/device-semc-anzu/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-semc-anzu
 pkgdesc="Xperia Arc"
 pkgver=1
-pkgrel=12
+pkgrel=13
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -22,8 +22,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
 }
 
 nonfree_firmware() {

device/testing/device-sony-castor-windy/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: opendata26 <ctatlor97@gmail.com>
 pkgname=device-sony-castor-windy
 pkgver=1
-pkgrel=22
+pkgrel=23
 pkgdesc="Sony Xperia Z2 Tablet WIFI"
 url="https://postmarketos.org"
 arch="armhf"
@@ -23,8 +23,6 @@ package() {
 		"$pkgdir"/lib/firmware/brcm/brcmfmac4335-sdio.txt
 	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
-	install -D -m644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
 }
 
 nonfree_firmware() {

device/testing/device-sony-sirius/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Craig Tatlor <ctatlor97@gmail.com>
 pkgname=device-sony-sirius
 pkgver=1
-pkgrel=10
+pkgrel=11
 pkgdesc="Sony Xperia Z2 device package"
 url="https://postmarketos.org"
 arch="armv7"
@@ -25,8 +25,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -D -m644 "$srcdir"/modules-load.conf \
-		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
 	install -Dm644 "$srcdir"/99-touch.rules \
 		"$pkgdir"/etc/udev/rules.d/99-touch.rules
 	install -D -m644 "$srcdir"/brcmfmac4339-sdio.txt \

device/testing/device-zuk-z2-row/APKBUILD

@@ -2,7 +2,7 @@
 pkgname="device-zuk-z2-row"
 pkgdesc="Lenovo ZUK Z2 Pro"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -22,9 +22,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -Dm644 "$srcdir/modules-load.conf" \
-		"$pkgdir/etc/modules-load.d/$pkgname.conf"
 }
 
 nonfree_firmware() {

main/devicepkg-dev/APKBUILD

 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

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