deduplicate samsung-kylepro/kyleprods vendor kernels (MR 2368)

Fixes #1163

* Rename linux-samsung-kylepro -> linux-samsung-kylepro
* Remove linux-samsung-kyleprods.

[ci:skip-build] Already built on CI in MR

device/testing/device-samsung-kylepro/APKBUILD

@@ -2,12 +2,12 @@
 pkgname=device-samsung-kylepro
 pkgdesc="Samsung Galaxy Trend Plus"
 pkgver=0.1
-pkgrel=8
+pkgrel=9
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-kylepro mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-samsung-kyleproxx mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo"

device/testing/device-samsung-kyleprods/APKBUILD

@@ -2,12 +2,12 @@
 pkgname=device-samsung-kyleprods
 pkgdesc="Samsung Galaxy S Duos 2"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-kyleprods mkbootimg mesa-dri-swrast msm-fb-refresher"
+depends="postmarketos-base linux-samsung-kyleproxx mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 

device/testing/linux-samsung-kyleprods/00_return_address.patch

@@ -1,29 +0,0 @@
-diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
-index f89515a..2bb8cac 100644
---- a/arch/arm/include/asm/ftrace.h
-+++ b/arch/arm/include/asm/ftrace.h
-@@ -45,7 +45,7 @@ void *return_address(unsigned int);
- 
- #else
- 
--extern inline void *return_address(unsigned int level)
-+static inline void *return_address(unsigned int level)
- {
- 	return NULL;
- }
-diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
-index 0b13a72..8bf0a5a 100644
---- a/arch/arm/kernel/return_address.c
-+++ b/arch/arm/kernel/return_address.c
-@@ -62,11 +62,6 @@ void *return_address(unsigned int level)
- #warning "TODO: return_address should use unwind tables"
- #endif
- 
--void *return_address(unsigned int level)
--{
--	return NULL;
--}
--
- #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
- 
- EXPORT_SYMBOL_GPL(return_address);

device/testing/linux-samsung-kyleprods/02_screen_reset.patch

@@ -1,22 +0,0 @@
-diff --git a/drivers/video/broadcom/lcd/nt35510_dsi.c b/drivers/video/broadcom/lcd/nt35510_dsi.c
-index 3cf5aa4b1ad..132f9350365 100644
---- a/drivers/video/broadcom/lcd/nt35510_dsi.c
-+++ b/drivers/video/broadcom/lcd/nt35510_dsi.c
-@@ -337,7 +337,7 @@ esd_detection:
- 
- static void nt35510_esd_recovery(void)
- {
--#ifdef ILI_ESD_OPERATION
-+/*#ifdef ILI_ESD_OPERATION
-     nt35510_esd_reset_set(1);
- #endif
- 
-@@ -347,7 +347,7 @@ static void nt35510_esd_recovery(void)
- 
- #ifdef ILI_ESD_OPERATION
-     nt35510_esd_reset_set(0);
--#endif
-+#endif*/
- }
- 
- static void esd_work_func(struct work_struct *work)

device/testing/linux-samsung-kyleprods/APKBUILD

