syn local branch with target + added from-pr option

.github/workflows/test_eessi.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         EESSI_VERSION:
         - 2023.06
-        EESSI_SOFTWARE_SUBDIR:
+        EESSI_SOFTWARE_SUBDIR_OVERRIDE:
         - aarch64/generic
         - x86_64/amd/zen2
         - x86_64/intel/broadwell
@@ -36,24 +36,26 @@ jobs:
 
         - name: Test check_missing_installations.sh script
           run: |
+              export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
               source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash
               module load EasyBuild
+              which eb
               eb --version
               export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}
               export EESSI_OS_TYPE=linux
-              export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}}
               env | grep ^EESSI | sort
               echo "just run check_missing_installations.sh (should use eessi-${{matrix.EESSI_VERSION}}.yml)"
               ./check_missing_installations.sh ${{matrix.EASYSTACK_FILE}}
 
         - name: Test check_missing_installations.sh with missing package (GCC/8.3.0)
           run: |
+              export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
               source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash
               module load EasyBuild
+              which eb
               eb --version
               export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}
               export EESSI_OS_TYPE=linux
-              export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}}
               env | grep ^EESSI | sort
               echo "modify easystack file by adding a missing package (GCC/8.3.0)"
               echo "  - GCC-8.3.0:" >> ${{matrix.EASYSTACK_FILE}}

configure_easybuild

@@ -26,7 +26,7 @@ fi
 # note: filtering Bison may break some installations, like Qt5 (see https://github.com/EESSI/software-layer/issues/49)
 # filtering pkg-config breaks R-bundle-Bioconductor installation (see also https://github.com/easybuilders/easybuild-easyconfigs/pull/11104)
 # problems occur when filtering pkg-config with gnuplot too (picks up Lua 5.1 from $EPREFIX rather than from Lua 5.3 dependency)
-DEPS_TO_FILTER=Autoconf,Automake,Autotools,binutils,bzip2,cURL,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,Lua,M4,makeinfo,ncurses,util-linux,XZ,zlib
+DEPS_TO_FILTER=Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,Lua,M4,makeinfo,ncurses,util-linux,XZ,zlib
 # For aarch64 we need to also filter out Yasm.
 # See https://github.com/easybuilders/easybuild-easyconfigs/issues/11190
 if [[ "$EESSI_CPU_FAMILY" == "aarch64" ]]; then

eb_hooks.py

@@ -238,12 +238,16 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
         if get_cpu_architecture() == AARCH64:
             pattern = "Linux x86_64 ppc64le, gfortran"
             repl = "Linux x86_64 aarch64 ppc64le, gfortran"
-            self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure_new.defaults && " % (pattern, repl))
-            print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts'])
+            if LooseVersion(self.version) <= LooseVersion('3.9.0'):
+                    self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure_new.defaults && " % (pattern, repl))
+                    print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts'])
+
+            if LooseVersion('4.0.0') <= LooseVersion(self.version) <= LooseVersion('4.2.1'):
+                    self.cfg.update('preconfigopts', "sed -i 's/%s/%s/g' arch/configure.defaults && " % (pattern, repl))
+                    print_msg("Using custom preconfigopts for %s: %s", self.name, self.cfg['preconfigopts'])
     else:
         raise EasyBuildError("WRF-specific hook triggered for non-WRF easyconfig?!")
 
-
 PARSE_HOOKS = {
     'CGAL': parse_hook_cgal_toolchainopts_precise,
     'fontconfig': parse_hook_fontconfig_add_fonts,

eessi-2023.06-eb-4.7.2-2021a.yml

@@ -3,6 +3,7 @@ easyconfigs:
   # - OpenSSL-1.1.eb:
   #     options:
   #       include-easyblocks-from-pr: 2922
+  - git-2.32.0-GCCcore-10.3.0-nodocs.eb
   - GCC-10.3.0
   - CMake-3.20.1-GCCcore-10.3.0.eb
   # - CMake-3.20.1-GCCcore-10.3.0.eb:
@@ -15,4 +16,12 @@ easyconfigs:
         options:
           download-timeout: 1000
   - libGLU-9.0.1-GCCcore-10.3.0.eb
+  - BAGEL-1.2.2-foss-2021a.eb:
+        options:
+          from-pr: 18446
+  - WRF-4.3-foss-2021a-dmpar.eb
   - Arrow-6.0.0-foss-2021a.eb
+       # fix installation of pyarrow Python bindings
+       # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18348
+        options:
+          from-pr: 18348

eessi-2023.06-eb-4.7.2-2021b.yml

@@ -1,5 +1,6 @@
 easyconfigs:
   - GCC-11.2.0
+  - git-2.33.1-GCCcore-11.2.0-nodocs.eb
   - CMake-3.21.1-GCCcore-11.2.0.eb
   # - CMake-3.21.1-GCCcore-11.2.0.eb:
   #     options:

eessi-2023.06-eb-4.7.2-2022a.yml

@@ -1,5 +1,6 @@
 easyconfigs:
   - GCC-11.3.0
+  - git-2.36.0-GCCcore-11.3.0-nodocs.eb
   - CMake-3.23.1-GCCcore-11.3.0.eb
   # - CMake-3.23.1-GCCcore-11.3.0.eb:
   #     options:

eessi-2023.06-eb-4.7.2-2022b.yml

@@ -1,5 +1,6 @@
 easyconfigs:
   - GCC-12.2.0
+  - git-2.38.1-GCCcore-12.2.0-nodocs.eb
   - CMake-3.24.3-GCCcore-12.2.0.eb
   # - CMake-3.24.3-GCCcore-12.2.0.eb:
   #     options: