changeset 6581:e5c0c787ed73

Change msys2 repo for 32bit msys2 * src/msys2-filesystem.mk: dont refresh keys in 32bit * src/msys2-pacman.mk: add build32 repo
author John Donoghue <john.donoghue@ieee.org>
date Mon, 26 Dec 2022 13:23:45 -0500
parents 380594f52059
children 9a909530773b
files src/msys2-filesystem.mk src/msys2-pacman.mk
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/msys2-filesystem.mk	Sun Nov 27 19:08:31 2022 +0100
+++ b/src/msys2-filesystem.mk	Mon Dec 26 13:23:45 2022 -0500
@@ -23,5 +23,8 @@
 define $(PKG)_BUILD
     echo "# mount tmp to users profile temp dir" >> "$(1)/etc/fstab"
     echo "none /tmp usertemp binary,noacl,posix=0 0 0" >> "$(1)/etc/fstab"
+    if [ "$(MSYS2_ARCH)" =  "i686" ]; then \
+      $(SED) -i 's/\(.*refresh-keys.*\)/#\1/g' "$(1)/etc/post-install/07-pacman-key.post"; \
+    fi
     $(MSYS2_PKG_BUILD)
 endef
--- a/src/msys2-pacman.mk	Sun Nov 27 19:08:31 2022 +0100
+++ b/src/msys2-pacman.mk	Mon Dec 26 13:23:45 2022 -0500
@@ -21,5 +21,8 @@
 endef
 
 define $(PKG)_BUILD
+    if [ "$(MSYS2_ARCH)" =  "i686" ]; then \
+      $(SED) -i '/^\[msys\]/i \[build32\]\nServer = $(MSYS2_URL)\nSigLevel = Optional\n' "$(1)/etc/pacman.conf"; \
+    fi
     $(MSYS2_PKG_BUILD)
 endef