From f427a49e425db44f8c28b96cffb70bc837a22973 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 29 Oct 2021 16:55:32 +0200
Subject: [PATCH] htc-m8qlul: drop kernel variants (MR 2632)

The mainline-modem variant does not actually exist yet and this should
be preferably implemented using the new soc-qcom-msm8916-rproc selection
in the future.
---
 device/testing/device-htc-m8qlul/APKBUILD | 27 ++---------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/device/testing/device-htc-m8qlul/APKBUILD b/device/testing/device-htc-m8qlul/APKBUILD
index c6baa0f95..f4b45e507 100644
--- a/device/testing/device-htc-m8qlul/APKBUILD
+++ b/device/testing/device-htc-m8qlul/APKBUILD
@@ -3,22 +3,18 @@
 pkgname=device-htc-m8qlul
 pkgdesc="HTC One M8s"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg soc-qcom-msm8916"
+depends="postmarketos-base mkbootimg soc-qcom-msm8916 linux-postmarketos-qcom-msm8939"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="
-	$pkgname-kernel-mainline:kernel_mainline
-	$pkgname-kernel-mainline-modem:kernel_mainline_modem
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-modem:nonfree_firmware_modem
 "
 
-
 build() {
 	devicepkg_build $startdir $pkgname
 }
@@ -27,31 +23,12 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-kernel_mainline() {
-	pkgdesc="Close to mainline kernel (no modem, audio routed directly)"
-	depends="linux-postmarketos-qcom-msm8939"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_mainline_modem() {
-	pkgdesc="Close to mainline kernel (non-free modem, audio routed through ADSP. Modem does not actually work yet)"
-	depends="linux-postmarketos-qcom-msm8939 soc-qcom-msm8916-modem"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
 	depends="linux-firmware-qcom firmware-htc-m8qlul-venus firmware-htc-m8qlul-wcnss"
 	mkdir "$subpkgdir"
 }
 
-nonfree_firmware_modem() {
-	pkgdesc="Modem firmware"
-	depends="firmware-htc-m8qlul-modem"
-	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 20a0272f786014b7240f4a250f7642e410aa36be123f5745740e5f4e8078a12784b5c80c9ab5680197ea4f535393d680d8a61c0aeae1cec4b57d5af8a0bd148f  deviceinfo
 "