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>2019-03-07 09:28:01 +0100
committerErich Eckner <git@eckner.net>2019-03-07 09:28:01 +0100
commit5266bbc8bae99d09837027952793c00c857ef542 (patch)
tree4a924cdbc906445dfa4dc0eb16794e2893535df4
parentf63b3152a411ef335f6909ea87170adb6546b8bd (diff)
"pentium3" -> "pentium4"
-rwxr-xr-xbin/build-packages2
-rwxr-xr-xbin/check-opcodes1
-rwxr-xr-xlib/common-functions4
-rwxr-xr-xlib/mysql-functions2
4 files changed, 5 insertions, 4 deletions
diff --git a/bin/build-packages b/bin/build-packages
index c6862f5..10c3e49 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -7,7 +7,7 @@
# shellcheck source=../lib/load-configuration
. "${0%/*}/../lib/load-configuration"
-# TODO: distinguish between "pentium3" and "i686"
+# TODO: distinguish between "pentium4" and "i686"
# TODO: report back memory and hdd stats to the build master on successful build
diff --git a/bin/check-opcodes b/bin/check-opcodes
index 5965d50..e9f69a2 100755
--- a/bin/check-opcodes
+++ b/bin/check-opcodes
@@ -104,6 +104,7 @@ case $ARCH in
i686)
OPCODE_ARGS='-s MMX -s SSE'
;;
+# TODO: pentium4
pentium3)
OPCODE_ARGS='-s SSE2 -s SSE3'
;;
diff --git a/lib/common-functions b/lib/common-functions
index 4904b37..e0ba40b 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -398,7 +398,7 @@ recursively_umount_and_rm() {
}
# mangle_pkgbuild $PKGBUILD [$sub_pkgrel]
-# mangle $arch in PKBUILDs to contain i486, i686, pentium3
+# mangle $arch in PKBUILDs to contain i486, i686, pentium4
# append $sub_pkgrel to the pkgrel
# remove "lib32-" and "gcc-multilib" from {make,check,opt,}depends
@@ -418,7 +418,7 @@ mangle_pkgbuild() {
sed -i '
/^arch=[^#]*any/!{
- /^arch=(/s/(/(i486 i686 pentium3 /
+ /^arch=(/s/(/(i486 i686 pentium4 /
}
s/^\(\s*pkgrel=\)['"'"'"]\?\([0-9.]\+\)['"'"'"]\?\s*\(#.*\)\?$/\1"\2'"${sub_pkgrel}"'"/
' "${PKGBUILD}"
diff --git a/lib/mysql-functions b/lib/mysql-functions
index 4f146dd..e0dddae 100755
--- a/lib/mysql-functions
+++ b/lib/mysql-functions
@@ -218,7 +218,7 @@ mysql_generate_package_metadata() {
exit 2
fi
# remove empty lines and unsupported architectures
- # TODO: support "pentium3" architecture, too
+ # TODO: support "pentium4" architecture, too
sed -i '
/^[^=]*=\s*$/d
/^\s*arch = /{