From 5b55baf6c26a971fb5c36731efdc4e4099ce9991 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 7 Aug 2018 06:37:44 +0000
Subject: system/easy-kernel-power8: make separate from easy-kernel so they can
 coexist

---
 system/easy-kernel-power8/APKBUILD     | 28 ++++++++++++++--------------
 system/easy-kernel-power8/config-ppc64 |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'system')

diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD
index 256dec65d..cf2a72c78 100644
--- a/system/easy-kernel-power8/APKBUILD
+++ b/system/easy-kernel-power8/APKBUILD
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 depends=""
 makedepends="bc gzip lzop openssl-dev xz"
 install=""
-provides="easy-kernel=$pkgver-r$pkgrel"
+provides="easy-kernel-power8=$pkgver-r$pkgrel"
 subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules
 	$_pkgname-src-$pkgver-mc$pkgrel:src"
 source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
@@ -46,38 +46,38 @@ package() {
 
 	if [ -f "$pkgdir"/boot/vmlinuz ]; then
 		mv "$pkgdir"/boot/vmlinuz \
-			"$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy
+			"$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy-p8
 	fi
 	if [ -f "$pkgdir"/boot/vmlinux ]; then
 		mv "$pkgdir"/boot/vmlinux \
-			"$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy
+			"$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy-p8
 	fi
 
 	install -D "$builddir"/include/config/kernel.release \
-		"$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel/kernel.release
+		"$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel-p8/kernel.release
 }
 
 modules() {
 	pkgdesc="Modules / device drivers for easy-kernel"
-	provides="easy-kernel-modules=$pkgver-r$pkgrel"
+	provides="easy-kernel-power8-modules=$pkgver-r$pkgrel"
 	autodeps=0  # modules should not depend on src just for symlink
 	mkdir -p "$subpkgdir"/lib
 	mv "$pkgdir"/lib/modules "$subpkgdir"/lib/
-	rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/build
-	rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/source
-	ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel" \
-		"$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/build
-	ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel" \
-		"$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/source
+	rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-p8/build
+	rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-p8/source
+	ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel-p8" \
+		"$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-p8/build
+	ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel-p8" \
+		"$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-p8/source
 }
 
 src() {
 	pkgdesc="Kernel source code used to build the kernel"
-	provides="easy-kernel-src=$pkgver-r$pkgrel"
+	provides="easy-kernel-power8-src=$pkgver-r$pkgrel"
 	mkdir -p "$subpkgdir"/usr/src
-	mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel
+	mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel-p8
 }
 sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8  linux-4.14.tar.xz
 f76ae636da104c6f1d299a6aff18a5aa1166c9c06efbdf3270c911f26adc1760fbb4271ca2338ced47c7787c2ff54880e1945e2d6cf25fda880b5f735029d7a8  linux-4.14-mc9.patch.xz
 e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be  ast-endianness.patch
-b07e673279b97d459572b05a30d643a14b9fbc413d3bd84d9ec71bc3fba8fedcf01e9b2a619a671b62c278a66450ee9cd1f9c8b93c5ba39176976043635aab83  config-ppc64"
+0309bc1f9489ea78f81845d05e2482524e95f2b654ec78796955d80293c3c0a956e63190eb3d5954638061bc18fbf399c70e51815793c6635a8d680bded7374d  config-ppc64"
diff --git a/system/easy-kernel-power8/config-ppc64 b/system/easy-kernel-power8/config-ppc64
index a3ba65b98..cce3d156c 100644
--- a/system/easy-kernel-power8/config-ppc64
+++ b/system/easy-kernel-power8/config-ppc64
@@ -86,7 +86,7 @@ CONFIG_SCHED_MUQSS=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-easy"
+CONFIG_LOCALVERSION="-easy-p8"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_XZ=y
-- 
cgit v1.2.3-70-g09d2