diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 10:10:08 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 10:10:08 +0100 |
| commit | 826946fc5850f99f21151d575e3d01c2180c8881 (patch) | |
| tree | 57952daf8f036922a378ddf251fba244283cf15e /core | |
| parent | b1ef18278ba295fcddd30751d8294e76e638724e (diff) | |
| parent | 500ec8d4e6dc3f4ee834c1dd9f4dc5bc43e37196 (diff) | |
| download | packages-826946fc5850f99f21151d575e3d01c2180c8881.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core')
| -rw-r--r-- | core/linux/PKGBUILD | 8 | ||||
| -rw-r--r-- | core/linux/config.i486 | 4 | ||||
| -rw-r--r-- | core/linux/config.i686 | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index f0b8eb50..da3f2a9e 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -1,12 +1,12 @@ -# upstream git revision: 2e669a90e89f01c68b7b0faf7f6084aabca61c3f +# upstream git revision: 32c7bb2ff85bb14365f4f0178f57dbd4d7cdc44d source_i686=('config.i686') source_i486=('config.i486') # fail if upstream's .config changes for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = 'e7fa30bb2de12d1a2488423e27c00f26d55668e310e69aaf93673c1afd89dbaf' ]; then - sha256sums_i686=('4af6c8a227ff11512fc11c8654d8148224caef9fcfd26f7927a319abb38a18e9') - sha256sums_i486=('3ef8623d68b0615003e0603b63cc6f74c4904926c5b920155d6cd06650cb3c8c') + if [ "${sha256sums[${i}]}" = 'beb5d9b4280490bec595ef43acb6a9084d579e10fe8329f9a779f6358d887ed1' ]; then + sha256sums_i686=('cffa10b61e52cd1c8747dbf8a7297f91a624174330adfb88a17e4de204db5935') + sha256sums_i486=('f30e5dc00e43b5cffc8e7ce8c502d064d92ffd71a7163710cc7241548b022307') fi done diff --git a/core/linux/config.i486 b/core/linux/config.i486 index ab8bc501..fb9f0821 100644 --- a/core/linux/config.i486 +++ b/core/linux/config.i486 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.4-arch1 Kernel Configuration +# Linux/x86 4.19.8-arch1 Kernel Configuration # # -# Compiler: gcc (GCC) 8.2.1 20180831 +# Compiler: gcc (GCC) 8.2.1 20181127 # CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=80201 diff --git a/core/linux/config.i686 b/core/linux/config.i686 index 950853bd..025cd7c7 100644 --- a/core/linux/config.i686 +++ b/core/linux/config.i686 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.4-arch1 Kernel Configuration +# Linux/x86 4.19.8-arch1 Kernel Configuration # # -# Compiler: gcc (GCC) 8.2.1 20180831 +# Compiler: gcc (GCC) 8.2.1 20181127 # CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=80201 |