From fee85c8ee026b39478800a2c55fc159c0e82c686 Mon Sep 17 00:00:00 2001 From: Nikita Travkin Date: Thu, 23 Sep 2021 17:39:33 +0500 Subject: [PATCH] samsung-matissevewifi: drop wifi suffix, use msm-firmware-loader (MR 2431) --- .../APKBUILD | 12 +++--- .../deviceinfo | 4 +- .../modprobe.conf | 0 .../firmware-samsung-matisseve/APKBUILD | 27 +++++++++++++ .../firmware-samsung-matissevewifi/APKBUILD | 38 ------------------- 5 files changed, 35 insertions(+), 46 deletions(-) rename device/testing/{device-samsung-matissevewifi => device-samsung-matisseve}/APKBUILD (67%) rename device/testing/{device-samsung-matissevewifi => device-samsung-matisseve}/deviceinfo (91%) rename device/testing/{device-samsung-matissevewifi => device-samsung-matisseve}/modprobe.conf (100%) create mode 100644 device/testing/firmware-samsung-matisseve/APKBUILD delete mode 100644 device/testing/firmware-samsung-matissevewifi/APKBUILD diff --git a/device/testing/device-samsung-matissevewifi/APKBUILD b/device/testing/device-samsung-matisseve/APKBUILD similarity index 67% rename from device/testing/device-samsung-matissevewifi/APKBUILD rename to device/testing/device-samsung-matisseve/APKBUILD index 4f2df04e8..019ca30fa 100644 --- a/device/testing/device-samsung-matissevewifi/APKBUILD +++ b/device/testing/device-samsung-matisseve/APKBUILD @@ -1,8 +1,8 @@ # Reference: -pkgname=device-samsung-matissevewifi -pkgdesc="Samsung Galaxy Tab 4 10.1 WiFi (SM-T533)" -pkgver=3 -pkgrel=3 +pkgname=device-samsung-matisseve +pkgdesc="Samsung Galaxy Tab 4 10.1" +pkgver=4 +pkgrel=0 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -22,12 +22,12 @@ package() { nonfree_firmware() { pkgdesc="GPU/WiFi/BT/Video firmware" - depends="linux-firmware-qcom firmware-samsung-matissevewifi-venus firmware-samsung-matissevewifi-wcnss" + depends="linux-firmware-qcom msm-firmware-loader firmware-samsung-matisseve-wcnss-nv" mkdir "$subpkgdir" } sha512sums=" -9af2cabce802db12f46e55e71c5518a2aaa83a9a5cc1a5d627a6ffd08e19d59fe647599ddcc4c7ee999bc8a6fa6da5481694040f972025bdeaad344b5dcb4dc0 deviceinfo +fce55e16d1e6b944b9f1e35b02371c36994c1d29fcc2812584115b9e9e94079a11d3bf91a1e269b29cc7db941ae8b30e3ee741c39997477b447983087d5feab8 deviceinfo d61d5de91025782fd65d257b17418de8b72f05853f72a40a5d3889f098c8bb82a7c90696b980e9e276e0b8f57b5137ea7348b5d8dc30f519c42f3af2956d2318 modprobe.conf " diff --git a/device/testing/device-samsung-matissevewifi/deviceinfo b/device/testing/device-samsung-matisseve/deviceinfo similarity index 91% rename from device/testing/device-samsung-matissevewifi/deviceinfo rename to device/testing/device-samsung-matisseve/deviceinfo index 75b54540d..caa373a00 100644 --- a/device/testing/device-samsung-matissevewifi/deviceinfo +++ b/device/testing/device-samsung-matisseve/deviceinfo @@ -2,9 +2,9 @@ # Please use double quotes only. You can source this file in shell scripts. deviceinfo_format_version="0" -deviceinfo_name="Samsung Galaxy Tab 4 10.1 WiFi (SM-T533)" +deviceinfo_name="Samsung Galaxy Tab 4 10.1" deviceinfo_manufacturer="Samsung" -deviceinfo_codename="samsung-matissevewifi" +deviceinfo_codename="samsung-matisseve" deviceinfo_year="2015" deviceinfo_dtb="qcom/apq8016-samsung-matissevewifi" deviceinfo_append_dtb="true" diff --git a/device/testing/device-samsung-matissevewifi/modprobe.conf b/device/testing/device-samsung-matisseve/modprobe.conf similarity index 100% rename from device/testing/device-samsung-matissevewifi/modprobe.conf rename to device/testing/device-samsung-matisseve/modprobe.conf diff --git a/device/testing/firmware-samsung-matisseve/APKBUILD b/device/testing/firmware-samsung-matisseve/APKBUILD new file mode 100644 index 000000000..5b159db74 --- /dev/null +++ b/device/testing/firmware-samsung-matisseve/APKBUILD @@ -0,0 +1,27 @@ +pkgname=firmware-samsung-matisseve +pkgver=1 +pkgrel=0 +pkgdesc="Firmware for Samsung Galaxy Tab 4 10.1 WiFi (SM-T533)" +url="https://github.com/rvlander/glowing-journey" +subpackages="$pkgname-wcnss-nv:wcnss_nv" +arch="aarch64" +license="proprietary" +options="!check !strip !archcheck !tracedeps pmb:cross-native" +source="https://github.com/rvlander/glowing-journey/files/4313897/stm533-blobs.tar.gz" + +_fwdir="/lib/firmware/postmarketos" + +package() { + # parent package is empty + mkdir -p "$pkgdir" +} + +wcnss_nv() { + pkgdesc="Samsung Galaxy Tab 4 10.1 WiFi (SM-T533) WiFi/BT firmware configuration" + cd "$srcdir/blobs" + install -Dm644 WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima +} + +sha512sums=" +9ab5c22904adfad8032c4f9c3abefdfc34ccbd8f26d9fa1d69c57bf76dcb0c054eb82f110cbc5f4431e2fb1d002312cc6ec3a15991f526c13d0edc85dc598e14 stm533-blobs.tar.gz +" diff --git a/device/testing/firmware-samsung-matissevewifi/APKBUILD b/device/testing/firmware-samsung-matissevewifi/APKBUILD deleted file mode 100644 index 262d0ddfd..000000000 --- a/device/testing/firmware-samsung-matissevewifi/APKBUILD +++ /dev/null @@ -1,38 +0,0 @@ -pkgname=firmware-samsung-matissevewifi -pkgver=1 -pkgrel=0 -pkgdesc="Firmware for Samsung Galaxy Tab 4 10.1 WiFi (SM-T533)" -url="https://github.com/rvlander/glowing-journey" -subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss" -arch="aarch64" -license="proprietary" -options="!check !strip !archcheck !tracedeps pmb:cross-native" -source="https://github.com/rvlander/glowing-journey/files/4313897/stm533-blobs.tar.gz" - -_fwdir="/lib/firmware/postmarketos" - -package() { - # parent package is empty - mkdir -p "$pkgdir" -} - -modem() { - pkgdesc="Samsung Galaxy Tab 4 10.1 (SM-T533) modem firmware" - install -Dm644 "$srcdir"/blobs/mba.mbn -t "$subpkgdir/$_fwdir" - install -Dm644 "$srcdir"/blobs/modem.* -t "$subpkgdir/$_fwdir" -} - -venus() { - pkgdesc="Samsung Galaxy Tab 4 10.1 (SM-T533) video firmware" - install -Dm644 "$srcdir"/blobs/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8 -} - -wcnss() { - pkgdesc="Samsung Galaxy Tab 4 10.1 WiFi (SM-T533) WiFi/BT firmware" - cd "$srcdir/blobs" - install -Dm644 wcnss.* -t "$subpkgdir/$_fwdir" - install -Dm644 WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima -} - - -sha512sums="9ab5c22904adfad8032c4f9c3abefdfc34ccbd8f26d9fa1d69c57bf76dcb0c054eb82f110cbc5f4431e2fb1d002312cc6ec3a15991f526c13d0edc85dc598e14 stm533-blobs.tar.gz"