Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package spack for openSUSE:Factory checked in at 2022-01-13 00:22:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spack (Old) and /work/SRC/openSUSE:Factory/.spack.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spack" Thu Jan 13 00:22:36 2022 rev:20 rq:945894 version:0.17.1 Changes: -------- --- /work/SRC/openSUSE:Factory/spack/spack.changes 2022-01-11 21:23:55.125155031 +0100 +++ /work/SRC/openSUSE:Factory/.spack.new.1892/spack.changes 2022-01-13 00:23:36.495983698 +0100 @@ -1,0 +2,10 @@ +Wed Jan 12 09:50:56 UTC 2022 - Egbert Eich <e...@suse.com> + +- Fix run-find-external.sh script: RPM macros are not expanded + in external scripts. + * Rename: run-find-external.sh to run-find-external.sh.in +- Fix list of recommended packages. +- Add support for container building using a SLE base container. + * Add-support-for-container-building-using-a-SLE-base-container.patch + +------------------------------------------------------------------- Old: ---- run-find-external.sh New: ---- Add-support-for-container-building-using-a-SLE-base-container.patch run-find-external.sh.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spack.spec ++++++ --- /var/tmp/diff_new_pack.AMcaev/_old 2022-01-13 00:23:37.027984081 +0100 +++ /var/tmp/diff_new_pack.AMcaev/_new 2022-01-13 00:23:37.031984084 +0100 @@ -30,7 +30,7 @@ # These packages are found and can be used by spack, /etc/spack/packages-yaml # needs to be updated when one of these packages is updated or uninstalled. # Distinguish between packages we recommend and packages which -%define spack_trigger_recommended autoconf bash bison bzip2 cmake-full ccache cpio diffutils findutils flex gcc gcc-c++ gcc-fortran git-lfs make m4 ncurses-devel libtool openssl perl-base pkgconf pkgconf-pkg-config python3-basetar info xz +%define spack_trigger_recommended autoconf bash bison bzip2 cmake-full ccache cpio diffutils findutils flex gcc gcc-c++ gcc-fortran git-lfs make m4 ncurses-devel libtool openssl perl-base pkgconf pkg-config python3-base tar info xz # packages recognized by spack, but not recommended %define spack_trigger_packages ghostscript go fish fzf hugo java-11-openjdk-devel java-14-openjdk-devel java-15-openjdk-devel java-16-openjdk-devel java-1_8_0-openjdk-devel ruby openmpi1-devel openmpi2-devel openmpi3-devel openmpi4-devel openmpi1-gnu-hpc-devel openmpi2-gnu-hpc-devel openmpi3-gnu-hpc-devel openmpi4-gnu-hpc-devel mvapich2-devel mpich-devel gcc7 gcc8 gcc9 gcc10 gcc11 gcc7-c++ gcc8-c++ gcc9-c++ gcc10-c++ gcc11-c++ gcc7-fortran gcc8-fortran gcc9-fortran gcc10-fortran gcc11-fortran # non oss packages @@ -44,7 +44,7 @@ Source0: https://github.com/spack/spack/archive/v%{version}.tar.gz#/spack-%{version}.tar.gz Source1: README.SUSE Source2: spack-rpmlintrc -Source3: run-find-external.sh +Source3: run-find-external.sh.in Source4: https://en.opensuse.org/index.php?title=Spack&action=raw&ref=157522#/README-oo-wiki # Source5 is from https://docs.python.org/3/objects.inv, but has permanent changes so using a static version Source5: objects.inv @@ -55,6 +55,7 @@ Patch6: Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch Patch7: Fix-Spinx-configuration-to-avoid-throwing-errors.patch Patch8: Set-modules-default-to-lmod.patch +Patch9: Add-support-for-container-building-using-a-SLE-base-container.patch %if %{without doc} BuildRequires: fdupes BuildRequires: lua-lmod @@ -289,6 +290,7 @@ cp -r bin/spack* %{buildroot}%{_bindir}/ cp etc/spack/defaults/config.yaml %{buildroot}%{_sysconfdir}/skel/.spack/ install -m 755 %{S:3} %{buildroot}/%{spack_dir}/run-find-external.sh +sed -i -e 's#@@_sysconfdir@@#%{_sysconfdir}#' %{buildroot}/%{spack_dir}/run-find-external.sh # Make spack only to write to home dir of user, if run as user sed -i 's@\(\sroot:\) /opt/spack@\1 ~/spack/packages@' %{buildroot}%{_sysconfdir}/skel/.spack/config.yaml @@ -411,6 +413,7 @@ %fdupes %{buildroot}%{spack_dir} %fdupes %{buildroot}%{_datarootdir}/spack %fdupes %{buildroot}%{_localstatedir}/lib/spack +%{?_distconfdir:%fdupes %{buildroot}/%{_distconfdir}/spack} %else mkdir -p %{buildroot}%{_infodir} mkdir -p %{buildroot}%{_mandir}/man1 ++++++ Add-support-for-container-building-using-a-SLE-base-container.patch ++++++ From: Egbert Eich <e...@suse.com> Date: Wed Jan 12 13:51:57 2022 +0100 Subject: Add support for container building using a SLE base container Patch-mainline: Not yet Git-commit: 9fa0183f8bcff032d20ce3ae4f8e5e5b1e3dea9b References: Signed-off-by: Egbert Eich <e...@suse.com> --- lib/spack/spack/container/images.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json index b82596f2..64ac94a5 100644 --- a/lib/spack/spack/container/images.json +++ b/lib/spack/spack/container/images.json @@ -41,6 +41,19 @@ "image": "opensuse/leap:latest" } }, + "suse/sle:15": { + "bootstrap": { + "template": "container/sle15.dockerfile" + }, + "os_package_manager": "zypper", + "build": "spack/leap15", + "build_tags": { + "develop": "latest" + }, + "final": { + "image": "registry.suse.com/suse/sle15:latest" + } + }, "nvidia/cuda:11.2.1": { "bootstrap": { "template": "container/cuda_11_2_1.dockerfile", ++++++ run-find-external.sh.in ++++++ #!/bin/bash if [ -e @@_sysconfdir@@/spack/no_rpm_trigger ] ; then exit 0 fi if [ "x$(id -u)" != "x0" ] ; then echo "Must run as root, in order to copy back the configuration files and use sudo" exit 0 fi echo "Create /etc/spack/no_rpm_trigger to stop spack to search for new packages after a rpm install" # save old packages.yml, it has to be removed as when not # the new and old packages.yaml files would have to be # combined test -e /etc/spack/packages.yaml && mv /etc/spack/packages.yaml /etc/spack/packages.yaml.old # prepare the path mypath=/usr/lib64/mpi/gcc/openmpi4/bin mypath=/usr/lib64/mpi/gcc/openmpi3/bin:${mypath} mypath=/usr/lib64/mpi/gcc/openmpi2/bin:${mypath} mypath=/usr/lib64/mpi/gcc/openmpi1/bin:${mypath} mypath=/usr/lib64/mpi/gcc/mvapich2/bin:${mypath} mypath=/usr/lib64/mpi/gcc/mpich/bin:${mypath} mypath=/usr/lib/hpc/gnu?/mpi/openmpi/4.*/bin:${mypath} mypath=/usr/lib/hpc/gnu?/mpi/openmpi/3.*/bin:${mypath} mypath=/usr/lib/hpc/gnu?/mpi/openmpi/2.*/bin:${mypath} mypath=/usr/lib/hpc/gnu?/mpi/mpich/3.*/bin:${mypath} mypath=/usr/lib/hpc/gnu?/mpi/mvapich2/2.*/bin:${mypath} # test if we can run as nobody getent passwd nobody &> /dev/null if [ "x$?" == "x0" ] ; then # drop all root rights, when calling external find sudo -u nobody PATH=${mypath}:${PATH} spack external find --scope user #--exclude 'installdbgsymbols' if [ -e /var/lib/nobody/.spack/packages.yaml ] ; then mv -v /var/lib/nobody/.spack/packages.yaml /etc/spack/packages.yaml chown root:root /etc/spack/packages.yaml rm -r /var/lib/nobody/.spack fi else # May run in a container... PATH=${mypath}:${PATH} spack external find --scope system #--exclude 'installdbgsymbols' fi
