Updated arch logic.

lavabit · Dec 6, 2023 · 2fa7cea · 2fa7cea
1 parent bce5a86
commit 2fa7cea
Show file tree

Hide file tree

Showing 8 changed files with 259 additions and 67 deletions.
diff --git a/generic-libvirt-a64.json b/generic-libvirt-a64.json
@@ -997,13 +997,18 @@
       "boot_command": [
         "<tab><wait10><tab><wait10><tab><wait10><tab><wait10><tab><wait10><tab><wait10>",
         "<tab><wait10><tab><wait10><tab><wait10>c<wait><enter>",
-        "setparams 'Install'<enter><wait>",
+        "insmod all_video<enter><wait5>",
+        "set gfxpayload=kee<enter><wait5>",
+        "insmod gzio<enter><wait5>",
+        "insmod part_gpt<enter><wait5>",
+        "insmod ext2<enter><wait5>",
+        "search --no-floppy --set=root -l 'Fedora-S-dvd-aarch64-rawh'<enter><wait5>",
         "linux /images/pxeboot/vmlinuz ",
         "inst.stage2=hd:LABEL=Fedora-S-dvd-aarch64-rawh ro ",
         "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/generic.rawhide.vagrant.a64.ks ",
         "inst.text net.ifnames=0 biosdevname=0 console=ttyAMA0 console=tty1 ",
-        "[email protected] <enter><wait10>",
-        "initrd /images/pxeboot/initrd.img<enter><wait10>",
+        "[email protected] <enter><wait5>",
+        "initrd /images/pxeboot/initrd.img<enter><wait5>",
         "boot<enter><wait>"
       ],
       "qemuargs": [
@@ -1193,7 +1198,7 @@
       "vm_name": "generic-alpine318-libvirt-a64",
       "output_directory": "output/generic-alpine318-libvirt-a64",
       "qemu_binary": "qemu-system-aarch64",
-      "boot_wait": "240s",
+      "boot_wait": "360s",
       "boot_keygroup_interval": "1s",
       "boot_command": [
         "<enter><wait10>",
@@ -1380,7 +1385,7 @@
       "vm_name": "generic-alpine319-libvirt-a64",
       "output_directory": "output/generic-alpine319-libvirt-a64",
       "qemu_binary": "qemu-system-aarch64",
-      "boot_wait": "240s",
+      "boot_wait": "360s",
       "boot_keygroup_interval": "1s",
       "boot_command": [
         "<enter><wait10>",

diff --git a/generic-libvirt-p64.json b/generic-libvirt-p64.json
@@ -115,9 +115,9 @@
   "builders": [
      {
       "type": "qemu",
-      "name": "generic-alma9-libvirt-p65",
-      "vm_name": "generic-alma9-libvirt-p65",
-      "output_directory": "output/generic-alma9-libvirt-p65",
+      "name": "generic-alma10-libvirt-p64",
+      "vm_name": "generic-alma10-libvirt-p64",
+      "output_directory": "output/generic-alma10-libvirt-p64",
       "qemu_binary": "qemu-system-ppc64",
       "boot_wait": "1s",
       "boot_keygroup_interval": "1s",

diff --git a/http/generic.rhel9.vagrant.ks b/http/generic.rhel9.vagrant.ks
@@ -19,10 +19,6 @@ bootloader --timeout=1 --append="net.ifnames=0 biosdevname=0 no_timer_check vga=
 @core
 authconfig
 sudo
--fprintd-pam
--intltool
--iwl*-firmware
--microcode_ctl
 %end
 
 %post
@@ -38,6 +34,7 @@ chmod 0440 /etc/sudoers.d/vagrant
 
 # Duplicate the install media so the DVD can be ejected.
 mount /dev/cdrom /mnt/
+[ ! -d /media/ ] && mkdir /media/
 cp --recursive /mnt/BaseOS/ /media/ && cp --recursive /mnt/AppStream/ /media/
 
 VIRT=`dmesg | grep "Hypervisor detected" | awk -F': ' '{print $2}'`

diff --git a/res/scripts/arches.sh b/res/scripts/arches.sh
@@ -13,24 +13,24 @@ elif [ "$ARCH" == "a64" ] || [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "arm64" ]
   ARCH="arm64"
 elif [ "$ARCH" == "a32" ] || [ "$ARCH" == "armv7" ] || [ "$ARCH" == "armv6" ] || [ "$ARCH" == "arm" ] || [ "$ARCH" == "armeb" ] || [ "$ARCH" == "armle" ] || [ "$ARCH" == "armel" ] || [ "$ARCH" == "armhf" ]; then
   ARCH="arm"
-elif [ "$ARCH" == "p64" ] || [ "$ARCH" == "ppc64" ] || [ "$ARCH" == "power64" ] || [ "$ARCH" == "powerpc64" ]; then
+elif [ "$ARCH" == "m64" ] || [ "$ARCH" == "mips64le" ] || [ "$ARCH" == "mips64el" ] || [ "$ARCH" == "mips64hfel" ]; then
+  ARCH="mips64le"
+elif [ "$ARCH" == "mips64" ] || [ "$ARCH" == "mips64hf" ] ; then
+  ARCH="mips64"
+elif [ "$ARCH" == "m32" ] || [ "$ARCH" == "mips" ] || [ "$ARCH" == "mips32" ] || [ "$ARCH" == "mipsn32" ] || [ "$ARCH" == "mipshf" ] ; then
+  ARCH="mips"
+elif [ "$ARCH" == "mipsle" ] || [ "$ARCH" == "mipsel" ] || [ "$ARCH" == "mipselhf" ]; then
+  ARCH="mipsle"
+elif [ "$ARCH" == "p64" ] || [ "$ARCH" == "ppc64le" ]; then
+  ARCH="ppc64le"
+elif [ "$ARCH" == "ppc64" ] || [ "$ARCH" == "power64" ] || [ "$ARCH" == "powerpc64" ]; then
   ARCH="ppc64"
 elif [ "$ARCH" == "p32" ] || [ "$ARCH" == "ppc32" ] || [ "$ARCH" == "power" ] || [ "$ARCH" == "power32" ] || [ "$ARCH" == "powerpc" ] || [ "$ARCH" == "powerpc32" ] || [ "$ARCH" == "powerpcspe" ]; then
   ARCH="ppc"
 elif [ "$ARCH" == "r64" ] || [ "$ARCH" == "riscv64" ] || [ "$ARCH" == "riscv64sf" ]; then
   ARCH="riscv64"
 elif [ "$ARCH" == "r32" ] || [ "$ARCH" == "riscv" ] || [ "$ARCH" == "riscv32" ]; then
-  ARCH="riscv32"
-elif [ "$ARCH" == "m64" ] || [ "$ARCH" == "mips64" ] || [ "$ARCH" == "mips64hf" ] ; then
-  ARCH="mips64"
-elif [ "$ARCH" == "m32" ] || [ "$ARCH" == "mips" ] || [ "$ARCH" == "mips32" ] || [ "$ARCH" == "mipsn32" ] || [ "$ARCH" == "mipshf" ] ; then
-  ARCH="mips"
-elif [ "$ARCH" == "ppc64le" ]; then
-  ARCH="ppc64le"
-elif [ "$ARCH" == "mips64le" ] || [ "$ARCH" == "mips64el" ] || [ "$ARCH" == "mips64hfel" ]; then
-  ARCH="mips64le"
-elif [ "$ARCH" == "mipsle" ] || [ "$ARCH" == "mipsel" ] || [ "$ARCH" == "mipselhf" ]; then
-  ARCH="mipsle"
+  ARCH="riscv"
 else
   printf "\n${T_YEL}  The architecture is unrecognized. Passing it verbatim to the cloud. [ arch = ${ARCH} ]${T_RESET}\n\n" >&2
 fi
diff --git a/res/scripts/direct.sh b/res/scripts/direct.sh
@@ -217,22 +217,24 @@ elif [ "$ARCH" == "a64" ] || [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "arm64" ]
   ARCH="arm64"
 elif [ "$ARCH" == "a32" ] || [ "$ARCH" == "armv7" ] || [ "$ARCH" == "armv6" ] || [ "$ARCH" == "arm" ] || [ "$ARCH" == "armeb" ] || [ "$ARCH" == "armle" ] || [ "$ARCH" == "armel" ] || [ "$ARCH" == "armhf" ]; then
   ARCH="arm"
-elif [ "$ARCH" == "p64" ] || [ "$ARCH" == "ppc64" ] || [ "$ARCH" == "power64" ] || [ "$ARCH" == "powerpc64" ]; then
+elif [ "$ARCH" == "m64" ] || [ "$ARCH" == "mips64le" ] || [ "$ARCH" == "mips64el" ] || [ "$ARCH" == "mips64hfel" ]; then
+  ARCH="mips64le"
+elif [ "$ARCH" == "mips64" ] || [ "$ARCH" == "mips64hf" ] ; then
+  ARCH="mips64"
+elif [ "$ARCH" == "m32" ] || [ "$ARCH" == "mips" ] || [ "$ARCH" == "mips32" ] || [ "$ARCH" == "mipsn32" ] || [ "$ARCH" == "mipshf" ] ; then
+  ARCH="mips"
+elif [ "$ARCH" == "mipsle" ] || [ "$ARCH" == "mipsel" ] || [ "$ARCH" == "mipselhf" ]; then
+  ARCH="mipsle"
+elif [ "$ARCH" == "p64" ] || [ "$ARCH" == "ppc64le" ]; then
+  ARCH="ppc64le"
+elif [ "$ARCH" == "ppc64" ] || [ "$ARCH" == "power64" ] || [ "$ARCH" == "powerpc64" ]; then
   ARCH="ppc64"
 elif [ "$ARCH" == "p32" ] || [ "$ARCH" == "ppc32" ] || [ "$ARCH" == "power" ] || [ "$ARCH" == "power32" ] || [ "$ARCH" == "powerpc" ] || [ "$ARCH" == "powerpc32" ] || [ "$ARCH" == "powerpcspe" ]; then
   ARCH="ppc"
 elif [ "$ARCH" == "r64" ] || [ "$ARCH" == "riscv64" ] || [ "$ARCH" == "riscv64sf" ]; then
   ARCH="riscv64"
 elif [ "$ARCH" == "r32" ] || [ "$ARCH" == "riscv" ] || [ "$ARCH" == "riscv32" ]; then
-  ARCH="riscv32"
-elif [ "$ARCH" == "m64" ] || [ "$ARCH" == "mips64" ] || [ "$ARCH" == "mips64hf" ] ; then
-  ARCH="mips64"
-elif [ "$ARCH" == "m32" ] || [ "$ARCH" == "mips" ] || [ "$ARCH" == "mips32" ] || [ "$ARCH" == "mipsn32" ] || [ "$ARCH" == "mipshf" ] ; then
-  ARCH="mips"
-elif [ "$ARCH" == "ppc64le" ]; then
-  ARCH="ppc64le"
-elif [ "$ARCH" == "mips64le" ] || [ "$ARCH" == "mips64el" ] || [ "$ARCH" == "mips64hfel" ]; then
-  ARCH="mips64le"
+  ARCH="riscv"
 else
   printf "\n${T_YEL}  The architecture is unrecognized. Passing it verbatim to the cloud. [ arch = ${ARCH} ]${T_RESET}\n\n" >&2
 fi
@@ -455,6 +457,24 @@ elif [ "$ORG" == "generic" ] && [ "$ARCH" == "arm64" ]; then
 elif [ "$ORG" == "generic" ] && [ "$ARCH" == "arm" ]; then
   sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-a32"
   upload_box
+elif [ "$ORG" == "generic" ] && [ "$ARCH" == "mips64le" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-m64"
+  upload_box[]
+elif [ "$ORG" == "generic" ] && [ "$ARCH" == "mips" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-m32"
+  upload_box
+elif [ "$ORG" == "generic" ] && [ "$ARCH" == "ppc64le" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-p64"
+  upload_box
+elif [ "$ORG" == "generic" ] && [ "$ARCH" == "ppc" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-p32"
+  upload_box
+elif [ "$ORG" == "generic" ] && [ "$ARCH" == "riscv64" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-r64"
+  upload_box[]
+elif [ "$ORG" == "generic" ] && [ "$ARCH" == "riscv" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-r32"
+  upload_box
 elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "amd64" ]; then
   sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-x64"
   upload_box
@@ -467,6 +487,24 @@ elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "arm64" ]; then
 elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "arm" ]; then
   sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-a32"
   upload_box
+elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "mips64le" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-m64"
+  upload_box[]
+elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "mips" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-m32"
+  upload_box
+elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "ppc64le" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-p64"
+  upload_box
+elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "ppc" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-p32"
+  upload_box
+elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "riscv64" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-r64"
+  upload_box[]
+elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "riscv" ]; then
+  sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-r32"
+  upload_box
 fi
 
 if [ "$PROVIDER" == "libvirt" ]; then
@@ -486,6 +524,24 @@ if [ "$PROVIDER" == "libvirt" ]; then
   elif [ "$ORG" == "generic" ] && [ "$ARCH" == "arm" ]; then
     sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-a32"
     upload_box
+  elif [ "$ORG" == "generic" ] && [ "$ARCH" == "mips64le" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-m64"
+    upload_box[]
+  elif [ "$ORG" == "generic" ] && [ "$ARCH" == "mips" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-m32"
+    upload_box
+  elif [ "$ORG" == "generic" ] && [ "$ARCH" == "ppc64le" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-p64"
+    upload_box
+  elif [ "$ORG" == "generic" ] && [ "$ARCH" == "ppc" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-p32"
+    upload_box
+  elif [ "$ORG" == "generic" ] && [ "$ARCH" == "riscv64" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-r64"
+    upload_box[]
+  elif [ "$ORG" == "generic" ] && [ "$ARCH" == "riscv" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="generic-r32"
+    upload_box
   elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "amd64" ]; then
     sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-x64"
     upload_box
@@ -498,6 +554,24 @@ if [ "$PROVIDER" == "libvirt" ]; then
   elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "arm" ]; then
     sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-a32"
     upload_box
+  elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "mips64le" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-m64"
+    upload_box[]
+  elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "mips" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-m32"
+    upload_box
+  elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "ppc64le" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-p64"
+    upload_box
+  elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "ppc" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-p32"
+    upload_box
+  elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "riscv64" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-r64"
+    upload_box[]
+  elif [ "$ORG" == "roboxes" ] && [ "$ARCH" == "riscv" ]; then
+    sleep 8 ; VAGRANTPATH="vagrantcloud.com" ; ORG="roboxes-r32"
+    upload_box
   fi
 fi
 
diff --git a/res/scripts/match.sh b/res/scripts/match.sh
@@ -95,22 +95,24 @@ elif [ "$ARCH" == "a64" ] || [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "arm64" ]
   ARCH="arm64"
 elif [ "$ARCH" == "a32" ] || [ "$ARCH" == "armv7" ] || [ "$ARCH" == "armv6" ] || [ "$ARCH" == "arm" ] || [ "$ARCH" == "armeb" ] || [ "$ARCH" == "armle" ] || [ "$ARCH" == "armel" ] || [ "$ARCH" == "armhf" ]; then
   ARCH="arm"
-elif [ "$ARCH" == "p64" ] || [ "$ARCH" == "ppc64" ] || [ "$ARCH" == "power64" ] || [ "$ARCH" == "powerpc64" ]; then
+elif [ "$ARCH" == "m64" ] || [ "$ARCH" == "mips64le" ] || [ "$ARCH" == "mips64el" ] || [ "$ARCH" == "mips64hfel" ]; then
+  ARCH="mips64le"
+elif [ "$ARCH" == "mips64" ] || [ "$ARCH" == "mips64hf" ] ; then
+  ARCH="mips64"
+elif [ "$ARCH" == "m32" ] || [ "$ARCH" == "mips" ] || [ "$ARCH" == "mips32" ] || [ "$ARCH" == "mipsn32" ] || [ "$ARCH" == "mipshf" ] ; then
+  ARCH="mips"
+elif [ "$ARCH" == "mipsle" ] || [ "$ARCH" == "mipsel" ] || [ "$ARCH" == "mipselhf" ]; then
+  ARCH="mipsle"
+elif [ "$ARCH" == "p64" ] || [ "$ARCH" == "ppc64le" ]; then
+  ARCH="ppc64le"
+elif [ "$ARCH" == "ppc64" ] || [ "$ARCH" == "power64" ] || [ "$ARCH" == "powerpc64" ]; then
   ARCH="ppc64"
 elif [ "$ARCH" == "p32" ] || [ "$ARCH" == "ppc32" ] || [ "$ARCH" == "power" ] || [ "$ARCH" == "power32" ] || [ "$ARCH" == "powerpc" ] || [ "$ARCH" == "powerpc32" ] || [ "$ARCH" == "powerpcspe" ]; then
   ARCH="ppc"
 elif [ "$ARCH" == "r64" ] || [ "$ARCH" == "riscv64" ] || [ "$ARCH" == "riscv64sf" ]; then
   ARCH="riscv64"
 elif [ "$ARCH" == "r32" ] || [ "$ARCH" == "riscv" ] || [ "$ARCH" == "riscv32" ]; then
   ARCH="riscv32"
-elif [ "$ARCH" == "m64" ] || [ "$ARCH" == "mips64" ] || [ "$ARCH" == "mips64hf" ] ; then
-  ARCH="mips64"
-elif [ "$ARCH" == "m32" ] || [ "$ARCH" == "mips" ] || [ "$ARCH" == "mips32" ] || [ "$ARCH" == "mipsn32" ] || [ "$ARCH" == "mipshf" ] ; then
-  ARCH="mips"
-elif [ "$ARCH" == "ppc64le" ]; then
-  ARCH="ppc64le"
-elif [ "$ARCH" == "mips64le" ] || [ "$ARCH" == "mips64el" ] || [ "$ARCH" == "mips64hfel" ]; then
-  ARCH="mips64le"
 elif [ "$ARCH" != "" ]; then
   printf "\n${T_YEL}  The architecture is unrecognized. Passing it verbatim to the cloud. [ arch = ${ARCH} ]${T_RESET}\n\n" >&2
 elif [ "$ARCH" == "" ]; then

diff --git a/res/scripts/release.sh b/res/scripts/release.sh
@@ -118,22 +118,24 @@ elif [ "$ARCH" == "a64" ] || [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "arm64" ]
   ARCH="arm64"
 elif [ "$ARCH" == "a32" ] || [ "$ARCH" == "armv7" ] || [ "$ARCH" == "armv6" ] || [ "$ARCH" == "arm" ] || [ "$ARCH" == "armeb" ] || [ "$ARCH" == "armle" ] || [ "$ARCH" == "armel" ] || [ "$ARCH" == "armhf" ]; then
   ARCH="arm"
-elif [ "$ARCH" == "p64" ] || [ "$ARCH" == "ppc64" ] || [ "$ARCH" == "power64" ] || [ "$ARCH" == "powerpc64" ]; then
+elif [ "$ARCH" == "m64" ] || [ "$ARCH" == "mips64le" ] || [ "$ARCH" == "mips64el" ] || [ "$ARCH" == "mips64hfel" ]; then
+  ARCH="mips64le"
+elif [ "$ARCH" == "mips64" ] || [ "$ARCH" == "mips64hf" ] ; then
+  ARCH="mips64"
+elif [ "$ARCH" == "m32" ] || [ "$ARCH" == "mips" ] || [ "$ARCH" == "mips32" ] || [ "$ARCH" == "mipsn32" ] || [ "$ARCH" == "mipshf" ] ; then
+  ARCH="mips"
+elif [ "$ARCH" == "mipsle" ] || [ "$ARCH" == "mipsel" ] || [ "$ARCH" == "mipselhf" ]; then
+  ARCH="mipsle"
+elif [ "$ARCH" == "p64" ] || [ "$ARCH" == "ppc64le" ]; then
+  ARCH="ppc64le"
+elif [ "$ARCH" == "ppc64" ] || [ "$ARCH" == "power64" ] || [ "$ARCH" == "powerpc64" ]; then
   ARCH="ppc64"
 elif [ "$ARCH" == "p32" ] || [ "$ARCH" == "ppc32" ] || [ "$ARCH" == "power" ] || [ "$ARCH" == "power32" ] || [ "$ARCH" == "powerpc" ] || [ "$ARCH" == "powerpc32" ] || [ "$ARCH" == "powerpcspe" ]; then
   ARCH="ppc"
 elif [ "$ARCH" == "r64" ] || [ "$ARCH" == "riscv64" ] || [ "$ARCH" == "riscv64sf" ]; then
   ARCH="riscv64"
 elif [ "$ARCH" == "r32" ] || [ "$ARCH" == "riscv" ] || [ "$ARCH" == "riscv32" ]; then
   ARCH="riscv32"
-elif [ "$ARCH" == "m64" ] || [ "$ARCH" == "mips64" ] || [ "$ARCH" == "mips64hf" ] ; then
-  ARCH="mips64"
-elif [ "$ARCH" == "m32" ] || [ "$ARCH" == "mips" ] || [ "$ARCH" == "mips32" ] || [ "$ARCH" == "mipsn32" ] || [ "$ARCH" == "mipshf" ] ; then
-  ARCH="mips"
-elif [ "$ARCH" == "ppc64le" ]; then
-  ARCH="ppc64le"
-elif [ "$ARCH" == "mips64le" ] || [ "$ARCH" == "mips64el" ] || [ "$ARCH" == "mips64hfel" ]; then
-  ARCH="mips64le"
 else
   printf "\n${T_YEL}  The architecture is unrecognized. Passing it verbatim to the cloud. [ arch = ${ARCH} ]${T_RESET}\n\n" >&2
 fi