diff options
| author | Erich Eckner <git@eckner.net> | 2021-05-26 17:21:03 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2021-05-26 17:21:03 +0200 |
| commit | d3e2ea5eedcb1d6b084d2613b02a8e26295a2ff8 (patch) | |
| tree | 544488e24ab9d951dc736dc9404ae705baf29a4d | |
| parent | e217e1b42f8f61eb71c81d9f6d05e64a34c3ae9f (diff) | |
| download | packages-d3e2ea5eedcb1d6b084d2613b02a8e26295a2ff8.tar.xz | |
core/pacman: well, "Aller guten Dinge sind drei"
| -rw-r--r-- | core/pacman/PKGBUILD | 2 | ||||
| -rw-r--r-- | core/pacman/replace-i686-by-pentium4-when-architecture-is-auto.patch | 46 |
2 files changed, 47 insertions, 1 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index fa05afd7..7bfd4f16 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -24,7 +24,7 @@ if [ ! "${CARCH}" = "i686" ]; then fi source+=('replace-i686-by-pentium4-when-architecture-is-auto.patch') -sha256sums+=('f866cfe3df0108dba7e9468dbe11a29974f35ab3d6a65d7be67d2112adb1ce10') +sha256sums+=('6851f31d94e504637ee2f1dd20a53c029ae459a5ac6641af0d3fb6adf450d3c8') eval "$( { diff --git a/core/pacman/replace-i686-by-pentium4-when-architecture-is-auto.patch b/core/pacman/replace-i686-by-pentium4-when-architecture-is-auto.patch index 909a52d3..4ec75940 100644 --- a/core/pacman/replace-i686-by-pentium4-when-architecture-is-auto.patch +++ b/core/pacman/replace-i686-by-pentium4-when-architecture-is-auto.patch @@ -56,3 +56,49 @@ index 7e810127..2a50fa4b 100644 if(len >= 100) { pm_printf(ALPM_LOG_WARNING, _("HTTP_USER_AGENT truncated\n")); } +diff --git a/test/pacman/tests/upgrade082.py b/test/pacman/tests/upgrade082.py +index 0bdbdf71..8c30ec32 100644 +--- a/test/pacman/tests/upgrade082.py ++++ b/test/pacman/tests/upgrade082.py +@@ -3,6 +3,18 @@ + import os + machine = os.uname()[4] + ++if machine == 'i686': ++ import re ++ fo = open('/proc/cpuinfo') ++ for line in fo: ++ name_value = [s.strip() for s in line.split(':', 1)] ++ if len(name_value) != 2: ++ continue ++ name, value = name_value ++ if name == "flags": ++ if re.match(r'.*?\bsse2\b', value) is not None: ++ machine = 'pentium4' ++ + p = pmpkg("dummy") + p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] +diff --git a/test/pacman/tests/upgrade083.py b/test/pacman/tests/upgrade083.py +index 097ae02c..7195e35b 100644 +--- a/test/pacman/tests/upgrade083.py ++++ b/test/pacman/tests/upgrade083.py +@@ -3,6 +3,18 @@ + import os + machine = os.uname()[4] + ++if machine == 'i686': ++ import re ++ fo = open('/proc/cpuinfo') ++ for line in fo: ++ name_value = [s.strip() for s in line.split(':', 1)] ++ if len(name_value) != 2: ++ continue ++ name, value = name_value ++ if name == "flags": ++ if re.match(r'.*?\bsse2\b', value) is not None: ++ machine = 'pentium4' ++ + p = pmpkg("dummy") + p.files = ["bin/dummy", + "usr/man/man1/dummy.1"] |