From 612d29d598a4f409cbde7a8dbfca138841ac4ce4 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 4 Apr 2020 16:07:49 +0200 Subject: [PATCH] device-*: remove redundant installation of modules-load.conf/modprobe.conf (!1124) This is now automatically installed in devicepkg_package. [ci:ignore-count]: this should build fine in CI. --- device/testing/device-hisense-m470bsa/APKBUILD | 4 +--- device/testing/device-lg-hammerhead/APKBUILD | 4 +--- device/testing/device-medion-kai/APKBUILD | 5 +---- device/testing/device-samsung-baffinlite/APKBUILD | 5 +---- device/testing/device-samsung-golden/APKBUILD | 8 ++++---- .../{modules-load.conf => modules-load-wifi.conf} | 0 device/testing/device-samsung-i9070/APKBUILD | 5 +---- device/testing/device-samsung-i927/APKBUILD | 5 +---- device/testing/device-samsung-lt01wifi/APKBUILD | 7 +------ device/testing/device-samsung-nevisp/APKBUILD | 4 +--- device/testing/device-samsung-p4wifi/APKBUILD | 7 +------ device/testing/device-semc-anzu/APKBUILD | 4 +--- device/testing/device-sony-castor-windy/APKBUILD | 4 +--- device/testing/device-sony-sirius/APKBUILD | 4 +--- device/testing/device-zuk-z2-row/APKBUILD | 5 +---- 15 files changed, 17 insertions(+), 54 deletions(-) rename device/testing/device-samsung-golden/downstream/{modules-load.conf => modules-load-wifi.conf} (100%) diff --git a/device/testing/device-hisense-m470bsa/APKBUILD b/device/testing/device-hisense-m470bsa/APKBUILD index fc9265529..6bbad6d61 100644 --- a/device/testing/device-hisense-m470bsa/APKBUILD +++ b/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 } diff --git a/device/testing/device-lg-hammerhead/APKBUILD b/device/testing/device-lg-hammerhead/APKBUILD index 49dd8bcba..65bf57b56 100644 --- a/device/testing/device-lg-hammerhead/APKBUILD +++ b/device/testing/device-lg-hammerhead/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Martijn Braam 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 } diff --git a/device/testing/device-medion-kai/APKBUILD b/device/testing/device-medion-kai/APKBUILD index 927a2628a..4a45cd047 100644 --- a/device/testing/device-medion-kai/APKBUILD +++ b/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() { diff --git a/device/testing/device-samsung-baffinlite/APKBUILD b/device/testing/device-samsung-baffinlite/APKBUILD index 409f85651..9db89d1ff 100644 --- a/device/testing/device-samsung-baffinlite/APKBUILD +++ b/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() { diff --git a/device/testing/device-samsung-golden/APKBUILD b/device/testing/device-samsung-golden/APKBUILD index cfcc2fc11..d8a9af01a 100644 --- a/device/testing/device-samsung-golden/APKBUILD +++ b/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" diff --git a/device/testing/device-samsung-golden/downstream/modules-load.conf b/device/testing/device-samsung-golden/downstream/modules-load-wifi.conf similarity index 100% rename from device/testing/device-samsung-golden/downstream/modules-load.conf rename to device/testing/device-samsung-golden/downstream/modules-load-wifi.conf diff --git a/device/testing/device-samsung-i9070/APKBUILD b/device/testing/device-samsung-i9070/APKBUILD index 94613b2f1..db3ed65c7 100644 --- a/device/testing/device-samsung-i9070/APKBUILD +++ b/device/testing/device-samsung-i9070/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Daniele Debernardi 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() { diff --git a/device/testing/device-samsung-i927/APKBUILD b/device/testing/device-samsung-i927/APKBUILD index 3abc8ab82..549940fcc 100644 --- a/device/testing/device-samsung-i927/APKBUILD +++ b/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" @@ -39,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 \ diff --git a/device/testing/device-samsung-lt01wifi/APKBUILD b/device/testing/device-samsung-lt01wifi/APKBUILD index c7a7e44e3..2e438522d 100644 --- a/device/testing/device-samsung-lt01wifi/APKBUILD +++ b/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() { diff --git a/device/testing/device-samsung-nevisp/APKBUILD b/device/testing/device-samsung-nevisp/APKBUILD index d08a267e4..e53544249 100644 --- a/device/testing/device-samsung-nevisp/APKBUILD +++ b/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() { diff --git a/device/testing/device-samsung-p4wifi/APKBUILD b/device/testing/device-samsung-p4wifi/APKBUILD index a44c98e9a..e61f73195 100644 --- a/device/testing/device-samsung-p4wifi/APKBUILD +++ b/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 \ diff --git a/device/testing/device-semc-anzu/APKBUILD b/device/testing/device-semc-anzu/APKBUILD index 8c19d4208..b1aae067f 100644 --- a/device/testing/device-semc-anzu/APKBUILD +++ b/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() { diff --git a/device/testing/device-sony-castor-windy/APKBUILD b/device/testing/device-sony-castor-windy/APKBUILD index 02015e4b9..1afb17d7a 100644 --- a/device/testing/device-sony-castor-windy/APKBUILD +++ b/device/testing/device-sony-castor-windy/APKBUILD @@ -2,7 +2,7 @@ # Contributor: opendata26 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() { diff --git a/device/testing/device-sony-sirius/APKBUILD b/device/testing/device-sony-sirius/APKBUILD index de8cde355..7a7935d34 100644 --- a/device/testing/device-sony-sirius/APKBUILD +++ b/device/testing/device-sony-sirius/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Craig Tatlor 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 \ diff --git a/device/testing/device-zuk-z2-row/APKBUILD b/device/testing/device-zuk-z2-row/APKBUILD index 60b126009..30f388c69 100644 --- a/device/testing/device-zuk-z2-row/APKBUILD +++ b/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() {