summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-02-21 17:24:16 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-02-21 17:24:16 +0000
commit6b819a5e3b6931fef6cefbce5e67c39996151aab (patch)
tree8b5f5ef373d627571ab1334392558ff1b73accb4
parentd397ab02f9c6c4e5a0ac0a2d5331999d056ae27b (diff)
parent1ccc465e8f7b7180382a05455b82efa1ea3c260d (diff)
downloadpackages-6b819a5e3b6931fef6cefbce5e67c39996151aab.tar.gz
packages-6b819a5e3b6931fef6cefbce5e67c39996151aab.tar.bz2
packages-6b819a5e3b6931fef6cefbce5e67c39996151aab.tar.xz
packages-6b819a5e3b6931fef6cefbce5e67c39996151aab.zip
Merge branch 'easy-kernel-power' into 'master'
system/easy-kernel*: Make the easy-kernel packages more similar See merge request !174
-rw-r--r--system/easy-kernel-power8-64k/APKBUILD66
-rw-r--r--system/easy-kernel-power8/APKBUILD62
-rw-r--r--system/easy-kernel-power8/config-ppc642
-rw-r--r--system/easy-kernel/APKBUILD35
4 files changed, 96 insertions, 69 deletions
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 <awilfox@adelielinux.org>
# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
-_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-${_pkgminver}-mc$pkgrel.patch
+ default_prepare
cd "$srcdir"
- cp config-$CARCH linux-4.14/.config
- cp -pr linux-4.14 linux-src
+ cp config-$CARCH linux-${_pkgminver}/.config
+ cp -pr linux-${_pkgminver} linux-src
}
build() {
cd "$builddir"
make LDFLAGS=""
+
+ cd "$srcdir/linux-src"
+ make LDFLAGS="" modules_prepare clean
+ cp "$builddir/Module.symvers" .
}
package() {
@@ -48,32 +56,38 @@ package() {
if [ -f "$pkgdir"/boot/vmlinuz ]; then
mv "$pkgdir"/boot/vmlinuz \
- "$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy-$_kflavour
+ "$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-$_kflavour
+ "$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy$_kflavour
fi
- # This allows coexistence of both kernel flavours on media.
- mv "$pkgdir"/boot/System.map "$pkgdir"/boot/System.map-$_kflavour
+ 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-$_kflavour/kernel.release
+ "$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel$_kflavour/kernel.release
}
modules() {
pkgdesc="Modules / device drivers for easy-kernel"
- provides="easy-kernel-power8-64k-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-$_kflavour/build
- rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-$_kflavour/source
- ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel-p8" \
- "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-$_kflavour/build
- ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel-p8" \
- "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy-$_kflavour/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
+}
+
+src() {
+ pkgdesc="Kernel source code used to build the kernel"
+ provides="easy-kernel$_kflavour-src=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir"/usr/src
+ mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel$_kflavour
}
sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz
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 <awilfox@adelielinux.org>
# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
-_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" <linux-${_pkgminver}-mc$pkgrel.patch
+ default_prepare
cd "$srcdir"
- cp config-$CARCH linux-4.14/.config
- cp -pr linux-4.14 linux-src
+ cp config-$CARCH linux-${_pkgminver}/.config
+ cp -pr linux-${_pkgminver} linux-src
}
build() {
cd "$builddir"
make LDFLAGS=""
+
+ cd "$srcdir/linux-src"
+ make LDFLAGS="" modules_prepare clean
+ cp "$builddir/Module.symvers" .
}
package() {
@@ -48,42 +56,42 @@ package() {
if [ -f "$pkgdir"/boot/vmlinuz ]; then
mv "$pkgdir"/boot/vmlinuz \
- "$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy-p8
+ "$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-p8
+ "$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy$_kflavour
fi
- # This allows coexistence of both kernel flavours on media.
- mv "$pkgdir"/boot/System.map "$pkgdir"/boot/System.map-p8
+ 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-p8/kernel.release
+ "$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel$_kflavour/kernel.release
}
modules() {
pkgdesc="Modules / device drivers for easy-kernel"
- provides="easy-kernel-power8-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-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
+ 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
}
src() {
pkgdesc="Kernel source code used to build the kernel"
- provides="easy-kernel-power8-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-p8
+ mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel$_kflavour
}
+
sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz
bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz
e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch
-7eaa8840cbcb78afcc95a2e57a0fe92d6016f0ee6b5e1530e647ddb2799dae709ff57ac86bdfdefd32be1f3b1aec789cdc6b49f81c3186291672a8945bc474dd config-ppc64
+70c09aaa7e75ef04389d69768874bc243f351a63f481b191d5708f74f1ceccf32dbbc286415aff4eaf44040a0fd75e90487a50f0c53a32f6d1c0dc779cb56fec config-ppc64
64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch"
diff --git a/system/easy-kernel-power8/config-ppc64 b/system/easy-kernel-power8/config-ppc64
index 62fb8f381..ad91c8957 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-p8"
+CONFIG_LOCALVERSION="-easy-power8"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_XZ=y
diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index 2a3903b73..bcbb9cea1 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -1,6 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
-_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