From 2a22be7412e688c512b7b0dfb430a450cc6264d4 Mon Sep 17 00:00:00 2001
From: Mike Sullivan <mksully22@gmail.com>
Date: Wed, 6 Mar 2019 17:00:45 +0000
Subject: [PATCH] main/linux-vanilla: enable CONFIG_CRYPTO_USER config settings
fix checksum for config-vanilla.ppc64le
(cherry picked from commit 587fcc3315a78d1fedeab62f715dc3a40687df44)
---
main/linux-vanilla/APKBUILD | 4 ++--
main/linux-vanilla/config-vanilla.ppc64le | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index a08e8e523028..3d753d167695 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"
@@ -225,7 +225,7 @@ ec13f4d88f22779e1545c194bc017ca898d3cd6f95023ae2dbfae80e5557594713dce9445488d064
1764d37464498b2d56032b00f7a38be7629194adb2c58317386d55fc709428fee83a877d86065e8bca6c7fc0553ca36a006f66cb28b5ca4196d6a13fd2d44101 config-vanilla.x86
003b62a9ed4e5290d3366466ff2ab2557c04da9dd12f33c844162bfe4c3b21110e6492d9f5eb9684a5d555a4ccc48fce2b337ec32a5bbc0eb71ecb147c7a7e9b config-vanilla.x86_64
96651aca476c905c04d616565a2dd08066167c1d4887e2ddc86c4b7cdda44257ef633a9bcf745a91f00f88023dde8f1804c56b258e7e99232bb8bfa25d0ba4db config-vanilla.ppc
-8df56e276c22213844591dd9417bd66ccbe7512979b771f39ec55a135b0e515601df72d7d80f0ec95b88456c3fb49307b761b23a8bbf59b1f8e81c48670d52de config-vanilla.ppc64le
+5d020441e5d8488a2b832d026cb5a26fbe2d58a9046849957e96f5d19e5e4e90da9f3d88327bd28771c6ce5c4e2c36499d5310496f689f4aa3487e8accd7ccf5 config-vanilla.ppc64le
c6dc137c3b0518284da53a8876c18a58bd299be4980b3c183949c7e57bef97570d73f3c568888fa392a769226dacc5558082b44b388f79d9a7daa677bbc5f9f4 config-vanilla.s390x
2f4b32df9f0168dd3388443ca8aa8e77a2e061ce68d4227d651fe6a6dec06e7b55d94fec135f6f5b64d573b2c7327d454e98199290b6c720fa5eb47b4bfe143b config-virt.aarch64
1376439b1aa59f00b38ac0f70b63af902d69891e569e835e9c72fbb7099ff6c62762d5c17cb6518fb9378f2f553a365b3931617b326705b3387d7fbc7971d407 config-virt.x86
diff --git a/main/linux-vanilla/config-vanilla.ppc64le b/main/linux-vanilla/config-vanilla.ppc64le
index ddecfb9169ee..68ba66e93014 100644
--- a/main/linux-vanilla/config-vanilla.ppc64le
+++ b/main/linux-vanilla/config-vanilla.ppc64le
@@ -3616,7 +3616,7 @@ CONFIG_CRYPTO_DH=y
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
-# CONFIG_CRYPTO_USER is not set
+CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
CONFIG_CRYPTO_GF128MUL=m
CONFIG_CRYPTO_NULL=m
@@ -3736,10 +3736,11 @@ CONFIG_CRYPTO_DRBG_HMAC=y
# CONFIG_CRYPTO_DRBG_CTR is not set
CONFIG_CRYPTO_DRBG=m
CONFIG_CRYPTO_JITTERENTROPY=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-# CONFIG_CRYPTO_USER_API_RNG is not set
-# CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_NX=y
CONFIG_CRYPTO_DEV_NX_COMPRESS=y
--
GitLab