From 3a9898689d07367dfc9dcaf5d2f68f39ec858dd6 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 5 Nov 2021 15:10:37 +0100
Subject: [PATCH] <msm8916>: drop variant suffixes from dtb names (MR 2632)

The new kernel version now has the variant suffixes dropped from the
DTB file names as well.
---
 device/community/device-samsung-serranove/APKBUILD   | 2 +-
 device/community/device-samsung-serranove/deviceinfo | 2 +-
 device/testing/device-samsung-gprime/APKBUILD        | 4 ++--
 device/testing/device-samsung-gprime/deviceinfo      | 2 +-
 device/testing/device-samsung-j5/APKBUILD            | 4 ++--
 device/testing/device-samsung-j5/deviceinfo          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/device/community/device-samsung-serranove/APKBUILD b/device/community/device-samsung-serranove/APKBUILD
index 1159f399c..c8ed658af 100644
--- a/device/community/device-samsung-serranove/APKBUILD
+++ b/device/community/device-samsung-serranove/APKBUILD
@@ -49,6 +49,6 @@ phosh() {
 }
 
 sha512sums="
-a9012f626cd3f830ebc02b44e744e8684a20cdfbf7b2e27ae0bc9830d3a575f78256e2bc505f8d61de2eaa83726313c6fc9dde2b86dcd6cc3ab1fd3bd100012c  deviceinfo
+d666cf805d292d13d9e15a350b203580f016f455dad16cbc4a94471edb145fd464c5ad92a50077995234a9db1322e605e0294a6c5d7342fa6675b1bfec4eb69e  deviceinfo
 94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea  rootston.ini
 "
diff --git a/device/community/device-samsung-serranove/deviceinfo b/device/community/device-samsung-serranove/deviceinfo
index 4eb21ef7e..7c3dfe724 100644
--- a/device/community/device-samsung-serranove/deviceinfo
+++ b/device/community/device-samsung-serranove/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Samsung Galaxy S4 Mini Value Edition"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-serranove"
 deviceinfo_year="2015"
-deviceinfo_dtb="qcom-msm8916-samsung-serranovelte"
+deviceinfo_dtb="qcom-msm8916-samsung-serranove"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs="panel-samsung-s6e88a0-ams427ap24 msm zinitix"
 deviceinfo_arch="armv7"
diff --git a/device/testing/device-samsung-gprime/APKBUILD b/device/testing/device-samsung-gprime/APKBUILD
index 88e461f20..079cdc2a9 100644
--- a/device/testing/device-samsung-gprime/APKBUILD
+++ b/device/testing/device-samsung-gprime/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-gprime
 pkgdesc="Samsung Galaxy Grand Prime"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -29,5 +29,5 @@ kernel_mainline() {
 }
 
 sha512sums="
-7ff3c8d831c9826fce01175d1a6b05bcd0d83b537694e20998b5cfdbecd7ac0ac1d8e9c2bac4bf86c065f17319f2642bff3b588e43b46197da99843599b7b2e7  deviceinfo
+1f335ef38b06b6c80b1f405cc0d6706b2a78501d47001c02021c72384587aa6a3546726137ec4795f5b0163cae8f4a858822135d5933c527e9b4504b47fb68be  deviceinfo
 "
diff --git a/device/testing/device-samsung-gprime/deviceinfo b/device/testing/device-samsung-gprime/deviceinfo
index 6ebfc7bb4..4f1227002 100644
--- a/device/testing/device-samsung-gprime/deviceinfo
+++ b/device/testing/device-samsung-gprime/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Samsung Galaxy Grand Prime"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-gprime"
 deviceinfo_year="2014"
-deviceinfo_dtb_mainline="qcom/msm8916-samsung-gprimeltecan"
+deviceinfo_dtb_mainline="qcom/msm8916-samsung-gprime"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
 
diff --git a/device/testing/device-samsung-j5/APKBUILD b/device/testing/device-samsung-j5/APKBUILD
index b37167f49..8bc4c4194 100644
--- a/device/testing/device-samsung-j5/APKBUILD
+++ b/device/testing/device-samsung-j5/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-j5
 pkgdesc="Samsung Galaxy J5 (2015)"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,5 +27,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-cb2adfe1b6d23e3e84448cc1c2f67e0320f61fe9edf735b484070400247393e5c0a6984a14fa3349031f7160e23d49ce80f30e785e2bed9398046a38cba9371f  deviceinfo
+fc9dbef4f6fa7847618e692aaa23eb994676186aa9530088f5368bd64fcefd1c950546c17206276fe5d567b2c5cb1ecabe9ee6b4601c1c35a308d363de4c67bc  deviceinfo
 "
diff --git a/device/testing/device-samsung-j5/deviceinfo b/device/testing/device-samsung-j5/deviceinfo
index 7939fe257..f928ea5b0 100644
--- a/device/testing/device-samsung-j5/deviceinfo
+++ b/device/testing/device-samsung-j5/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Samsung Galaxy J5 2015"
 deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-j5"
 deviceinfo_year="2015"
-deviceinfo_dtb="qcom/msm8916-samsung-j5nlte"
+deviceinfo_dtb="qcom/msm8916-samsung-j5"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"