diff options
| -rw-r--r-- | system/easy-kernel-power8/APKBUILD | 2 | ||||
| -rw-r--r-- | system/easy-kernel-power8/config-ppc64 | 2 | ||||
| -rw-r--r-- | system/easy-kernel/APKBUILD | 26 | ||||
| -rw-r--r-- | system/easy-kernel/config-ppc64 | 2 | ||||
| -rw-r--r-- | system/easy-kernel/config-sparc64 | 2 | ||||
| -rw-r--r-- | system/easy-kernel/revert-broken-uapi.patch (renamed from system/linux-headers/revert-broken-uapi.patch) | 0 | ||||
| -rw-r--r-- | system/linux-headers/APKBUILD | 54 |
7 files changed, 27 insertions, 61 deletions
diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD index cf2a72c78..228aa0616 100644 --- a/system/easy-kernel-power8/APKBUILD +++ b/system/easy-kernel-power8/APKBUILD @@ -80,4 +80,4 @@ src() { sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz f76ae636da104c6f1d299a6aff18a5aa1166c9c06efbdf3270c911f26adc1760fbb4271ca2338ced47c7787c2ff54880e1945e2d6cf25fda880b5f735029d7a8 linux-4.14-mc9.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -0309bc1f9489ea78f81845d05e2482524e95f2b654ec78796955d80293c3c0a956e63190eb3d5954638061bc18fbf399c70e51815793c6635a8d680bded7374d config-ppc64" +fd810263d9aeeb2ec33c7872a9ccf52f474d79995d7f265f457226d62ab44456edf583e67fd4425c1e8025df0d359ebab566fbdcf8ce0a6c8c7ce36d726d3da6 config-ppc64" diff --git a/system/easy-kernel-power8/config-ppc64 b/system/easy-kernel-power8/config-ppc64 index cce3d156c..5dc1055a6 100644 --- a/system/easy-kernel-power8/config-ppc64 +++ b/system/easy-kernel-power8/config-ppc64 @@ -4381,7 +4381,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/APKBUILD b/system/easy-kernel/APKBUILD index 1b9d867d0..4a9395acd 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 @@ -22,7 +22,8 @@ source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz config-ppc config-x86_64 config-pmmx - config-aarch64" + config-aarch64 + " builddir="$srcdir/linux-4.14" prepare() { @@ -75,6 +76,25 @@ modules() { "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/source } +headers() { + pkgdesc="System headers provided by the Linux kernel" + cd "$builddir" + patch -Np1 -i "$srcdir"/../revert-broken-uapi.patch + + 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 +104,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 6b22b756d..afb62ea0d 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 14afb1262..08596480d 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 # diff --git a/system/linux-headers/revert-broken-uapi.patch b/system/easy-kernel/revert-broken-uapi.patch index 186ef7196..186ef7196 100644 --- a/system/linux-headers/revert-broken-uapi.patch +++ b/system/easy-kernel/revert-broken-uapi.patch diff --git a/system/linux-headers/APKBUILD b/system/linux-headers/APKBUILD deleted file mode 100644 index 7beaa2272..000000000 --- a/system/linux-headers/APKBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> -pkgname=linux-headers -pkgver=4.14.48 -pkgrel=8 -pkgdesc="Linux system headers" -url="https://kernel.org" -arch="all" -options="!check !dbg !strip !tracedeps" # Headers only -license="GPL-2.0-only" -makedepends="perl" -source="https://kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz - https://distfiles.adelielinux.org/source/linux-4.14-mc$pkgrel.patch.xz - revert-broken-uapi.patch - " -builddir="$srcdir/linux-4.14" - -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 - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -package() { - local _carch=$CARCH - - case "$_carch" in - aarch64*) _carch="arm64" ;; - arm*) _carch="arm" ;; - mips*) _carch="mips" ;; - s390*) _carch="s390" ;; - ppc*) _carch="powerpc" ;; - pmmx) _carch="x86" ;; - esac - - cd "$builddir" - mkdir -p "$pkgdir/usr" - make headers_install ARCH="${_carch}" INSTALL_HDR_PATH="$pkgdir/usr" - - find "$pkgdir/usr" \( -name .install -o -name ..install.cmd \) -exec \ - rm -f {} \; - - # provided by libdrm - rm -rf "$pkgdir"/usr/include/drm -} - -sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -3fe2da1714cc83d909ba43d27c7f22ef4f2a6ecfd91ff81e0e141a0dd742ec78ad11392186871762f410615ae7c7f33dd814e0f194c7f7aed1dee2d9fca0252d linux-4.14-mc8.patch.xz -32597f2672d1ec365a936d15041a7cf219ef9353241d4a5c378244cf2fc155610443a19bbcd391c86099a0b08486c45e042ec7c90b0d04fe675c3ad0ffc36b53 revert-broken-uapi.patch" |