diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-09-09 07:27:18 +0000 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-09-09 07:27:18 +0000 |
| commit | bfa2db7ade84ab233e71e793a103c2d13dac8ed3 (patch) | |
| tree | 78570252c3afb50546b5ea4bba87a9c8869bf5fb /core | |
| parent | 0e5961e6e0038b2d338c1ecea8db71f1155276ac (diff) | |
| parent | 43d8fdd33906541c80c7f838a26e0e594a11886a (diff) | |
| download | packages-bfa2db7ade84ab233e71e793a103c2d13dac8ed3.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core')
| -rw-r--r-- | core/linux/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/linux/config | 9 | ||||
| -rw-r--r-- | core/nss/PKGBUILD | 3 |
3 files changed, 8 insertions, 10 deletions
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 8531be1d..85773e57 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -1,9 +1,9 @@ -# upstream git revision: 9a8d23e9abeb3de414fe2f2bb62a83193f59c390 +# upstream git revision: 2edc3f8d648d3f161a9593c0a41332dae246cdfd # fail if upstream's .config changes for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = 'bb700544d499a92dab141a218cc1eac62fdff0b67682748cb827035269c02a55' ]; then - sha256sums[${i}]='35627a74558c1171af386dcb6d69c45619ec3189a4c6444d94b94f75f19da5c6' + if [ "${sha256sums[${i}]}" = '83d768f19193f6795b8159d81c6775b9f62f4994f2a0d8371ac243e7b0890db8' ]; then + sha256sums[${i}]='224d422c6eea90fa395e49adf672a48468fd9d702f698a3ab4c9b9ee40c7cd18' fi done diff --git a/core/linux/config b/core/linux/config index bc17d042..2b4c93f6 100644 --- a/core/linux/config +++ b/core/linux/config @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.3-arch1 Kernel Configuration +# Linux/x86 4.18.6-arch1 Kernel Configuration # # -# Compiler: gcc (GCC) 8.2.0 +# Compiler: gcc (GCC) 8.2.1 20180831 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -43,7 +43,7 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=2 CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=80200 +CONFIG_GCC_VERSION=80201 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -302,6 +302,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -7405,7 +7406,7 @@ CONFIG_RTC_DRV_RV3029_HWMON=y # # Platform RTC drivers # -CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS1286=m CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m diff --git a/core/nss/PKGBUILD b/core/nss/PKGBUILD index afd28e8b..1a4dfa96 100644 --- a/core/nss/PKGBUILD +++ b/core/nss/PKGBUILD @@ -9,6 +9,3 @@ eval "$( /cd nss-/a patch -Np2 -i ../no-plt.diff ' )" - -# temporary, we have the wrong sum, is fixed upstream -sha256sums[0]='2c643d3c08d6935f4d325f40743719b6990aa25a79ec2f8f712c99d086672f62' |