From 9488531c3ef019e8afdf09c90a6c2ce8b2b585d4 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Sat, 29 May 2021 13:51:28 +0200 Subject: [PATCH] lg-lenok: modernize and add AsteroidOS machine config (MR 2204) AsteroidOS uses this config file to determine how the UI should look (e.g. a round or a square screen), and if some things like Wi-Fi are supported. Upstream auto generates this config file, but it seems so simple and small that I think it's better for us to just ship the file next to the APKBUILD --- device/testing/device-lg-lenok/APKBUILD | 38 ++++++++++++++++----- device/testing/device-lg-lenok/machine.conf | 5 +++ 2 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 device/testing/device-lg-lenok/machine.conf diff --git a/device/testing/device-lg-lenok/APKBUILD b/device/testing/device-lg-lenok/APKBUILD index 898c7bcde..4183346eb 100644 --- a/device/testing/device-lg-lenok/APKBUILD +++ b/device/testing/device-lg-lenok/APKBUILD @@ -1,14 +1,26 @@ # Reference: pkgname=device-lg-lenok pkgver=1 -pkgrel=18 +pkgrel=19 pkgdesc="LG G Watch R" url="https://postmarketos.org" arch="armv7" license="MIT" -depends="postmarketos-base linux-lg-lenok mkbootimg mesa-dri-swrast" +depends=" + linux-lg-lenok + mesa-dri-swrast + mkbootimg + postmarketos-base + " makedepends="devicepkg-dev" -source="deviceinfo initfs-hook.sh 90-android-touch-dev.rules fb_fix.sh" +subpackages="$pkgname-asteroid" +source=" + 90-android-touch-dev.rules + deviceinfo + fb_fix.sh + initfs-hook.sh + machine.conf + " options="!check !archcheck" build() { @@ -17,15 +29,23 @@ build() { package() { devicepkg_package $startdir $pkgname - install -D -m644 "$srcdir"/90-android-touch-dev.rules \ - "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules - install -D -m644 "$srcdir"/fb_fix.sh \ - "$pkgdir"/etc/profile.d/fb_fix.sh + install -Dm644 -t "$pkgdir"/etc/udev/rules.d \ + "$srcdir"/90-android-touch-dev.rules + install -Dm644 -t "$pkgdir"/etc/profile.d \ + "$srcdir"/fb_fix.sh +} + +asteroid() { + install_if="$pkgname=$pkgver-r$pkgrel asteroid-launcher" + + install -Dm644 -t "$subpkgdir"/etc/asteroid \ + "$srcdir"/machine.conf } sha512sums=" -65857b13770a2df227dddcb1a50f9066da651b40582436867dfb3685f9ecfa68b6eb53fdb60f6bb32567b223b71304f52e4be01e5ce876462f81b88f31a1470d deviceinfo -d29105805adcd79d4f73c2f2c4483a2c627dc7b70acb77f43d085742ef930407c9b1423f7020c34f38e8a09f40cadd991b9acae23e936c90d6a4c0900250da22 initfs-hook.sh a36ba9017df3b4be233783096c303abafa873dcdf50f6357b82f3c5526fd161a1914dafe143377cb5982955108b987890638b51911d0dd339172554e39a82d9f 90-android-touch-dev.rules +65857b13770a2df227dddcb1a50f9066da651b40582436867dfb3685f9ecfa68b6eb53fdb60f6bb32567b223b71304f52e4be01e5ce876462f81b88f31a1470d deviceinfo 1e72e40935d21f194cf3183fad33e8f5baeacf1458568af61f8ef7cc54c3370e63072de3d414e2ba8feddeee8f012a0d9a40ce23bbb5a47173fd92b9794846c8 fb_fix.sh +d29105805adcd79d4f73c2f2c4483a2c627dc7b70acb77f43d085742ef930407c9b1423f7020c34f38e8a09f40cadd991b9acae23e936c90d6a4c0900250da22 initfs-hook.sh +81cf2c20d2efa0f71f18116efeda11ae4f18fee96ba998dc4d6a36205626dce496cb36711af5c4e3215578b174942e721290cfcff8db6fb1c998b90b7345244d machine.conf " diff --git a/device/testing/device-lg-lenok/machine.conf b/device/testing/device-lg-lenok/machine.conf new file mode 100644 index 000000000..ad989d798 --- /dev/null +++ b/device/testing/device-lg-lenok/machine.conf @@ -0,0 +1,5 @@ +[Display] +ROUND = true + +[Capabilities] +HAS_WLAN = true