@@ -1,55 +0,0 @@
-# Reference: <https://postmarketos.org/vendorkernel>
-# Kernel config based on: arch/arm/configs/bcm21664_hawaii_ss_kyleprods_rev00_lineage_defconfig
-
-pkgname=linux-samsung-kyleprods
-pkgver=3.4.113
-pkgrel=2
-pkgdesc="Samsung Galaxy S Duos 2 kernel fork"
-arch="armv7"
-_carch="arm"
-_flavor="samsung-kyleprods"
-url="https://kernel.org"
-license="GPL-2.0-only"
-options="!strip !check !tracedeps pmb:cross-native"
-makedepends="bash bc bison devicepkg-dev elfutils-dev flex gcc6 gmp-dev installkernel linux-headers openssl-dev perl sed"
-
-# Compiler: GCC 6 (untested with newer versions)
-if [ "${CC:0:5}" != "gcc6-" ]; then
-	CC="gcc6-$CC"
-	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
-fi
-
-# Source
-_repository="android_kernel_samsung_kyleproxx"
-_commit="026cf3b3e97ec40aa1c0c52837a318725786f05a"
-_config="config-$_flavor.$arch"
-source="
-	$pkgname-$_commit.tar.gz::https://github.com/Samsung-KYLEPROXX/$_repository/archive/$_commit.tar.gz
-	$_config
-	00_return_address.patch
-	02_screen_reset.patch
-	gcc10-extern_YYLOC_global_declaration.patch
-"
-builddir="$srcdir/$_repository-$_commit"
-_outdir="out"
-
-prepare() {
-	default_prepare
-	. downstreamkernel_prepare
-}
-
-build() {
-	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-}
-
-package() {
-	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
-}
-
-sha512sums="b66ab7d8ed557ed095b059beb7b37d196a7290e6c8364560126a94f696718c4a61f99b1e21700d9a4b50c569243e4e2cbfc9fbd9d9517ca49cfa32f31525c27f  linux-samsung-kyleprods-026cf3b3e97ec40aa1c0c52837a318725786f05a.tar.gz
-b0ad0299131eb8123a0603eb88b7528bbdb9ec315722dbeaf4015d17e9429f6ea0bc6cf2a35e1b83c2363df0df9f96f9fedce1f4be6a2f50cb83305a9d64180f  config-samsung-kyleprods.armv7
-c40eaa11547f5bc2b1ff965506bdfe3015ff16e4b5ad9ccb3b8134ceafd1d32407c4ef2b213e02e036ce1e9bdcbfe768dff7d4b054bec77705a176c1f783b6f5  00_return_address.patch
-c0a59be648ef646650c83b5d135daa05aae300c7ad5056d49f1b3f9967c4d7f337b0ddb8ae319b11e43c17aaf5fc9dcc9724463d265c1d765dc85c86f612f4ea  02_screen_reset.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch"

device/testing/linux-samsung-kyleprods/gcc10-extern_YYLOC_global_declaration.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch

device/testing/linux-samsung-kyleproxx/APKBUILD

@@ -1,13 +1,13 @@
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/bcm21664_hawaii_ss_kylepro_rev00_lineage_defconfig
 
-pkgname=linux-samsung-kylepro
+pkgname=linux-samsung-kyleproxx
 pkgver=3.4.113
-pkgrel=8
-pkgdesc="Samsung Galaxy Trend Plus kernel fork"
+pkgrel=0
+pkgdesc="Kernel fork for Samsung Galaxy Trend & Samsung Galaxy S Duos 2"
 arch="armv7"
 _carch="arm"
-_flavor="samsung-kylepro"
+_flavor="samsung-kyleproxx"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
@@ -48,8 +48,8 @@ package() {
 }
 
 sha512sums="
-b66ab7d8ed557ed095b059beb7b37d196a7290e6c8364560126a94f696718c4a61f99b1e21700d9a4b50c569243e4e2cbfc9fbd9d9517ca49cfa32f31525c27f  linux-samsung-kylepro-026cf3b3e97ec40aa1c0c52837a318725786f05a.tar.gz
-04b89ddacf9ad82ef18520a548727044ea8a5bc19ebd84db5ed1ed421825c10438ff6adeaa4d40a87a3b0f5e7834cc9f0e251fe9429cbc1b6bd57db256769da8  config-samsung-kylepro.armv7
+b66ab7d8ed557ed095b059beb7b37d196a7290e6c8364560126a94f696718c4a61f99b1e21700d9a4b50c569243e4e2cbfc9fbd9d9517ca49cfa32f31525c27f  linux-samsung-kyleproxx-026cf3b3e97ec40aa1c0c52837a318725786f05a.tar.gz
+04b89ddacf9ad82ef18520a548727044ea8a5bc19ebd84db5ed1ed421825c10438ff6adeaa4d40a87a3b0f5e7834cc9f0e251fe9429cbc1b6bd57db256769da8  config-samsung-kyleproxx.armv7
 c40eaa11547f5bc2b1ff965506bdfe3015ff16e4b5ad9ccb3b8134ceafd1d32407c4ef2b213e02e036ce1e9bdcbfe768dff7d4b054bec77705a176c1f783b6f5  00_return_address.patch
 c0a59be648ef646650c83b5d135daa05aae300c7ad5056d49f1b3f9967c4d7f337b0ddb8ae319b11e43c17aaf5fc9dcc9724463d265c1d765dc85c86f612f4ea  02_screen_reset.patch
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch