Clean up configs/sites/tier2/bounty/packages.yaml and configs/sites/tier2/blackpearl/packages.yaml. Bug fix in configs/sites/tier1/nautilus/packages_gcc-13.3.1.yaml: set correct variants for external OpenMPI

Author: climbfuji

configs/sites/tier1/nautilus/packages_gcc-13.3.1.yaml

@@ -18,7 +18,7 @@ packages:
   openmpi:
     buildable: False
     externals:
-    - spec: [email protected]
+    - spec: [email protected] ~internal-hwloc +two_level_namespace
       prefix: /p/app/penguin/openmpi/5.0.8/gcc-13.3.1
       modules:
       - penguin/openmpi/5.0.8/gcc-13.3.1

configs/sites/tier2/blackpearl/packages.yaml

@@ -61,7 +61,6 @@ packages:
     - spec: [email protected]
       prefix: /usr
   m4:
-    # DH* NEEDED? buildable: false
     externals:
     - spec: [email protected]
       prefix: /usr

configs/sites/tier2/bounty/packages.yaml

@@ -65,7 +65,6 @@ packages:
     - spec: [email protected]
       prefix: /usr
   m4:
-    # DH* NEEDED? buildable: false
     externals:
     - spec: [email protected]
       prefix: /usr