Skip to content

Commit

Permalink
Merge pull request #952
Browse files Browse the repository at this point in the history
Enable building SLE 15 SP3
  • Loading branch information
arogge committed Oct 8, 2021
2 parents e92dd6f + ac1d535 commit fcb3183
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 3 deletions.
9 changes: 9 additions & 0 deletions .matrix.yml
Expand Up @@ -65,6 +65,15 @@ OS:


SLE:
"15_SP3":
TYPE: rpm
IMAGE: sle153
ARCH:
- x86_64
PROJECTPACKAGES:
x86_64:
- bareos
- python-bareos
"15_SP2":
TYPE: rpm
IMAGE: sle152
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -75,6 +75,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
- systemtest:bareos test now also runs on btrfs filesystem [PR #907]
- packages: Build also for Fedora_34 [PR #869]
- packages: Build also for Debian_11 [PR #914]
- packages: Build also for SLE_15_SP3 [PR #952]
- add job name in End Job Session output in bls tool [PR #916]
- added check for orphaned storages in dbcheck [PR #912]
- added option to delete selected storage in bconsole if it is orphaned [PR #912]
Expand Down
18 changes: 15 additions & 3 deletions core/platforms/packaging/bareos.spec
Expand Up @@ -142,9 +142,14 @@ BuildRequires: devtoolset-8-gcc
BuildRequires: devtoolset-8-gcc-c++
%endif

%if 0%{?suse_version}
%if 0%{?sle_version} >= 150300
BuildRequires: gcc10
BuildRequires: gcc10-c++
%else
%if 0%{?suse_version}
BuildRequires: gcc9
BuildRequires: gcc9-c++
%endif
%endif

%if 0%{?systemd_support}
Expand Down Expand Up @@ -958,12 +963,19 @@ pushd %{CMAKE_BUILDDIR}
source /opt/rh/devtoolset-8/enable
%endif

# use gcc9 on SuSE
%if 0%{?suse_version}
# use modern compiler on suse
%if 0%{?sle_version} >= 150300
CC=gcc-10 ; export CC
CXX=g++-10 ; export CXX
%else
%if 0%{?suse_version}
CC=gcc-9 ; export CC
CXX=g++-9 ; export CXX
%endif
%endif



CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;

Expand Down
63 changes: 63 additions & 0 deletions docs/pkglists/SLE_15_SP3.x86_64
@@ -0,0 +1,63 @@
debug/x86_64/bareos-bconsole-debuginfo
debug/x86_64/bareos-common-debuginfo
debug/x86_64/bareos-database-common-debuginfo
debug/x86_64/bareos-database-mysql-debuginfo
debug/x86_64/bareos-database-postgresql-debuginfo
debug/x86_64/bareos-database-sqlite3-debuginfo
debug/x86_64/bareos-database-tools-debuginfo
debug/x86_64/bareos-debuginfo
debug/x86_64/bareos-debugsource
debug/x86_64/bareos-director-debuginfo
debug/x86_64/bareos-director-python2-plugin-debuginfo
debug/x86_64/bareos-director-python3-plugin-debuginfo
debug/x86_64/bareos-filedaemon-ceph-plugin-debuginfo
debug/x86_64/bareos-filedaemon-debuginfo
debug/x86_64/bareos-filedaemon-python2-plugin-debuginfo
debug/x86_64/bareos-filedaemon-python3-plugin-debuginfo
debug/x86_64/bareos-storage-ceph-debuginfo
debug/x86_64/bareos-storage-debuginfo
debug/x86_64/bareos-storage-droplet-debuginfo
debug/x86_64/bareos-storage-fifo-debuginfo
debug/x86_64/bareos-storage-python2-plugin-debuginfo
debug/x86_64/bareos-storage-python3-plugin-debuginfo
debug/x86_64/bareos-storage-tape-debuginfo
debug/x86_64/bareos-tools-debuginfo
debug/x86_64/bareos-traymonitor-debuginfo
noarch/python2-bareos
noarch/python3-bareos
src/bareos
src/python-bareos
x86_64/bareos
x86_64/bareos-bconsole
x86_64/bareos-client
x86_64/bareos-common
x86_64/bareos-database-common
x86_64/bareos-database-mysql
x86_64/bareos-database-postgresql
x86_64/bareos-database-sqlite3
x86_64/bareos-database-tools
x86_64/bareos-director
x86_64/bareos-director-python-plugins-common
x86_64/bareos-director-python2-plugin
x86_64/bareos-director-python3-plugin
x86_64/bareos-filedaemon
x86_64/bareos-filedaemon-ceph-plugin
x86_64/bareos-filedaemon-ldap-python-plugin
x86_64/bareos-filedaemon-libcloud-python-plugin
x86_64/bareos-filedaemon-ovirt-python-plugin
x86_64/bareos-filedaemon-percona-xtrabackup-python-plugin
x86_64/bareos-filedaemon-postgresql-python-plugin
x86_64/bareos-filedaemon-python-plugins-common
x86_64/bareos-filedaemon-python2-plugin
x86_64/bareos-filedaemon-python3-plugin
x86_64/bareos-storage
x86_64/bareos-storage-ceph
x86_64/bareos-storage-droplet
x86_64/bareos-storage-fifo
x86_64/bareos-storage-python-plugins-common
x86_64/bareos-storage-python2-plugin
x86_64/bareos-storage-python3-plugin
x86_64/bareos-storage-tape
x86_64/bareos-tools
x86_64/bareos-traymonitor
x86_64/bareos-webui

0 comments on commit fcb3183

Please sign in to comment.