From f2a8e19975c09600f3ecb37da25324fe9e4d8b92 Mon Sep 17 00:00:00 2001
From: Marc Mengel <mengel@fnal.gov>
Date: Tue, 14 Nov 2023 15:22:43 -0600
Subject: [PATCH 1/8] Branch for v0.21.0-fermi

---
 bin/bootstrap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/bootstrap b/bin/bootstrap
index 54346dc..0a630f5 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -17,8 +17,8 @@ usage: bootstrap [options] [dest_dir]
 EOF
 }
 # note, other scripts pull these values for defaults
-default_fermi_spack_tools_version=main
-default_spack_version=fnal-develop
+default_fermi_spack_tools_version=v2_21_0
+default_spack_version=v0.21.0-fermi
 default_spack_repo=https://github.com/FNALssi/spack.git
 default_fermi_spack_tools_repo=https://github.com/FNALssi/fermi-spack-tools.git
 

From aa84929e311d6dfed20ba1e54f4b4c3fa59776bc Mon Sep 17 00:00:00 2001
From: Marc Mengel <mengel@fnal.gov>
Date: Tue, 14 Nov 2023 15:22:43 -0600
Subject: [PATCH 2/8] Branch for v0.21.0-fermi

---
 bin/bootstrap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/bootstrap b/bin/bootstrap
index 54346dc..0a630f5 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -17,8 +17,8 @@ usage: bootstrap [options] [dest_dir]
 EOF
 }
 # note, other scripts pull these values for defaults
-default_fermi_spack_tools_version=main
-default_spack_version=fnal-develop
+default_fermi_spack_tools_version=v2_21_0
+default_spack_version=v0.21.0-fermi
 default_spack_repo=https://github.com/FNALssi/spack.git
 default_fermi_spack_tools_repo=https://github.com/FNALssi/fermi-spack-tools.git
 

From 85154ec6d2c90c4bd3cc84f295dc394ae2fd2a44 Mon Sep 17 00:00:00 2001
From: Marc Mengel <mengel@fnal.gov>
Date: Tue, 14 Nov 2023 15:22:43 -0600
Subject: [PATCH 3/8] Branch for v0.21.0-fermi

---
 bin/bootstrap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/bootstrap b/bin/bootstrap
index 54346dc..0a630f5 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -17,8 +17,8 @@ usage: bootstrap [options] [dest_dir]
 EOF
 }
 # note, other scripts pull these values for defaults
-default_fermi_spack_tools_version=main
-default_spack_version=fnal-develop
+default_fermi_spack_tools_version=v2_21_0
+default_spack_version=v0.21.0-fermi
 default_spack_repo=https://github.com/FNALssi/spack.git
 default_fermi_spack_tools_repo=https://github.com/FNALssi/fermi-spack-tools.git
 

From ebfbd12e6e5acf23249fd47af8145da4f4a84893 Mon Sep 17 00:00:00 2001
From: Marc Mengel <mengel@fnal.gov>
Date: Wed, 31 Jan 2024 14:20:49 -0600
Subject: [PATCH 4/8] new compiler on alma9

---
 templates/packages.yaml.almalinux9 | 174 ++++++++++++++---------------
 1 file changed, 87 insertions(+), 87 deletions(-)

diff --git a/templates/packages.yaml.almalinux9 b/templates/packages.yaml.almalinux9
index c74f361..b431eaf 100644
--- a/templates/packages.yaml.almalinux9
+++ b/templates/packages.yaml.almalinux9
@@ -1,7 +1,7 @@
 packages:
   all:
     compiler:
-      - gcc@11.3.1
+      - gcc@11.4.1
       - clang@15.0.7
       - gcc
       - clang
@@ -53,155 +53,155 @@ packages:
     require: bison
   asciidoc:
     externals:
-    - spec: "asciidoc @9.1.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "asciidoc @9.1.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   autoconf:
     externals:
-    - spec: "autoconf @2.69 %gcc@11.3.1 os=almalinux9"
+    - spec: "autoconf @2.69 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   automake:
     externals:
-    - spec: "automake @1.16.2 %gcc@11.3.1 os=almalinux9"
+    - spec: "automake @1.16.2 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   berkeley-db:
     externals:
-    - spec: "berkeley-db @5.3.28 %gcc@11.3.1 os=almalinux9"
+    - spec: "berkeley-db @5.3.28 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   binutils:
     externals:
-    - spec: "binutils +gas+gold+ld @2.35.2 %gcc@11.3.1 os=almalinux9"
+    - spec: "binutils +gas+gold+ld @2.35.2 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   bison:
     externals:
