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-64k/APKBUILD | 66 ++++++++++++++++++++-------------- system/easy-kernel-power8/APKBUILD | 62 ++++++++++++++++++-------------- system/easy-kernel-power8/config-ppc64 | 2 +- system/easy-kernel/APKBUILD | 35 ++++++++++-------- 4 files changed, 96 insertions(+), 69 deletions(-) (limited to 'system') diff --git a/system/easy-kernel-power8-64k/APKBUILD b/system/easy-kernel-power8-64k/APKBUILD index 1b75a06f4..4ccc016fe 100644 --- a/system/easy-kernel-power8-64k/APKBUILD +++ b/system/easy-kernel-power8-64k/APKBUILD @@ -1,42 +1,50 @@ # Contributor: A. Wilcox # Maintainer: Adelie Platform Group -_pkgname=easy-kernel-power8-64k +# KEEP THIS IN SYNC with the other easy-kernel packages. +_kflavour=-power8-64k +_pkgname=easy-kernel$_kflavour pkgver=4.14.88 pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel -_kflavour=power8-64k pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers (with 64K page size)" url="https://kernel.org/" arch="ppc64" options="!check !dbg !strip !tracedeps" license="GPL-2.0-only" depends="" -makedepends="bc gzip lzop openssl-dev xz" +makedepends="bc gzip kmod lzop openssl-dev xz" install="" -provides="easy-kernel-power8-64k=$pkgver-r$pkgrel" -subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules" -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 +provides="easy-kernel$_kflavour=$pkgver-r$pkgrel" +subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules + $_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" 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" # Maintainer: Adelie Platform Group -_pkgname=easy-kernel +# KEEP THIS IN SYNC with the other easy-kernel packages. +_kflavour="" +_pkgname=easy-kernel$_kflavour pkgver=4.14.88 pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel @@ -12,9 +14,10 @@ license="GPL-2.0-only" depends="" makedepends="bc gzip kmod lzop openssl-dev xz" install="" -provides="easy-kernel=$pkgver-r$pkgrel" +provides="easy-kernel$_kflavour=$pkgver-r$pkgrel" subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules - $_pkgname-src-$pkgver-mc$pkgrel:src linux-headers:headers" + $_pkgname-src-$pkgver-mc$pkgrel:src + linux-headers:headers" _pkgmajver=${pkgver%%.*} _pkgminver=${pkgver%.*} source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgminver}.tar.xz @@ -65,29 +68,31 @@ 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$_kflavour 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$_kflavour fi + mv "$pkgdir"/boot/System.map "$pkgdir"/boot/System.map-$pkgver-mc$pkgrel-easy$_kflavour + 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$_kflavour/kernel.release } modules() { pkgdesc="Modules / device drivers for easy-kernel" - provides="easy-kernel-modules=$pkgver-r$pkgrel" + provides="easy-kernel$_kflavour-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$_kflavour/build + rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/source + ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel$_kflavour" \ + "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/build + ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel$_kflavour" \ + "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy$_kflavour/source } headers() { @@ -113,9 +118,9 @@ headers() { src() { pkgdesc="Kernel source code used to build the kernel" - provides="easy-kernel-src=$pkgver-r$pkgrel" + provides="easy-kernel$_kflavour-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$_kflavour } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -- cgit v1.2.3-60-g2f50