From 6157a01f0f880c69696bef5a51ace760b528e02d Mon Sep 17 00:00:00 2001 From: Raymond Hackley Date: Wed, 18 Oct 2023 09:10:22 +0000 Subject: [PATCH] firmware: use build() instead of unpack() (MR 4493) Some firmware packages has only a WCNSS config file, which is decoded from base64 uploaded to Pastebin, and there is nothing to unpack. [ci:ignore-count] [ci:skip-build]: already built successfully in CI --- device/community/firmware-samsung-a3/APKBUILD | 5 ++--- device/community/firmware-samsung-a5/APKBUILD | 5 ++--- device/community/firmware-samsung-e7/APKBUILD | 5 ++--- device/community/firmware-samsung-grandmax/APKBUILD | 5 ++--- device/community/firmware-samsung-gt510/APKBUILD | 5 ++--- device/community/firmware-samsung-gt58/APKBUILD | 5 ++--- device/community/firmware-xiaomi-wt88047/APKBUILD | 5 ++--- device/testing/firmware-ark-peach/APKBUILD | 5 ++--- device/testing/firmware-huawei-g7/APKBUILD | 5 ++--- device/testing/firmware-huawei-y635/APKBUILD | 5 ++--- device/testing/firmware-samsung-a7/APKBUILD | 5 ++--- device/testing/firmware-samsung-cprime/APKBUILD | 5 ++--- device/testing/firmware-samsung-fortuna3g/APKBUILD | 5 ++--- device/testing/firmware-samsung-fortunaltezt/APKBUILD | 5 ++--- device/testing/firmware-samsung-gprimeltecan/APKBUILD | 5 ++--- device/testing/firmware-samsung-gprimeltexx/APKBUILD | 5 ++--- device/testing/firmware-samsung-gtelwifiue/APKBUILD | 5 ++--- device/testing/firmware-samsung-j3ltetw/APKBUILD | 5 ++--- device/testing/firmware-samsung-j5x/APKBUILD | 5 ++--- device/testing/firmware-samsung-on7/APKBUILD | 5 ++--- 20 files changed, 40 insertions(+), 60 deletions(-) diff --git a/device/community/firmware-samsung-a3/APKBUILD b/device/community/firmware-samsung-a3/APKBUILD index 4f7ea337e..9969dcc83 100644 --- a/device/community/firmware-samsung-a3/APKBUILD +++ b/device/community/firmware-samsung-a3/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-a3 pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy A3 (2015)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/X3t8q7u _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/community/firmware-samsung-a5/APKBUILD b/device/community/firmware-samsung-a5/APKBUILD index 696282cc6..5159be41c 100644 --- a/device/community/firmware-samsung-a5/APKBUILD +++ b/device/community/firmware-samsung-a5/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-a5 pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy A5 (2015)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/br6nKv4 _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/community/firmware-samsung-e7/APKBUILD b/device/community/firmware-samsung-e7/APKBUILD index 2db5f15b5..0cc317065 100644 --- a/device/community/firmware-samsung-e7/APKBUILD +++ b/device/community/firmware-samsung-e7/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-e7 pkgver=1 -pkgrel=1 +pkgrel=2 _name="Samsung Galaxy E7" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/qF2Y0k5 _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/community/firmware-samsung-grandmax/APKBUILD b/device/community/firmware-samsung-grandmax/APKBUILD index 133a2f8bc..92b98655f 100644 --- a/device/community/firmware-samsung-grandmax/APKBUILD +++ b/device/community/firmware-samsung-grandmax/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-grandmax pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy Grand Max" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/7Kp9JMg _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/community/firmware-samsung-gt510/APKBUILD b/device/community/firmware-samsung-gt510/APKBUILD index 7be6093a8..73ef9b271 100644 --- a/device/community/firmware-samsung-gt510/APKBUILD +++ b/device/community/firmware-samsung-gt510/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-gt510 pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy Tab A 9.7 (2015)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/vi1vz9E _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/community/firmware-samsung-gt58/APKBUILD b/device/community/firmware-samsung-gt58/APKBUILD index c2036cc3e..e898fec22 100644 --- a/device/community/firmware-samsung-gt58/APKBUILD +++ b/device/community/firmware-samsung-gt58/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-gt58 pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy Tab A 8.0 (2015)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/L95C6H6 _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/community/firmware-xiaomi-wt88047/APKBUILD b/device/community/firmware-xiaomi-wt88047/APKBUILD index e0a1704df..6e0dff757 100644 --- a/device/community/firmware-xiaomi-wt88047/APKBUILD +++ b/device/community/firmware-xiaomi-wt88047/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-xiaomi-wt88047 pkgver=9.2.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Firmware for Xiaomi Redmi 2" url="https://androidfilehost.com/?w=files&flid=303434" subpackages="$pkgname-wcnss-nv:wcnss_nv" @@ -11,8 +11,7 @@ source="wt88047-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/bntm8Z7m _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d wt88047-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-ark-peach/APKBUILD b/device/testing/firmware-ark-peach/APKBUILD index 5a72c9ba2..2fd5446fc 100644 --- a/device/testing/firmware-ark-peach/APKBUILD +++ b/device/testing/firmware-ark-peach/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-ark-peach pkgver=1 -pkgrel=0 +pkgrel=1 pkgdesc="Firmware for ARK Benefit A3" url="https://postmarketos.org" subpackages="$pkgname-wcnss-nv:wcnss_nv" @@ -11,8 +11,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/F2zDaaq _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-huawei-g7/APKBUILD b/device/testing/firmware-huawei-g7/APKBUILD index a0aa2b541..fb2db62c7 100644 --- a/device/testing/firmware-huawei-g7/APKBUILD +++ b/device/testing/firmware-huawei-g7/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-huawei-g7 pkgver=1 -pkgrel=0 +pkgrel=1 pkgdesc="Firmware for Huawei Ascend G7" url="https://postmarketos.org" subpackages="$pkgname-wcnss-nv:wcnss_nv" @@ -11,8 +11,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/UmTSZBW _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-huawei-y635/APKBUILD b/device/testing/firmware-huawei-y635/APKBUILD index 1fce9e350..e1f1bde42 100644 --- a/device/testing/firmware-huawei-y635/APKBUILD +++ b/device/testing/firmware-huawei-y635/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-huawei-y635 pkgver=1 -pkgrel=0 +pkgrel=1 pkgdesc="Firmware for Huawei Y635" url="https://postmarketos.org" subpackages="$pkgname-wcnss-nv:wcnss_nv" @@ -11,8 +11,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/yYNgH3P _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-samsung-a7/APKBUILD b/device/testing/firmware-samsung-a7/APKBUILD index f4f584812..9e37e78b1 100644 --- a/device/testing/firmware-samsung-a7/APKBUILD +++ b/device/testing/firmware-samsung-a7/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-a7 pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy A7 (2015)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/qqXtjvd _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-samsung-cprime/APKBUILD b/device/testing/firmware-samsung-cprime/APKBUILD index e6022f2fa..c05b333f1 100644 --- a/device/testing/firmware-samsung-cprime/APKBUILD +++ b/device/testing/firmware-samsung-cprime/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-cprime pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy Core Prime" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/2vBcF82 _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-samsung-fortuna3g/APKBUILD b/device/testing/firmware-samsung-fortuna3g/APKBUILD index 9491bd96c..82ffc045e 100644 --- a/device/testing/firmware-samsung-fortuna3g/APKBUILD +++ b/device/testing/firmware-samsung-fortuna3g/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-fortuna3g pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy Grand Prime 3G (G530H)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/Y8DvfvR _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-samsung-fortunaltezt/APKBUILD b/device/testing/firmware-samsung-fortunaltezt/APKBUILD index 15c8335e4..27a4bc362 100644 --- a/device/testing/firmware-samsung-fortunaltezt/APKBUILD +++ b/device/testing/firmware-samsung-fortunaltezt/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-fortunaltezt pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy Grand Prime (SM-G530Y)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/s25mBae _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-samsung-gprimeltecan/APKBUILD b/device/testing/firmware-samsung-gprimeltecan/APKBUILD index 4b9f6e429..eabe8624a 100644 --- a/device/testing/firmware-samsung-gprimeltecan/APKBUILD +++ b/device/testing/firmware-samsung-gprimeltecan/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-gprimeltecan pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy Grand Prime CAN (G530W)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/BxjvzZh _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-samsung-gprimeltexx/APKBUILD b/device/testing/firmware-samsung-gprimeltexx/APKBUILD index 466617998..ed44667a3 100644 --- a/device/testing/firmware-samsung-gprimeltexx/APKBUILD +++ b/device/testing/firmware-samsung-gprimeltexx/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-gprimeltexx pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy Grand Prime (G530FZ)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/6rPpqqE _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-samsung-gtelwifiue/APKBUILD b/device/testing/firmware-samsung-gtelwifiue/APKBUILD index edc97f8ae..d33d201a4 100644 --- a/device/testing/firmware-samsung-gtelwifiue/APKBUILD +++ b/device/testing/firmware-samsung-gtelwifiue/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-gtelwifiue pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy Tab E 9.7 (SM-T560NU)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/KMyWjAH _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-samsung-j3ltetw/APKBUILD b/device/testing/firmware-samsung-j3ltetw/APKBUILD index 616e07811..6c2831d10 100644 --- a/device/testing/firmware-samsung-j3ltetw/APKBUILD +++ b/device/testing/firmware-samsung-j3ltetw/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-j3ltetw pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy J3 (2016)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/fRk3jmJ _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-samsung-j5x/APKBUILD b/device/testing/firmware-samsung-j5x/APKBUILD index 3ccbeb364..8cec02d71 100644 --- a/device/testing/firmware-samsung-j5x/APKBUILD +++ b/device/testing/firmware-samsung-j5x/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-j5x pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy J5 (2016)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/pL9nwXm _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin } diff --git a/device/testing/firmware-samsung-on7/APKBUILD b/device/testing/firmware-samsung-on7/APKBUILD index fe85ce1c1..1884679cc 100644 --- a/device/testing/firmware-samsung-on7/APKBUILD +++ b/device/testing/firmware-samsung-on7/APKBUILD @@ -1,6 +1,6 @@ pkgname=firmware-samsung-on7 pkgver=1 -pkgrel=0 +pkgrel=1 _name="Samsung Galaxy On7 (2015)" pkgdesc="Firmware for $_name" url="https://postmarketos.org" @@ -12,8 +12,7 @@ source="$pkgname-WCNSS_qcom_wlan_nv.bin.base64::https://pastebin.com/raw/4c9b2b9 _fwdir="/lib/firmware/postmarketos" -unpack() { - default_unpack +build() { base64 -d $pkgname-WCNSS_qcom_wlan_nv.bin.base64 > WCNSS_qcom_wlan_nv.bin }