Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-13 16:25:12 +0200
committerErich Eckner <git@eckner.net>2018-09-13 16:25:12 +0200
commit1043bc79df83ae761ec29f1bb7d6838150963daf (patch)
tree559b159acf9ba12abda961415073a39e62fd10ce
parent468b5ec78930f44008d36583dd4a98ab56d84067 (diff)
parentcbfdc074de0fa71dd501bd59a3fe4dd4cb27ec5b (diff)
Merge branch 'master' into i486
-rw-r--r--core/linux/PKGBUILD25
-rw-r--r--core/linux/config.i686 (renamed from core/linux/config)0
2 files changed, 8 insertions, 17 deletions
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 85773e57..17c3a8ca 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -3,11 +3,18 @@
# fail if upstream's .config changes
for ((i=0; i<${#sha256sums[@]}; i++)); do
if [ "${sha256sums[${i}]}" = '83d768f19193f6795b8159d81c6775b9f62f4994f2a0d8371ac243e7b0890db8' ]; then
- sha256sums[${i}]='224d422c6eea90fa395e49adf672a48468fd9d702f698a3ab4c9b9ee40c7cd18'
+ source_i686=('config.i686')
+ sha256sums_i686='224d422c6eea90fa395e49adf672a48468fd9d702f698a3ab4c9b9ee40c7cd18'
+ source_i486=('config.i486')
+ sha256sums_i486='8bb140f3f672d6e10bfb652a617d0c161b24980c750d2358cece2b82f8897dcb'
fi
done
eval "$(
+ declare -f prepare | \
+ sed '
+ s,\.\./config,../config.$CARCH,
+ '
declare -f package_linux-headers | \
sed '
\,/tools/objtool" ,d
@@ -17,19 +24,3 @@ eval "$(
}
'
)"
-
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # no documentation
- makedepends=(${makedepends[@]//xmlto/})
-
- # use i486-specific kernel configuration
- source[4]='config.i486'
- sha256sums[4]='8bb140f3f672d6e10bfb652a617d0c161b24980c750d2358cece2b82f8897dcb'
- eval "$(
- declare -f prepare | \
- sed '
- /cd.*_srcname/ a \ cp ../config.i486 ../config
- '
- )"
-fi
diff --git a/core/linux/config b/core/linux/config.i686
index 2b4c93f6..2b4c93f6 100644
--- a/core/linux/config
+++ b/core/linux/config.i686