From 1ccc465e8f7b7180382a05455b82efa1ea3c260d Mon Sep 17 00:00:00 2001 From: Luis Ressel Date: Tue, 19 Feb 2019 23:45:13 +0100 Subject: system/easy-kernel*: Make the easy-kernel packages more similar Only three of the changes should be user-visible: (1) /boot/System.map --> /boot/System.map-VERSION (2) easy-kernel-power8's CONFIG_LOCALVERSION has been changed from "-p8" to "-power8" (3) easy-kernel-power8-64k now has its own src subpackage instead of relying on easy-kernel-power8-src. --- system/easy-kernel-power8/APKBUILD | 62 +++++++++++++++++++--------------- system/easy-kernel-power8/config-ppc64 | 2 +- 2 files changed, 36 insertions(+), 28 deletions(-) (limited to 'system/easy-kernel-power8') diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD index 477e7ea04..34f8faddd 100644 --- a/system/easy-kernel-power8/APKBUILD +++ b/system/easy-kernel-power8/APKBUILD @@ -1,6 +1,8 @@ # Contributor: A. Wilcox # Maintainer: Adelie Platform Group -_pkgname=easy-kernel-power8 +# KEEP THIS IN SYNC with the other easy-kernel packages. +_kflavour=-power8 +_pkgname=easy-kernel$_kflavour pkgver=4.14.88 pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel @@ -12,31 +14,37 @@ license="GPL-2.0-only" depends="" makedepends="bc gzip kmod lzop openssl-dev xz" install="" -provides="easy-kernel-power8=$pkgver-r$pkgrel" +provides="easy-kernel$_kflavour=$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 - https://distfiles.adelielinux.org/source/linux-4.14-mc$pkgrel.patch.xz + $_pkgname-src-$pkgver-mc$pkgrel:src + " +_pkgmajver=${pkgver%%.*} +_pkgminver=${pkgver%.*} +source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgminver}.tar.xz + https://distfiles.adelielinux.org/source/linux-${_pkgminver}-mc$pkgrel.patch.xz ast-endianness.patch config-ppc64 futex-cmpxchg.patch " -builddir="$srcdir/linux-4.14" +builddir="$srcdir/linux-${_pkgminver}" prepare() { - default_prepare cd "$srcdir" - cat linux-4.14-mc$pkgrel.patch.xz | unxz -> linux-4.14-mc$pkgrel.patch - cd "$builddir" - patch -Np1 <../linux-4.14-mc$pkgrel.patch + cat linux-${_pkgminver}-mc$pkgrel.patch.xz | unxz -> linux-${_pkgminver}-mc$pkgrel.patch + patch -Np1 -d "$builddir"