From 5bc854a2a4e50d044c50289511d1e0fdaefb1d41 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 31 Jul 2020 10:44:50 +0200
Subject: [PATCH] samsung-skomer: remove _mainline suffix from deviceinfo (MR
 1475)

samsung-skomer only has mainline packaged and no "-kernel-mainline"
subpackage, so the suffix does not work in this case.
---
 device/testing/device-samsung-skomer/APKBUILD   | 4 ++--
 device/testing/device-samsung-skomer/deviceinfo | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/device/testing/device-samsung-skomer/APKBUILD b/device/testing/device-samsung-skomer/APKBUILD
index 43e7a2a7c..bdae47cd0 100644
--- a/device/testing/device-samsung-skomer/APKBUILD
+++ b/device/testing/device-samsung-skomer/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-skomer
 pkgdesc="Samsung Galaxy Xcover 2"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -37,5 +37,5 @@ kwin() {
 	install -Dm644 "$srcdir"/kwin.sh "$subpkgdir"/etc/profile.d/kwin.sh
 }
 
-sha512sums="d69eff3bedb8ceff62df8141de80b63d714a3f24de67a318e73d41ff2b859c13724e78f7db1a0c9b9afd272b6df24ad3c166430d516958c9efc1e9a903635555  deviceinfo
+sha512sums="215266f1a9cf42c366c12a09406a15ec7dee1e36255ba5fae76be4e2de5024db39272a674be40568db028e14286a17b0df35aac4e9d376971d1258ff95a544f0  deviceinfo
 685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  kwin.sh"
diff --git a/device/testing/device-samsung-skomer/deviceinfo b/device/testing/device-samsung-skomer/deviceinfo
index 5d8a0da13..2dd9df1b0 100644
--- a/device/testing/device-samsung-skomer/deviceinfo
+++ b/device/testing/device-samsung-skomer/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Samsung Galaxy Xcover 2"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-skomer"
 deviceinfo_year="2013"
-deviceinfo_dtb_mainline="ste-ux500-samsung-skomer"
+deviceinfo_dtb="ste-ux500-samsung-skomer"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="armv7"
 
@@ -18,12 +18,12 @@ deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
 deviceinfo_getty="ttyAMA2;115200"
 
-deviceinfo_kernel_cmdline_mainline="console=ttyAMA2,115200 PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline="console=ttyAMA2,115200 PMOS_NO_OUTPUT_REDIRECT"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_dtb_second_mainline="true"
+deviceinfo_bootimg_dtb_second="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"