Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-08-03 16:26:17 +0000
committerAndreas Baumann <mail@andreasbaumann.cc>2018-08-03 16:26:17 +0000
commit28cb1b2a1433935ddd9071fbd743d92bf3ba3cf9 (patch)
tree648594b4f5e5e1c84cde2f6043dc81ca0236a9c0 /core
parent0056ae3e53f0ebc43d2ddff06047627115295101 (diff)
parente832281fc806cde356864067db9b966caa71d3d1 (diff)
Merge branch 'master' into i486
Diffstat (limited to 'core')
-rw-r--r--core/linux/PKGBUILD10
-rw-r--r--core/linux/config7
-rw-r--r--core/pacman/PKGBUILD16
-rw-r--r--core/pacman/pacman.conf2
4 files changed, 19 insertions, 16 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
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 1a0491e0..86372fc6 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -1,14 +1,16 @@
-# upstream git revision: 819bac64f58416f1910c65c8ee40f919cf51ccbb
+# upstream git revision: e06c0338abc7919fe18a2070704bcd498344b29e
depends+=(archlinux32-keyring)
# fail if upstream changes makepkg.conf or pacman.conf
-if [ "${sha256sums[4]}" = '95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b' ]; then
- sha256sums[4]='008f9da1eb55e679eabbab762e106c7741d5ad303adc9644baf589a99e3c1e41'
-fi
-if [ "${sha256sums[5]}" = '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e' ]; then
- sha256sums[5]='d1c3e5f9b7259e401ab121aff335531452d23dc67d9e6c2f464771d25f11058a'
-fi
+for ((i=0; i<${#sha256sums[@]}; i++)); do
+ if [ "${sha256sums[${i}]}" = 'b82e9c1073292766c2f49b5c771dddf37383f1151117ef9cd5e0c11047b4f3eb' ]; then
+ sha256sums[${i}]='d75bbbe42d290c4f22a95e6ac86d4723dc6d0c08228d14c3dcbae9dc5d2514e5'
+ fi
+ if [ "${sha256sums[${i}]}" = '650ddad24cad6afc4aecb4829cb8f06b9acb70c10a44f756fe8bd279949b518e' ]; then
+ sha256sums[${i}]='d1c3e5f9b7259e401ab121aff335531452d23dc67d9e6c2f464771d25f11058a'
+ fi
+done
# i486-specific
if [ "${CARCH}" = "i486" ]; then
diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf
index bf27b628..f6afcb76 100644
--- a/core/pacman/pacman.conf
+++ b/core/pacman/pacman.conf
@@ -16,7 +16,7 @@
#GPGDir = /etc/pacman.d/gnupg/
#HookDir = /etc/pacman.d/hooks/
HoldPkg = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
#UseDelta = 0.7