-    - spec: "bison @3.7.4 %gcc@11.3.1 os=almalinux9"
+    - spec: "bison @3.7.4 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   cigetcert:
     externals:
-    - spec: "cigetcert @1.21 %gcc@11.3.1 os=almalinux9"
+    - spec: "cigetcert @1.21 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   cmake:
     externals:
-    - spec: "cmake ~ownlibs @3.20.2 %gcc@11.3.1 os=almalinux9"
+    - spec: "cmake ~ownlibs @3.20.2 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   coreutils:
     externals:
-    - spec: "coreutils @8.32 %gcc@11.3.1 os=almalinux9"
+    - spec: "coreutils @8.32 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   curl:
     externals:
-    - spec: "curl tls=openssl @7.76.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "curl tls=openssl @7.76.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   damageproto:
     externals:
-    - spec: "damageproto @1.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "damageproto @1.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   diffutils:
     externals:
-    - spec: "diffutils @3.7 %gcc@11.3.1 os=almalinux9"
+    - spec: "diffutils @3.7 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   expat:
     externals:
-    - spec: "expat @2.5.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "expat @2.5.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   findutils:
     externals:
-    - spec: "findutils @4.8.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "findutils @4.8.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   flex:
     externals:
-    - spec: "flex @2.6.4 %gcc@11.3.1 os=almalinux9"
+    - spec: "flex @2.6.4 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   fontconfig:
     externals:
-    - spec: "fontconfig @2.14.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "fontconfig @2.14.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   freetype:
     externals:
-    - spec: "freetype @2.10.4 %gcc@11.3.1 os=almalinux9"
+    - spec: "freetype @2.10.4 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   gawk:
     externals:
-    - spec: "gawk @5.1.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "gawk @5.1.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   gdb:
     externals:
-    - spec: "gdb @10.2 %gcc@11.3.1 os=almalinux9"
+    - spec: "gdb @10.2 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   gdbm:
     externals:
-    - spec: "gdbm @1.19 %gcc@11.3.1 os=almalinux9"
+    - spec: "gdbm @1.19 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   glib:
     externals:
-    - spec: "glib @2.68.4 %gcc@11.3.1 os=almalinux9"
+    - spec: "glib @2.68.4 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   gettext:
     externals:
-    - spec: "gettext ~bzip2+curses~git+libunistring+libxml2~tar+xz @0.21 %gcc@11.3.1 os=almalinux9"
+    - spec: "gettext ~bzip2+curses~git+libunistring+libxml2~tar+xz @0.21 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   git:
     externals:
-    - spec: "git @2.39.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "git @2.39.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   gtkplus:
     externals:
-    - spec: "gtkplus @3.24.31 %gcc@11.3.1 os=almalinux9"
+    - spec: "gtkplus @3.24.31 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   gmake:
     externals:
-    - spec: "gmake @4.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "gmake @4.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   gperf:
     externals:
-    - spec: "gperf @3.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "gperf @3.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   groff:
     externals:
-    - spec: "groff @1.22.4 %gcc@11.3.1 os=almalinux9"
+    - spec: "groff @1.22.4 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   help2man:
     externals:
-    - spec: "help2man @1.48.2 %gcc@11.3.1 os=almalinux9"
+    - spec: "help2man @1.48.2 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   htcondor:
     externals:
-    - spec: "htcondor @A %gcc@11.3.1 os=almalinux9"
+    - spec: "htcondor @A %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   htgettoken:
     externals:
-    - spec: "htgettoken @1.20 %gcc@11.3.1 os=almalinux9"
+    - spec: "htgettoken @1.20 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   hwloc:
     require:
       - one_of:
         - "target=x86_64_v2"
       - one_of:
-        - "%gcc@11.3.1"
+        - "%gcc@11.4.1"
         - "%clang@15.0.7"
   krb5:
     externals:
-    - spec: "krb5 @1.20.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "krb5 @1.20.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   libc:
     externals:
-    - spec: "libc +iconv+rpc @2.34 %gcc@11.3.1 os=almalinux9"
+    - spec: "libc +iconv+rpc @2.34 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libfontenc:
     externals:
-    - spec: "libfontenc @1.1.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "libfontenc @1.1.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libice:
     externals:
-    - spec: "libice @1.0.10 %gcc@11.3.1 os=almalinux9"
+    - spec: "libice @1.0.10 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libpciaccess:
@@ -209,233 +209,233 @@ packages:
       - one_of:
         - "target=x86_64_v2"
       - one_of:
-        - "%gcc@11.3.1"
+        - "%gcc@11.4.1"
         - "%clang@15.0.7"
   libsm:
     externals:
