device/*-asus-flo: switch to ARMv7

v2:
- Also switch firmware/firmware-asus-flo
- fix linting warnings
device/linux-asus-flo/APKBUILD: IC:[AL6]:device/linux-asus-flo/APKBUILD:36:prefix custom variable with _: HOSTCC="${CC:-gcc}"
IC:[AL6]:device/linux-asus-flo/APKBUILD:37:prefix custom variable with _: HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
IC:[AL6]:device/linux-asus-flo/APKBUILD:39:prefix custom variable with _: ksrcdir="$srcdir/linux-$pkgver"
MC:[AL5]:device/linux-asus-flo/APKBUILD:10:variable set to empty string: depends=""
MC:[AL5]:device/linux-asus-flo/APKBUILD:13:variable set to empty string: install=
MC:[AL5]:device/linux-asus-flo/APKBUILD:30:variable set to empty string: subpackages=""
MC:[AL31]:device/linux-asus-flo/APKBUILD:36:variables must not have capital letters
MC:[AL31]:device/linux-asus-flo/APKBUILD:37:variables must not have capital letters
MP:[AL32]:device/linux-asus-flo/APKBUILD:3:unnecesary usage of braces: ${_flavor}
MP:[AL32]:device/linux-asus-flo/APKBUILD:4:unnecesary usage of braces: ${_flavor}
MP:[AL32]:device/linux-asus-flo/APKBUILD:32:unnecesary usage of braces: ${pkgver}
firmware/firmware-asus-flo/APKBUILD: MC:[AL28]:firmware/firmware-asus-flo/APKBUILD:12:literal integers must not be quoted
MP:[AL32]:firmware/firmware-asus-flo/APKBUILD:15:unnecesary usage of braces: ${_url_aosp}
MP:[AL32]:firmware/firmware-asus-flo/APKBUILD:15:unnecesary usage of braces: ${_version_broadcom}
MP:[AL32]:firmware/firmware-asus-flo/APKBUILD:16:unnecesary usage of braces: ${_url_aosp}
MP:[AL32]:firmware/firmware-asus-flo/APKBUILD:16:unnecesary usage of braces: ${_version_qcom}
MP:[AL32]:firmware/firmware-asus-flo/APKBUILD:22:unnecesary usage of braces: ${_commit_other}
MP:[AL32]:firmware/firmware-asus-flo/APKBUILD:24:unnecesary usage of braces: ${_commit_other}
MP:[AL32]:firmware/firmware-asus-flo/APKBUILD:24:unnecesary usage of braces: ${_url_other}

Signed-off-by: David Heidelberg <david@ixit.cz>
This commit is contained in:
David Heidelberg 2020-02-26 14:49:44 +01:00
parent 152e709d9d
commit 91a1447917
5 changed files with 19 additions and 19 deletions

View file

@ -2,10 +2,10 @@
# Contributor: montvid <montvid@gmail.com>
pkgname=device-asus-flo
pkgver=0
pkgrel=20
pkgrel=21
pkgdesc="Google Nexus 7 2013 flo"
url="https://postmarketos.org"
arch="armhf"
arch="armv7"
license="MIT"
depends="postmarketos-base linux-asus-flo mkbootimg mesa-dri-freedreno"
makedepends="devicepkg-dev"
@ -40,7 +40,7 @@ nonfree_firmware() {
mkdir "$subpkgdir"
}
sha512sums="a5244748c3225083e23deb60dd6f832bb73285d66cdd1f9c6430296f554777160191e277a945dd9a23e79dc4ed17b8533b9177b9df8f3ab438899238a15c8411 deviceinfo
sha512sums="ce365630f307205a36035bd61e8db4ad96d33f9c2eae4fde67c2aec11235fc833adf91c94344d192cecf3ce5c47764bc0abf14df33a4b1024e0d2dd2e514010d deviceinfo
5ac89b627f52d2f1103c3329bd905cdbb906cae5bb332d52e6805d7971fbcc0faabe1fd9d2beb7c6de4e4487c05047eaa17852dbf9e114ee3c5d4b0d57d73859 90-android-touch-dev.rules
3278921cc1617d10fdd13dfbeaf213cda0078d069e727acd8cfac10bd8ade6f373be1e22fd1e4b50ae71cd2eae09f7d6aad5de42338d9ea9f8c1a34f0b60cb69 wpa_supplicant.conf
cf913217b41a3dde8bc2a16a5bc82013c85679de0e81db1cfc36f2409ea034fec430082ddcb207c16746453601cf8381300b049cd2fb131f1916dc7dbcc247e3 pointercal

View file

@ -2,7 +2,7 @@
# Please use double quotes only. You can source this file in shell scripts.
deviceinfo_format_version="0"
deviceinfo_name="Google Nexus 7 2013 Wifi"
deviceinfo_name="Google Nexus 7 2013"
deviceinfo_manufacturer="Asus"
deviceinfo_codename="asus-flo"
deviceinfo_date=""
@ -12,7 +12,7 @@ deviceinfo_modules=""
deviceinfo_modules_initfs=""
deviceinfo_external_storage="false"
deviceinfo_flash_method="fastboot"
deviceinfo_arch="armhf"
deviceinfo_arch="armv7"
# Splash screen
deviceinfo_dev_touchscreen="/dev/input/event1"

View file

@ -1,9 +1,9 @@
_flavor=asus-flo
_config="config-$_flavor.armhf"
_config="config-$_flavor.armv7"
pkgname=linux-$_flavor
pkgver=4.11.12
pkgrel=2
arch="armhf"
pkgrel=3
arch="armv7"
pkgdesc="Upstream stable kernel with patches for Nexus 7 2013 WIFI"
url="https://git.linaro.org/people/john.stultz/flo.git/log/?h=flo-v4.11"
makedepends="xz perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev"
@ -28,11 +28,11 @@ license="GPL2"
_abi_release=$pkgver
_carch="arm"
ksrcdir="$srcdir/linux-$pkgver"
_ksrcdir="$srcdir/linux-$pkgver"
prepare() {
local _patch_failed=
cd "$ksrcdir"
cd "$_ksrcdir"
# first apply patches in specified order
for i in $source; do
case $i in
@ -54,7 +54,7 @@ prepare() {
mkdir -p "$srcdir"/build
cp "$srcdir"/$_config "$srcdir"/build/.config
make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" \
make -C "$_ksrcdir" O="$srcdir"/build ARCH="$_carch" \
silentoldconfig
}
@ -87,7 +87,7 @@ package() {
INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install
}
sha512sums="92a40984e2706e18c392dcd9b8d64261c138a228de335fe63501ceae3d89adaff7d211e3fd849f859ce3869292ff7bffc935aefe40e1abaf457d2e3210b4f4ef linux-asus-flo-4.11.12.tar.xz
c69d2b9fbc0efa14f2ce315cc138538bd20645e4d82d105d2e1736dbdd900a22ada38551d819d0b02fe94fd40fb8dadd511f596d5267ecf4814ef3d488e678c1 config-asus-flo.armhf
c69d2b9fbc0efa14f2ce315cc138538bd20645e4d82d105d2e1736dbdd900a22ada38551d819d0b02fe94fd40fb8dadd511f596d5267ecf4814ef3d488e678c1 config-asus-flo.armv7
c79d93af715c59188c7fccbb0402623b599b2e9fed944bb444d0ea2279e4086fc2b9f9e30aac468331b0a25150e537cd1647dd5cb6f47b53bf0af573cf6c7c67 00_Collapse_usb_support_into_one_node.patch
f11d7351873aecc73c612fa3d6f9411c6f777bdb502dc9ba918cd824fbb36596c476b164fb9cf7eac2fa1c9484fa21b78ec8d03c13f959933cb5c1e30ed54754 01_Add_regulator_tweaks_and_wcnss_entry_to_support_wifi.patch
303b25b44280dfbaa4b85f6dbeabc7752956b69fa7b85a1d837947ef490327a1228789bf57077d90e7c669b2f79d35c927ca423d4bbffeecdf7c1369af1120fb 02_Avoid_sending_high_rates_to_downstream_clocks_during_set_rate.patch

View file

@ -1,27 +1,27 @@
pkgname=firmware-asus-flo
pkgver=0
pkgrel=1
pkgrel=2
pkgdesc="Firmware for asus-flo"
url="https://developers.google.com/android/drivers#flomob30x"
arch="armhf"
arch="armv7"
license="proprietary"
options="!check !strip !archcheck"
# AOSP sources
_version_broadcom="23c0a6c8"
_version_qcom="43963492"
_version_qcom=43963492
_url_aosp="https://dl.google.com/dl/android/aosp"
source="
${_url_aosp}/broadcom-flo-mob30x-${_version_broadcom}.tgz
${_url_aosp}/qcom-flo-mob30x-${_version_qcom}.tgz
$_url_aosp/broadcom-flo-mob30x-$_version_broadcom.tgz
$_url_aosp/qcom-flo-mob30x-$_version_qcom.tgz
"
# Other sources
_files="WCNSS_qcom_cfg.ini WCNSS_cfg.dat WCNSS_qcom_wlan_nv_flo.bin"
_commit_other="42b685b6cd77540048e15012278ef290f94194a7"
_url_other="https://github.com/LineageOS/android_device_asus_flo/raw/${_commit_other}/wifi"
_url_other="https://github.com/LineageOS/android_device_asus_flo/raw/$_commit_other/wifi"
for _i in $_files; do
source="$source $pkgname-${_commit_other}-$_i::${_url_other}/$_i";
source="$source $pkgname-$_commit_other-$_i::$_url_other/$_i";
done
package() {