aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTuan Hoang <tmhoang@linux.ibm.com>2019-03-29 13:02:49 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2019-04-03 13:23:38 +0000
commit3ca3ebf41448a6d91983eed4b61d85dae7e0ac1b (patch)
tree6c17b5ed2a5d3c9adfbc3c66bf9cd406b6de39c9 /main
parentdae185e9767fcff8165a00d4710ce5144f6d4cf5 (diff)
downloadaports-3ca3ebf41448a6d91983eed4b61d85dae7e0ac1b.tar.bz2
aports-3ca3ebf41448a6d91983eed4b61d85dae7e0ac1b.tar.xz
main/linux-vanilla: add pkey for s390x
zkey in s390-tools requires pkey module
Diffstat (limited to 'main')
-rw-r--r--main/linux-vanilla/APKBUILD4
-rw-r--r--main/linux-vanilla/config-vanilla.s390x3
2 files changed, 4 insertions, 3 deletions
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 77a9319d4f..5d1567629d 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
-pkgrel=0
+pkgrel=1
pkgdesc="Linux vanilla kernel"
url="http://kernel.org"
depends="mkinitfs"
@@ -229,7 +229,7 @@ sha512sums="ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb6
f565cd00f1f356019172e37e798e86dd8a8d9d799181ac2be4045f8bec736f1e7bdb12bf708ebb0a326845f0b4889759fdaac3a4544e30173485ad512f219427 config-vanilla.x86_64
96651aca476c905c04d616565a2dd08066167c1d4887e2ddc86c4b7cdda44257ef633a9bcf745a91f00f88023dde8f1804c56b258e7e99232bb8bfa25d0ba4db config-vanilla.ppc
3d90dfaa35142977945cdb0d8a6260861d89e5e36a6fd3a3602c4538a41bac8680c4e53617d4d072b3554bc3a01a26278e5d8da6d161254f07b51dd00666c27d config-vanilla.ppc64le
-ee0e866bbea1208139217f29bbe34145e32d08f0b7b71fd68202897ec719b8f8a1347ddf8c2cfc8f82bafbc27af2f81a0f2b053725786d674d79383cafed9350 config-vanilla.s390x
+622fd889d7b80c267c73f62981f5025e35a2429191aeeb222fca921790fb32f68154dbcece4a12ab975de8a441ebd1d7947880ce92fc9d22ea1324e8b0457ca0 config-vanilla.s390x
26c6aa63baf022aa57e92e9fd79f662b18bec3bc34935ffb08e7f60c07b03ceb15d240ddd068d53132250a59070d5daeaa6bd17e90ec264f3239b4d9daa28b97 config-virt.aarch64
2bea88a681c18d63d35fbb4014bf68be46eaa6df9824cd07ea0eaf46ffb7a91170cef2678594ca6f250849630efaebd3813e61708cc31c1a46c3d161116cb7db config-virt.x86
56258c34b4dcebf3d0724ec8c7a714776fae965daf659a427e59852cc54d9650416baa4e6beb849b5cc29899b6c52c083dfbd6af7cc188e2b9d860d6360e5538 config-virt.x86_64
diff --git a/main/linux-vanilla/config-vanilla.s390x b/main/linux-vanilla/config-vanilla.s390x
index 93a574bcc6..0dd94eb366 100644
--- a/main/linux-vanilla/config-vanilla.s390x
+++ b/main/linux-vanilla/config-vanilla.s390x
@@ -2937,7 +2937,8 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_ZCRYPT=m
-# CONFIG_PKEY is not set
+CONFIG_PKEY=m
+CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_SHA1_S390=m
CONFIG_CRYPTO_SHA256_S390=m
CONFIG_CRYPTO_SHA512_S390=m