-    - spec: "libsm @1.2.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "libsm @1.2.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   libtool:
     externals:
-    - spec: "libtool @2.4.6 %gcc@11.3.1 os=almalinux9"
+    - spec: "libtool @2.4.6 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   libuuid:
     externals:
-    - spec: "libuuid @2.37.4 %gcc@11.3.1 os=almalinux9"
+    - spec: "libuuid @2.37.4 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   libx11:
     externals:
-    - spec: "libx11 @1.7.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "libx11 @1.7.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxau:
     externals:
-    - spec: "libxau @1.0.9 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxau @1.0.9 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxcb:
     externals:
-    - spec: "libxcb @1.13.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxcb @1.13.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxdmcp:
     externals:
-    - spec: "libxdmcp @1.1.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxdmcp @1.1.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxext:
     externals:
-    - spec: "libxext @1.3.4 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxext @1.3.4 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxft:
     externals:
-    - spec: "libxft @2.3.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxft @2.3.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   libxi:
     externals:
-    - spec: "libxi @1.7.10 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxi @1.7.10 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   libxkbcommon:
     externals:
-    - spec: "libxkbcommon @1.0.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxkbcommon @1.0.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxml2:
     externals:
-    - spec: "libxml2 @2.9.13 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxml2 @2.9.13 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   libxmu:
     externals:
-    - spec: "libxmu @1.1.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxmu @1.1.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxpm:
     externals:
-    - spec: "libxpm @3.5.13 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxpm @3.5.13 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxrender:
     externals:
-    - spec: "libxrender @0.9.10 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxrender @0.9.10 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxshmfence:
     externals:
-    - spec: "libxshmfence @1.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxshmfence @1.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxt:
     externals:
-    - spec: "libxt @1.2.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxt @1.2.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxv:
     externals:
-    - spec: "libxv @1.0.11 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxv @1.0.11 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   libxxf86vm:
     externals:
-    - spec: "libxxf86vm @1.1.4 %gcc@11.3.1 os=almalinux9"
+    - spec: "libxxf86vm @1.1.4 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   lmod:
     externals:
-    - spec: "lmod @8.7.30 %gcc@11.3.1 os=almalinux9"
+    - spec: "lmod @8.7.30 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   m4:
     externals:
-    - spec: "m4 @1.4.19 %gcc@11.3.1 os=almalinux9"
+    - spec: "m4 @1.4.19 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   mesa-glu:
     externals:
-    - spec: "mesa-glu gl=glx @9.0.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "mesa-glu gl=glx @9.0.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   mesa:
     externals:
-    - spec: "mesa +glx~osmesa swr=none @22.3.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "mesa +glx~osmesa swr=none @22.3.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   mkfontdir:
     externals:
-    - spec: "mkfontdir @1.2.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "mkfontdir @1.2.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   mkfontscale:
     externals:
-    - spec: "mkfontscale @1.2.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "mkfontscale @1.2.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   nasm:
     externals:
-    - spec: "nasm @2.15.03 %gcc@11.3.1 os=almalinux9"
+    - spec: "nasm @2.15.03 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   ninja:
     externals:
-    - spec: "ninja @1.10.2 %gcc@11.3.1 os=almalinux9"
+    - spec: "ninja @1.10.2 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   ncurses:
     externals:
-    - spec: "ncurses ~symlinks+termlib @6.2 %gcc@11.3.1 os=almalinux9"
+    - spec: "ncurses ~symlinks+termlib @6.2 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   openssh:
     externals:
-    - spec: "openssh @8.7p1 %gcc@11.3.1 os=almalinux9"
+    - spec: "openssh @8.7p1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   openssl:
     externals:
-    - spec: "openssl @3.0.7 %gcc@11.3.1 os=almalinux9"
+    - spec: "openssl @3.0.7 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   patchelf:
     externals:
-    - spec: "patchelf @0.15.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "patchelf @0.15.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   perl:
     externals:
-    - spec: "perl ~open~opcode @5.32.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "perl ~open~opcode @5.32.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   pkg-config:
     externals:
-    - spec: "pkg-config +internal_glib @1.7.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "pkg-config +internal_glib @1.7.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   pkgconf:
     externals:
-    - spec: "pkgconf @1.7.3 %gcc@11.3.1 os=almalinux9"
+    - spec: "pkgconf @1.7.3 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   python:
     externals:
-    - spec: "python @3.9.16 %gcc@11.3.1 os=almalinux9"
+    - spec: "python @3.9.16 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   readline:
     externals:
-    - spec: "readline @8.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "readline @8.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   tar:
     externals:
