From 81cee386103a21f615c5f740d4b4f47ea8122308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20=C3=82ngelo?= <pangelo@void.io>
Date: Sun, 3 Mar 2019 23:15:40 +0000
Subject: [PATCH] asus-grouper: modernize device package (!253)

Updated the device-asus-grouper package to use devicepkg-dev.

I've tested the resulting image and it builds, boots and has a working
touchscreen (in Weston)

I've also noticed that the device reboots itself at times, both in the
USB ssh console and in Weston. This seems to be a known issue but I
don't know how prevalent it was before.
---
 .../90-android-touch-dev.rules                |  3 --
 device/device-asus-grouper/APKBUILD           | 35 +++++++++----------
 device/device-asus-grouper/deviceinfo         | 19 +++++-----
 3 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100644 device/device-asus-grouper/90-android-touch-dev.rules

diff --git a/device/device-asus-grouper/90-android-touch-dev.rules b/device/device-asus-grouper/90-android-touch-dev.rules
deleted file mode 100644
index 494fd1867..000000000
--- a/device/device-asus-grouper/90-android-touch-dev.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBSYSTEM=="input", ATTRS{name}=="elan-touchscreen", \
-ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1" \
-ENV{WL_CALIBRATION}="0.982113 -0.006129 1.983124 -0.002560 1.000800 -6.012451"
diff --git a/device/device-asus-grouper/APKBUILD b/device/device-asus-grouper/APKBUILD
index e5149979c..7044d6d11 100644
--- a/device/device-asus-grouper/APKBUILD
+++ b/device/device-asus-grouper/APKBUILD
@@ -1,28 +1,27 @@
-pkgname=device-asus-grouper
-pkgver=1
-pkgrel=16
-pkgdesc="Asus Nexus 7 2012 Wifi"
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname="device-asus-grouper"
+pkgdesc="Google Nexus 7 2012 Wifi"
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
-arch="armhf"
 license="MIT"
-depends="postmarketos-base linux-asus-grouper mkbootimg mesa-dri-swrast mdss-fb-init-hack"
-makedepends=""
-install=""
-subpackages=""
-source="deviceinfo
-	90-android-touch-dev.rules
-	pointercal"
+arch="armhf"
 options="!check !archcheck"
+depends="postmarketos-base linux-asus-grouper mkbootimg mesa-dri-swrast"
+makedepends="devicepkg-dev"
+source="deviceinfo
+	pointercal"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
 
 package() {
-	install -D -m644 "$srcdir/deviceinfo" \
-		"$pkgdir/etc/deviceinfo"
-	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
+	devicepkg_package $startdir $pkgname
 	install -D -m644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
 }
 
-sha512sums="58b097963c8b54ee991f5910fc678948dd83c120d76fa09a8c1738cc3c7d64c36d716f42343a4ba52a437fe43c7878418b4f2ccf720c92551f5ed20e0eddbdcc  deviceinfo
-05f938784e8f30cdbe9923a5f3e34ce7c539060d3a621741206bc5ed02afd7cbf480b02fbe48a70968e7182f885ab9bfe57c4d1e7c6eefca54a6f7188d2849f2  90-android-touch-dev.rules
+
+sha512sums="a374e9681fbeaff5047820f8b7a9c249195232730a412208415243ea8bf7a87cdc4399ab86b1c08448be279f5c9dedcb47d03ac83587f908a4c51e442a97da50  deviceinfo
 ae9c145ffd745c83c73edbc486d3b9d22c6cbb8c57827b6f1ba87b6449a17a73a443be7daa0ab87de8df2dd9594e624364652c84ec1e7b536d37f52449a5a58c  pointercal"
diff --git a/device/device-asus-grouper/deviceinfo b/device/device-asus-grouper/deviceinfo
index 1472d690a..0b9b16eff 100644
--- a/device/device-asus-grouper/deviceinfo
+++ b/device/device-asus-grouper/deviceinfo
@@ -6,22 +6,25 @@ deviceinfo_name="Google Nexus 7 2012 Wifi"
 deviceinfo_manufacturer="Asus"
 deviceinfo_codename="asus-grouper"
 deviceinfo_date=""
-deviceinfo_keyboard="false"
-deviceinfo_nonfree="????"
 deviceinfo_dtb=""
-deviceinfo_modules=""
 deviceinfo_modules_initfs=""
-deviceinfo_external_storage="false"
-deviceinfo_flash_method="fastboot"
 deviceinfo_arch="armhf"
-deviceinfo_dev_touchscreen="/dev/input/event0"
 
-# Splash screen
+# Device related
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
 deviceinfo_screen_width="800"
 deviceinfo_screen_height="1280"
+deviceinfo_dev_touchscreen="/dev/input/event0"
+deviceinfo_dev_touchscreen_calibration=""
+deviceinfo_dev_keyboard=""
 
-# Fastboot related
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline=""
 deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_flash_offset_base=""
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
 deviceinfo_flash_offset_second="0x00f00000"