diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-08-03 16:26:17 +0000 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-08-03 16:26:17 +0000 |
| commit | 28cb1b2a1433935ddd9071fbd743d92bf3ba3cf9 (patch) | |
| tree | 648594b4f5e5e1c84cde2f6043dc81ca0236a9c0 /core/linux | |
| parent | 0056ae3e53f0ebc43d2ddff06047627115295101 (diff) | |
| parent | e832281fc806cde356864067db9b966caa71d3d1 (diff) | |
| download | packages-28cb1b2a1433935ddd9071fbd743d92bf3ba3cf9.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core/linux')
| -rw-r--r-- | core/linux/PKGBUILD | 10 | ||||
| -rw-r--r-- | core/linux/config | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index d7591b31..9a78606e 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -1,9 +1,11 @@ -# upstream git revision: d299e4f0ee4303f6184169b7c55c2fbf54d158f2 +# upstream git revision: e2e10e88c44d845f0fd03f973dd3d17dd187f84d # fail if upstream's .config changes -if [ "${sha256sums[4]}" = 'f8e890eac9779a89009c1e2339f757e9781864df09805211fad005146fe2578b' ]; then - sha256sums[4]='20be3e13eb124181a502c1b69614077b40826a6305e63774b6e9d03071d51dd5' -fi +for ((i=0; i<${#sha256sums[@]}; i++)); do + if [ "${sha256sums[${i}]}" = 'aa7b6756f193f3b3a3fc4947e7a77b09e249df2e345e6495292055d757ba8be6' ]; then + sha256sums[${i}]='008371f47d4f6135c82bf0986e56e4eaff2258d58cc52658e9541e0657597333' + fi +done eval "$( declare -f package_linux-headers | \ diff --git a/core/linux/config b/core/linux/config index 46159c16..5a7fdf1c 100644 --- a/core/linux/config +++ b/core/linux/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.17.6-1 Kernel Configuration +# Linux/x86 4.17.11-arch1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -50,8 +50,8 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-ARCH" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y @@ -9360,7 +9360,6 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -# CONFIG_CRYPTO_SALSA20_586 is not set CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m |