-    - spec: "tar @1.34 %gcc@11.3.1 os=almalinux9"
+    - spec: "tar @1.34 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   tcl:
     externals:
-    - spec: "tcl @8.6.10 %gcc@11.3.1 os=almalinux9"
+    - spec: "tcl @8.6.10 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   texinfo:
     externals:
-    - spec: "texinfo @6.7 %gcc@11.3.1 os=almalinux9"
+    - spec: "texinfo @6.7 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   texlive:
     externals:
-    - spec: "texlive @20200406 %gcc@11.3.1 os=almalinux9"
+    - spec: "texlive @20200406 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
   tk:
     externals:
-    - spec: "tk @8.6.10 %gcc@11.3.1 os=almalinux9"
+    - spec: "tk @8.6.10 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   xcb-util-image:
     externals:
-    - spec: "xcb-util-image @0.4.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "xcb-util-image @0.4.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   xcb-util-keysyms:
     externals:
-    - spec: "xcb-util-keysyms @0.4.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "xcb-util-keysyms @0.4.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   xcb-util-renderutil:
     externals:
-    - spec: "xcb-util-renderutil @0.3.9 %gcc@11.3.1 os=almalinux9"
+    - spec: "xcb-util-renderutil @0.3.9 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   xcb-util-wm:
     externals:
-    - spec: "xcb-util-wm @0.4.1 %gcc@11.3.1 os=almalinux9"
+    - spec: "xcb-util-wm @0.4.1 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   xextproto:
     externals:
-    - spec: "xextproto @7.3.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "xextproto @7.3.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   xproto:
     externals:
-    - spec: "xproto @7.0.33 %gcc@11.3.1 os=almalinux9"
+    - spec: "xproto @7.0.33 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   xrandr:
     externals:
-    - spec: "xrandr @1.5.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "xrandr @1.5.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   xtrans:
     externals:
-    - spec: "xtrans @1.4.0 %gcc@11.3.1 os=almalinux9"
+    - spec: "xtrans @1.4.0 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False
   zlib:
     externals:
-    - spec: "zlib +optimize+pic+shared @1.2.11 %gcc@11.3.1 os=almalinux9"
+    - spec: "zlib +optimize+pic+shared @1.2.11 %gcc@11.4.1 os=almalinux9"
       prefix: /usr
     buildable: False

From 025b48c637194dad12684a7442a5d47809130863 Mon Sep 17 00:00:00 2001
From: Marc Mengel <mengel@fnal.gov>
Date: Mon, 12 Feb 2024 17:19:53 -0600
Subject: [PATCH 5/8] ups_to_spack tweaks

---
 bin/ups_to_spack | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/bin/ups_to_spack b/bin/ups_to_spack
index b50c621..bd08157 100755
--- a/bin/ups_to_spack
+++ b/bin/ups_to_spack
@@ -457,11 +457,7 @@ class package:
             tf_2 = re.sub(".*-2.6", "scientificfermi5", tf_2)
             tf_2 = re.sub("^[0-9].*", "scientificfermi5", tf_2)
 
-        # excessive intel-centrism...
-        if f_os.find("64bit") > 0:
-            tf_3 = "x86_64_v2"
-        else:
-            tf_3 = "x86"
+        tf_3 = "x86_64_v2"
 
         logging.debug("spack_arch(%s) -> %s-%s-%s" % (self.flav, tf_1, tf_2, tf_3))
         return "%s-%s-%s" % (tf_1, tf_2, tf_3)
@@ -1940,8 +1936,8 @@ while sys.argv[1][:2] == "--":
 uts = ups_to_spack(pdr=pdr)
 
 if not os.path.exists("/tmp/empty.tar"):
-    d = os.path.dirname(os.path.dirname(__FILE__))
-    os.system("cp {0}/templates/emtpy.tar /tmp/empty.tar .".format(d))
+    d = os.path.dirname(os.path.dirname(__file__))
+    os.system("cp {0}/templates/empty.tar /tmp/empty.tar".format(d))
 
 # handle --use_spack args: prepopulate conversion cache
 for us in use_spack:

From 854d70bfe4937fa9a85870a405a2b34adad265da Mon Sep 17 00:00:00 2001
From: Marc Mengel <mengel@fnal.gov>
Date: Fri, 22 Mar 2024 17:02:24 -0500
Subject: [PATCH 6/8] merge redux

---
 templates/packages.yaml.almalinux9 | 340 -----------------------------
 1 file changed, 340 deletions(-)

