From 11e9c94318f40b1f4e9016736fc948a5508c6edc Mon Sep 17 00:00:00 2001 From: Luis Ressel Date: Sun, 17 Feb 2019 00:00:00 +0100 Subject: system/easy-kernel: Don't hardcode version numbers --- system/easy-kernel/APKBUILD | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'system') diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index 3e20840fd..ce8d239d5 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -15,8 +15,10 @@ install="" provides="easy-kernel=$pkgver-r$pkgrel" subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules $_pkgname-src-$pkgver-mc$pkgrel:src linux-headers:headers" -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 +_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 config-ppc @@ -27,17 +29,17 @@ source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz kernel.h uapi-ether.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 + cat linux-${_pkgminver}-mc$pkgrel.patch.xz | unxz -> linux-${_pkgminver}-mc$pkgrel.patch cd "$builddir" - patch -Np1 <../linux-4.14-mc$pkgrel.patch + patch -Np1 <../linux-${_pkgminver}-mc$pkgrel.patch 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() { @@ -106,6 +108,7 @@ src() { mkdir -p "$subpkgdir"/usr/src mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel } + sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -- cgit v1.2.3-60-g2f50 From 22326084130c03c2525a2d8ded003079161c8228 Mon Sep 17 00:00:00 2001 From: Luis Ressel Date: Sun, 17 Feb 2019 00:42:57 +0100 Subject: sys/easy-kernel: Use patch -d --- system/easy-kernel/APKBUILD | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'system') diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index ce8d239d5..2fa91306a 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -35,9 +35,7 @@ prepare() { default_prepare cd "$srcdir" cat linux-${_pkgminver}-mc$pkgrel.patch.xz | unxz -> linux-${_pkgminver}-mc$pkgrel.patch - cd "$builddir" - patch -Np1 <../linux-${_pkgminver}-mc$pkgrel.patch - cd "$srcdir" + patch -Np1 -d "$builddir" Date: Sun, 17 Feb 2019 00:03:53 +0100 Subject: system/easy-kernel: Make easy-kernel-src suitable for OOT module builds --- system/easy-kernel/APKBUILD | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'system') diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index 2fa91306a..5d93116c8 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -43,6 +43,10 @@ prepare() { build() { cd "$builddir" make LDFLAGS="" + + cd "$srcdir/linux-src" + make LDFLAGS="" modules_prepare + cp "$builddir/Module.symvers" . } package() { -- cgit v1.2.3-60-g2f50