From c5c623221a812973b4ca254df063b5cfe25f7dcd Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Mon, 27 Jun 2022 08:43:07 +0200
Subject: [PATCH] asus-flo: fix using downstream kernel (MR 3256)

Don't try to append the dtb if using the downstream kernel.

Fix for:
  ERROR: File not found: /usr/share/dtb/qcom-apq8064-asus-nexus7-flo.dtb
Fixes: MR 2239 ("main/linux-postmarketos-qcom-apq8064: new aport")

[ci:skip-build] already built successfully in CI
---
 device/testing/device-asus-flo/APKBUILD   | 4 ++--
 device/testing/device-asus-flo/deviceinfo | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/device/testing/device-asus-flo/APKBUILD b/device/testing/device-asus-flo/APKBUILD
index 7160412ab..d96d52a42 100644
--- a/device/testing/device-asus-flo/APKBUILD
+++ b/device/testing/device-asus-flo/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: David Heidelberg <david@ixit.cz>
 pkgname=device-asus-flo
-pkgver=1
+pkgver=1.1
 pkgrel=0
 pkgdesc="Google Nexus 7 2013 (flo)"
 url="https://postmarketos.org"
@@ -57,7 +57,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-4e8007a001f45860ed9a6d7f5d3d768b90661db148587358dcc2d24a83a9c784114b2559eb3c55cbaa28e695a07a675e4ae668544b9ee4333d03f268266f9aea  deviceinfo
+8de5bcb2d6490b3cef4c224425cca7d7bdf517306f3c58352a16359f0e57db67aed918386bc6e3aaf9875355e53d51644ff970ef7e3c52f0596a73333f09d4f6  deviceinfo
 5ac89b627f52d2f1103c3329bd905cdbb906cae5bb332d52e6805d7971fbcc0faabe1fd9d2beb7c6de4e4487c05047eaa17852dbf9e114ee3c5d4b0d57d73859  90-android-touch-dev.rules
 3278921cc1617d10fdd13dfbeaf213cda0078d069e727acd8cfac10bd8ade6f373be1e22fd1e4b50ae71cd2eae09f7d6aad5de42338d9ea9f8c1a34f0b60cb69  wpa_supplicant.conf
 cf913217b41a3dde8bc2a16a5bc82013c85679de0e81db1cfc36f2409ea034fec430082ddcb207c16746453601cf8381300b049cd2fb131f1916dc7dbcc247e3  pointercal
diff --git a/device/testing/device-asus-flo/deviceinfo b/device/testing/device-asus-flo/deviceinfo
index b833eed08..944cf74a8 100644
--- a/device/testing/device-asus-flo/deviceinfo
+++ b/device/testing/device-asus-flo/deviceinfo
@@ -10,8 +10,8 @@ deviceinfo_chassis="tablet"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_flash_method="fastboot"
-deviceinfo_append_dtb="true"
-deviceinfo_dtb="qcom-apq8064-asus-nexus7-flo"
+deviceinfo_append_dtb_mainline="true"
+deviceinfo_dtb_mainline="qcom-apq8064-asus-nexus7-flo"
 deviceinfo_arch="armv7"
 deviceinfo_gpu_accelerated="true"