diff --git a/templates/packages.yaml.almalinux9 b/templates/packages.yaml.almalinux9
index 4e349f5..0c3d7c5 100644
--- a/templates/packages.yaml.almalinux9
+++ b/templates/packages.yaml.almalinux9
@@ -53,49 +53,6 @@ packages:
     require: bison
   asciidoc:
     externals:
-<<<<<<< HEAD
-    - spec: "asciidoc @9.1.0 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  autoconf:
-    externals:
-    - spec: "autoconf @2.69 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  automake:
-    externals:
-    - spec: "automake @1.16.2 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  berkeley-db:
-    externals:
-    - spec: "berkeley-db @5.3.28 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  binutils:
-    externals:
-    - spec: "binutils +gas+gold+ld @2.35.2 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  bison:
-    externals:
-    - spec: "bison @3.7.4 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  cigetcert:
-    externals:
-    - spec: "cigetcert @1.21 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  cmake:
-    externals:
-    - spec: "cmake ~ownlibs @3.20.2 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  coreutils:
-    externals:
-    - spec: "coreutils @8.32 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  curl:
-    externals:
-    - spec: "curl tls=openssl @7.76.1 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  damageproto:
-    externals:
-    - spec: "damageproto @1.1 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "asciidoc @9.1.0 %gcc@11 os=almalinux9"
       prefix: /usr
   autoconf:
@@ -137,61 +94,25 @@ packages:
   damageproto:
     externals:
     - spec: "damageproto @1.1 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   diffutils:
     externals:
-<<<<<<< HEAD
-    - spec: "diffutils @3.7 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "diffutils @3.7 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   expat:
     externals:
-<<<<<<< HEAD
-    - spec: "expat @2.5.0 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "expat @2.5.0 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   findutils:
     externals:
-<<<<<<< HEAD
-    - spec: "findutils @4.8.0 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "findutils @4.8.0 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   flex:
     externals:
-<<<<<<< HEAD
-    - spec: "flex @2.6.4 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  fontconfig:
-    externals:
-    - spec: "fontconfig @2.14.0 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  freetype:
-    externals:
-    - spec: "freetype @2.10.4 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  gawk:
-    externals:
-    - spec: "gawk @5.1.0 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  gdb:
-    externals:
-    - spec: "gdb @10.2 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  gdbm:
-    externals:
-    - spec: "gdbm @1.19 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "flex @2.6.4 %gcc@11 os=almalinux9"
       prefix: /usr
   fontconfig:
@@ -213,51 +134,15 @@ packages:
   gdbm:
     externals:
     - spec: "gdbm @1.19 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   gettext:
     externals:
-<<<<<<< HEAD
-    - spec: "gettext ~bzip2+curses~git+libunistring+libxml2~tar+xz @0.21 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "gettext ~bzip2+curses~git+libunistring+libxml2~tar+xz @0.21 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   git:
     externals:
-<<<<<<< HEAD
-    - spec: "git @2.39.3 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  gtkplus:
-    externals:
-    - spec: "gtkplus @3.24.31 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  gmake:
-    externals:
-    - spec: "gmake @4.3 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  gperf:
-    externals:
-    - spec: "gperf @3.1 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  groff:
-    externals:
-    - spec: "groff @1.22.4 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  help2man:
-    externals:
-    - spec: "help2man @1.48.2 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  htcondor:
-    externals:
-    - spec: "htcondor @A %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  htgettoken:
-    externals:
-    - spec: "htgettoken @1.20 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "git @2.39.3 %gcc@11 os=almalinux9"
       prefix: /usr
   gtkplus:
@@ -287,24 +172,12 @@ packages:
   htgettoken:
     externals:
     - spec: "htgettoken @1.20 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
   hwloc:
     require:
       - one_of:
         - "target=x86_64_v2"
       - one_of:
-<<<<<<< HEAD
-        - "%gcc@11.4.1"
-        - "%clang@15.0.7"
-  krb5:
-    externals:
-    - spec: "krb5 @1.20.1 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  libc:
-    externals:
-    - spec: "libc +iconv+rpc @2.34 %gcc@11.4.1 os=almalinux9"
-=======
         - "%gcc@11"
         - "%clang@15.0.7"
   krb5:
@@ -314,25 +187,16 @@ packages:
   libc:
     externals:
     - spec: "libc +iconv+rpc @2.34 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libfontenc:
     externals:
-<<<<<<< HEAD
-    - spec: "libfontenc @1.1.3 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libfontenc @1.1.3 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libice:
     externals:
-<<<<<<< HEAD
-    - spec: "libice @1.0.10 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libice @1.0.10 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libpciaccess:
@@ -340,25 +204,6 @@ packages:
       - one_of:
         - "target=x86_64_v2"
       - one_of:
