From c9a4127ebc159a84108ec0d9ffa8907ece339c70 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 16 Aug 2018 05:10:19 +0000
Subject: [PATCH] system/easy-kernel: Install utsrelease.h, enable XTS on
ppc64/sparc64
---
system/easy-kernel/APKBUILD | 22 ++++++++++++++++++++--
system/easy-kernel/config-ppc64 | 2 +-
system/easy-kernel/config-sparc64 | 2 +-
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index 1b9d867d03..e355ad1a3f 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -14,7 +14,7 @@ makedepends="bc gzip lzop openssl-dev xz"
install=""
provides="easy-kernel=$pkgver-r$pkgrel"
subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules
- $_pkgname-src-$pkgver-mc$pkgrel:src"
+ $_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
ast-endianness.patch
@@ -75,6 +75,24 @@ modules() {
"$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/source
}
+headers() {
+ pkgdesc="System headers provided by the Linux kernel"
+ cd "$builddir"
+
+ mkdir -p "$subpkgdir"/usr
+ make headers_install INSTALL_HDR_PATH="$subpkgdir/usr"
+
+ find "$subpkgdir/usr" \( -name .install -o -name ..install.cmd \) -exec \
+ rm -f {} \;
+
+ # provided by libdrm
+ rm -rf "$subpkgdir"/usr/include/drm
+
+ # needed for spl, VMware on x86, etc
+ install -D -m644 "$builddir"/include/generated/utsrelease.h \
+ "$subpkgdir"/usr/include/linux/utsrelease.h
+}
+
src() {
pkgdesc="Kernel source code used to build the kernel"
provides="easy-kernel-src=$pkgver-r$pkgrel"
@@ -84,7 +102,7 @@ src() {
sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz
f76ae636da104c6f1d299a6aff18a5aa1166c9c06efbdf3270c911f26adc1760fbb4271ca2338ced47c7787c2ff54880e1945e2d6cf25fda880b5f735029d7a8 linux-4.14-mc9.patch.xz
e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch
-1fbd909a38e790638b7adb6375a58a098c6bfb893f39c89373debc3ccae8dcc1306e8740f452ccfb6aee8ab707aab9df484aa4f9a13711ba3623d026adbfaa42 config-ppc64
+3d3ee8f7c27ff20b9569ec4dadabd2c733102d1cf5fd3f6abfefaa4dc34e5161b793d82bce7c29f02aafe74791b345b516bf5b1503d36bf714ef2e70507a2bc3 config-ppc64
1112f6c3fcfd7fdc0ef4d5e85df5d3adea430a9c7b4c2b34508a215f7ba14c863ccd7a5e17f13ed46c518bafec30cfb3ced70c465137c14ef5fc998b6cbcca1f config-ppc
438a66561200d570b3bf6ab0481d9725a9f482b1fcf852a90f99c6db5aa4ee02d2b67b57235bb7afc01515a79289407cbe111536340824d7a391ce1a658c9a76 config-x86_64
e8f7749877c5b2574e7e853b757477b8f99d757b43225d4f83d611c20215b8b2690cc85369608c2dc8f7d6a619136a2d7dde4648031e37d2ae4dcc5ba85652c8 config-pmmx
diff --git a/system/easy-kernel/config-ppc64 b/system/easy-kernel/config-ppc64
index 6b22b756d3..afb62ea0d3 100644
--- a/system/easy-kernel/config-ppc64
+++ b/system/easy-kernel/config-ppc64
@@ -4430,7 +4430,7 @@ CONFIG_CRYPTO_CTR=m
CONFIG_CRYPTO_ECB=m
# CONFIG_CRYPTO_LRW is not set
CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_XTS is not set
+CONFIG_CRYPTO_XTS=m
# CONFIG_CRYPTO_KEYWRAP is not set
#
diff --git a/system/easy-kernel/config-sparc64 b/system/easy-kernel/config-sparc64
index 14afb1262b..08596480d4 100644
--- a/system/easy-kernel/config-sparc64
+++ b/system/easy-kernel/config-sparc64
@@ -4079,7 +4079,7 @@ CONFIG_CRYPTO_CTR=m
CONFIG_CRYPTO_ECB=m
# CONFIG_CRYPTO_LRW is not set
CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_XTS is not set
+CONFIG_CRYPTO_XTS=m
# CONFIG_CRYPTO_KEYWRAP is not set
#
--
GitLab