-<<<<<<< HEAD
-        - "%gcc@11.4.1"
-        - "%clang@15.0.7"
-  libsm:
-    externals:
-    - spec: "libsm @1.2.3 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  libtool:
-    externals:
-    - spec: "libtool @2.4.6 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  libuuid:
-    externals:
-    - spec: "libuuid @2.37.4 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  libx11:
-    externals:
-    - spec: "libx11 @1.7.0 %gcc@11.4.1 os=almalinux9"
-=======
         - "%gcc@11"
         - "%clang@15.0.7"
   libsm:
@@ -376,58 +221,30 @@ packages:
   libx11:
     externals:
     - spec: "libx11 @1.7.0 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxau:
     externals:
-<<<<<<< HEAD
-    - spec: "libxau @1.0.9 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxau @1.0.9 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxcb:
     externals:
-<<<<<<< HEAD
-    - spec: "libxcb @1.13.1 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxcb @1.13.1 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxdmcp:
     externals:
-<<<<<<< HEAD
-    - spec: "libxdmcp @1.1.3 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxdmcp @1.1.3 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxext:
     externals:
-<<<<<<< HEAD
-    - spec: "libxext @1.3.4 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxext @1.3.4 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxft:
     externals:
-<<<<<<< HEAD
-    - spec: "libxft @2.3.3 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  libxi:
-    externals:
-    - spec: "libxi @1.7.10 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  libxkbcommon:
-    externals:
-    - spec: "libxkbcommon @1.0.3 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxft @2.3.3 %gcc@11 os=almalinux9"
       prefix: /usr
   libxi:
@@ -437,93 +254,49 @@ packages:
   libxkbcommon:
     externals:
     - spec: "libxkbcommon @1.0.3 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxml2:
     externals:
-<<<<<<< HEAD
-    - spec: "libxml2 @2.9.13 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  libxmu:
-    externals:
-    - spec: "libxmu @1.1.3 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxml2 @2.9.13 %gcc@11 os=almalinux9"
       prefix: /usr
   libxmu:
     externals:
     - spec: "libxmu @1.1.3 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxpm:
     externals:
-<<<<<<< HEAD
-    - spec: "libxpm @3.5.13 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxpm @3.5.13 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxrender:
     externals:
-<<<<<<< HEAD
-    - spec: "libxrender @0.9.10 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxrender @0.9.10 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxshmfence:
     externals:
-<<<<<<< HEAD
-    - spec: "libxshmfence @1.3 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxshmfence @1.3 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxt:
     externals:
-<<<<<<< HEAD
-    - spec: "libxt @1.2.0 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxt @1.2.0 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxv:
     externals:
-<<<<<<< HEAD
-    - spec: "libxv @1.0.11 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxv @1.0.11 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   libxxf86vm:
     externals:
-<<<<<<< HEAD
-    - spec: "libxxf86vm @1.1.4 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "libxxf86vm @1.1.4 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   lmod:
     externals:
-<<<<<<< HEAD
-    - spec: "lmod @8.7.30 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  m4:
-    externals:
-    - spec: "m4 @1.4.19 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  mesa-glu:
-    externals:
-    - spec: "mesa-glu gl=glx @9.0.1 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "lmod @8.7.30 %gcc@11 os=almalinux9"
       prefix: /usr
   m4:
@@ -533,84 +306,24 @@ packages:
   mesa-glu:
     externals:
     - spec: "mesa-glu gl=glx @9.0.1 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   mesa:
     externals:
-<<<<<<< HEAD
-    - spec: "mesa +glx~osmesa swr=none @22.3.0 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  mkfontdir:
-    externals:
-    - spec: "mkfontdir @1.2.1 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "mesa +glx~osmesa swr=none @22.3.0 %gcc@11 os=almalinux9"
       prefix: /usr
   mkfontdir:
     externals:
     - spec: "mkfontdir @1.2.1 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   mkfontscale:
     externals:
-<<<<<<< HEAD
-    - spec: "mkfontscale @1.2.1 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "mkfontscale @1.2.1 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   nasm:
     externals:
-<<<<<<< HEAD
-    - spec: "nasm @2.15.03 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  ninja:
-    externals:
-    - spec: "ninja @1.10.2 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  ncurses:
-    externals:
-    - spec: "ncurses ~symlinks+termlib @6.2 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  openssh:
-    externals:
-    - spec: "openssh @8.7p1 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  openssl:
-    externals:
-    - spec: "openssl @3.0.7 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  patchelf:
-    externals:
-    - spec: "patchelf @0.15.0 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  perl:
-    externals:
-    - spec: "perl ~open~opcode @5.32.1 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  pkg-config:
-    externals:
-    - spec: "pkg-config +internal_glib @1.7.3 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  pkgconf:
-    externals:
-    - spec: "pkgconf @1.7.3 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  python:
-    externals:
-    - spec: "python @3.9.16 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  readline:
-    externals:
-    - spec: "readline @8.1 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  tar:
-    externals:
-    - spec: "tar @1.34 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "nasm @2.15.03 %gcc@11 os=almalinux9"
       prefix: /usr
   ninja:
@@ -656,31 +369,15 @@ packages:
   tar:
     externals:
     - spec: "tar @1.34 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   tcl:
     externals:
-<<<<<<< HEAD
-    - spec: "tcl @8.6.10 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "tcl @8.6.10 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   texinfo:
     externals:
-<<<<<<< HEAD
-    - spec: "texinfo @6.7 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  texlive:
-    externals:
-    - spec: "texlive @20200406 %gcc@11.4.1 os=almalinux9"
-      prefix: /usr
-  tk:
-    externals:
-    - spec: "tk @8.6.10 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "texinfo @6.7 %gcc@11 os=almalinux9"
       prefix: /usr
   texlive:
@@ -690,87 +387,50 @@ packages:
   tk:
     externals:
     - spec: "tk @8.6.10 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   xcb-util-image:
     externals:
-<<<<<<< HEAD
-    - spec: "xcb-util-image @0.4.0 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "xcb-util-image @0.4.0 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   xcb-util-keysyms:
     externals:
-<<<<<<< HEAD
-    - spec: "xcb-util-keysyms @0.4.0 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "xcb-util-keysyms @0.4.0 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   xcb-util-renderutil:
     externals:
-<<<<<<< HEAD
-    - spec: "xcb-util-renderutil @0.3.9 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "xcb-util-renderutil @0.3.9 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   xcb-util-wm:
     externals:
-<<<<<<< HEAD
-    - spec: "xcb-util-wm @0.4.1 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "xcb-util-wm @0.4.1 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   xextproto:
     externals:
-<<<<<<< HEAD
-    - spec: "xextproto @7.3.0 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "xextproto @7.3.0 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   xproto:
     externals:
-<<<<<<< HEAD
-    - spec: "xproto @7.0.33 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "xproto @7.0.33 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   xrandr:
     externals:
-<<<<<<< HEAD
-    - spec: "xrandr @1.5.0 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "xrandr @1.5.0 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   xtrans:
     externals:
-<<<<<<< HEAD
-    - spec: "xtrans @1.4.0 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "xtrans @1.4.0 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False
   zlib:
     externals:
-<<<<<<< HEAD
-    - spec: "zlib +optimize+pic+shared @1.2.11 %gcc@11.4.1 os=almalinux9"
-=======
     - spec: "zlib +optimize+pic+shared @1.2.11 %gcc@11 os=almalinux9"
->>>>>>> main
       prefix: /usr
     buildable: False

From 3e30120d59b369f9f8c174b6f978ccd129492ddd Mon Sep 17 00:00:00 2001
From: Marc Mengel <mengel@fnal.gov>
Date: Mon, 29 Apr 2024 07:54:38 -0500
Subject: [PATCH 7/8] fail on unknown arguments

---
 bin/bootstrap          | 11 +++++++++--
 bin/make_packages_yaml | 25 +++++++++++++++++++------
 bin/make_spack         | 10 ++++++++--
 bin/make_subspack      | 10 ++++++++--
 bin/ups_to_spack       |  4 +++-
 5 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/bin/bootstrap b/bin/bootstrap
index b3cd607..5c72768 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -24,8 +24,15 @@ default_fermi_spack_tools_repo=https://github.com/FNALssi/fermi-spack-tools.git
 
 parse_args() {
     with_padding=""
-    eval set : $(getopt --longoptions with_padding,help,query-packages,fermi_spack_tools_release:,spack_release:,spack_repo:,fermi_spack_tools_repo: -- x "$@")
-    shift
+    if x=$(getopt --longoptions with_padding,help,query-packages,fermi_spack_tools_release:,spack_release:,spack_repo:,fermi_spack_tools_repo: -- x "$@")
+    then
+        eval set : $x
+        shift
+    else
+        usage
+        exit 1
+    fi
+
     spack_repo=$default_spack_repo
     fermi_spack_tools_repo=$default_fermi_spack_tools_repo
     ver=$default_fermi_spack_tools_version
diff --git a/bin/make_packages_yaml b/bin/make_packages_yaml
index fd9c3cb..b869e95 100755
--- a/bin/make_packages_yaml
+++ b/bin/make_packages_yaml
@@ -6,12 +6,7 @@ x*/*) dir=`echo $0 | sed -e 's;\(.*\)/\([^/]*\);\1/..;'` ;;
 x*)   dir=.. ;;
 esac
 
-src=$dir/templates/packagelist
-want_cvmfs=false
-while :
-do
-case "x$1" in
-x--help|x)
+usage() {
     echo "Usage: make_packages_yaml [options] spack_root [os]"
     echo "  options:"
     echo "   --help               print this message"
@@ -19,6 +14,24 @@ x--help|x)
     echo "   --with-cvmfs=/a/b/c  include other cvmfs externals"
     echo "   --debug              turn on debugging messages"
     echo "   --packagelist=/a/b/c use custom package list"
+}
+
+src=$dir/templates/packagelist
+want_cvmfs=false
+if x=$(getopt --longoptions --long-options help,with-externals,with-cvmfs,debug,packagelist:  -- "$@")
+then
+    eval set : $x
+    shift
+else
+    usage
+    exit 1
+fi
+
+while :
+do
+case "x$1" in
+x--help|x)
+    usage
     exit 0
     ;;
 x--with-externals)  
diff --git a/bin/make_spack b/bin/make_spack
index 99e4674..8968a3c 100755
--- a/bin/make_spack
+++ b/bin/make_spack
@@ -234,8 +234,14 @@ parse_args() {
     verbose=false
 
     origargs="$*"
-    eval set : $(getopt --longoptions help,depth,with_padding,upgrade,spack_release:,minimal,no_buildcache,spack_repo:,query-packages --options mptuv -- : "$@")
-    shift
+    if x=$(getopt --longoptions help,depth,with_padding,upgrade,spack_release:,minimal,no_buildcache,spack_repo:,query-packages --options mptuv -- : "$@")
+    then
+        eval set : $x
+        shift
+    else
+        usage
+        exit 1
+    fi
     while echo x$1 | grep x- > /dev/null
     do
         case "x$1" in
diff --git a/bin/make_subspack b/bin/make_subspack
index 1bc93e1..8ab8885 100755
--- a/bin/make_subspack
+++ b/bin/make_subspack
@@ -32,8 +32,14 @@ parse_args() {
     verbose=false
     plain=false
 
-    eval set : $(getopt --longoptions with_padding,spack_release:,spack_repo,local_env:,dev_pkgs: --options vtup -- "$@")
-    shift
+    if x=$(getopt --longoptions with_padding,spack_release:,spack_repo,local_env:,dev_pkgs: --options vtup -- "$@")
+    then
+        eval set : $x
+        shift
+    else
+        usage
+        exit 1
+    fi
 
     while echo x$1 | grep x- > /dev/null
     do
diff --git a/bin/ups_to_spack b/bin/ups_to_spack
index d930895..57ace53 100755
--- a/bin/ups_to_spack
+++ b/bin/ups_to_spack
@@ -1913,7 +1913,7 @@ use_spack = []
 # just pick off any leading "--" options
 #
 while sys.argv[1][:2] == "--":
-    print("parsing: %s" % repr(sys.argv))
+    #print("parsing: %s" % repr(sys.argv))
     if sys.argv[1][:6] == "--pdr=" :
         pdr = sys.argv[1][6:]
         #print("pdr=%s" % pdr)
@@ -1930,6 +1930,8 @@ while sys.argv[1][:2] == "--":
 
     else:
         print("Unknown flag %s" % sys.argv[1])
+        usage()
+        exit(1)
 
     sys.argv = sys.argv[:1] + sys.argv[2:]
 

From 11a21a2927eb863d83ef0716f1d31f34c9ebfc9f Mon Sep 17 00:00:00 2001
From: Marc Mengel <mengel@fnal.gov>
Date: Mon, 29 Apr 2024 08:00:02 -0500
Subject: [PATCH 8/8] main should have main/fnal-develop defaults

---
 bin/bootstrap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/bootstrap b/bin/bootstrap
index 5c72768..0c08aa0 100755
--- a/bin/bootstrap
+++ b/bin/bootstrap
@@ -17,8 +17,8 @@ usage: bootstrap [options] [dest_dir]
 EOF
 }
 # note, other scripts pull these values for defaults
-default_fermi_spack_tools_version=v2_21_0
-default_spack_version=v0.21.0-fermi
+default_fermi_spack_tools_version=main
+default_spack_version=fnal-develop
 default_spack_repo=https://github.com/FNALssi/spack.git
 default_fermi_spack_tools_repo=https://github.com/FNALssi/fermi-spack-tools.git