diff options
author | Ryan Egesdahl <ryan.egesdahl@mongodb.com> | 2021-04-02 10:58:12 -0700 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-10 15:45:13 +0000 |
commit | 31a75fa034ab929b5c0ef834fde92c845041b036 (patch) | |
tree | 1134312983cd6903ec4045559a0b9e2acc26fce8 /rpm | |
parent | 3076499da3152465085cebb3d6295be349ebdeed (diff) | |
download | mongo-31a75fa034ab929b5c0ef834fde92c845041b036.tar.gz |
SERVER-55460 Fix RPM packaging and package testing for SLES 12
Some versions of SLES apparently don't define the _sharedstatedir RPM
macro properly, leaving it at the old-time UNIX /usr/com default. This
was causing the server to fail to start on such platforms because the
expected data directory at /var/lib/mongodb was missing. The macro is
now statically defined on SLES to /var like it should be on any modern
Linux distribution.
Also fixed were paths to systemd unit files in package testing and the
fact that we weren't installing the tools-extra package, which we should
be doing if only to verify that the script indeed continues to fail
expectedly on the platform.
(cherry picked from commit 649dc04027667b30155be39be39a880cb0b8743a)
Diffstat (limited to 'rpm')
-rw-r--r-- | rpm/mongodb-enterprise-init.spec | 8 | ||||
-rw-r--r-- | rpm/mongodb-enterprise-unstable-init.spec | 8 | ||||
-rw-r--r-- | rpm/mongodb-enterprise-unstable.spec | 8 | ||||
-rw-r--r-- | rpm/mongodb-enterprise.spec | 8 | ||||
-rw-r--r-- | rpm/mongodb-org-init.spec | 8 | ||||
-rw-r--r-- | rpm/mongodb-org-unstable-init.spec | 8 | ||||
-rw-r--r-- | rpm/mongodb-org-unstable.spec | 8 | ||||
-rw-r--r-- | rpm/mongodb-org.spec | 8 |
8 files changed, 64 insertions, 0 deletions
diff --git a/rpm/mongodb-enterprise-init.spec b/rpm/mongodb-enterprise-init.spec index aceb5baa2ce..9f0d676b8e7 100644 --- a/rpm/mongodb-enterprise-init.spec +++ b/rpm/mongodb-enterprise-init.spec @@ -1,3 +1,11 @@ +%if 0%{?suse_version} +%define _sharedstatedir %{_localstatedir}/lib +%endif + +%if ! %{defined _docdir} +%define _docdir %{_datadir}/doc +%endif + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif diff --git a/rpm/mongodb-enterprise-unstable-init.spec b/rpm/mongodb-enterprise-unstable-init.spec index 3425af44c05..90d418996f8 100644 --- a/rpm/mongodb-enterprise-unstable-init.spec +++ b/rpm/mongodb-enterprise-unstable-init.spec @@ -1,3 +1,11 @@ +%if 0%{?suse_version} +%define _sharedstatedir %{_localstatedir}/lib +%endif + +%if ! %{defined _docdir} +%define _docdir %{_datadir}/doc +%endif + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif diff --git a/rpm/mongodb-enterprise-unstable.spec b/rpm/mongodb-enterprise-unstable.spec index 4197e104890..22d9a139f26 100644 --- a/rpm/mongodb-enterprise-unstable.spec +++ b/rpm/mongodb-enterprise-unstable.spec @@ -1,3 +1,11 @@ +%if 0%{?suse_version} +%define _sharedstatedir %{_localstatedir}/lib +%endif + +%if ! %{defined _docdir} +%define _docdir %{_datadir}/doc +%endif + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif diff --git a/rpm/mongodb-enterprise.spec b/rpm/mongodb-enterprise.spec index 038bce13e26..19c7aefecb7 100644 --- a/rpm/mongodb-enterprise.spec +++ b/rpm/mongodb-enterprise.spec @@ -1,3 +1,11 @@ +%if 0%{?suse_version} +%define _sharedstatedir %{_localstatedir}/lib +%endif + +%if ! %{defined _docdir} +%define _docdir %{_datadir}/doc +%endif + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif diff --git a/rpm/mongodb-org-init.spec b/rpm/mongodb-org-init.spec index b8a74f0cb41..82749067ca2 100644 --- a/rpm/mongodb-org-init.spec +++ b/rpm/mongodb-org-init.spec @@ -1,3 +1,11 @@ +%if 0%{?suse_version} +%define _sharedstatedir %{_localstatedir}/lib +%endif + +%if ! %{defined _docdir} +%define _docdir %{_datadir}/doc +%endif + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif diff --git a/rpm/mongodb-org-unstable-init.spec b/rpm/mongodb-org-unstable-init.spec index 7f70e21beab..72a6de28aaa 100644 --- a/rpm/mongodb-org-unstable-init.spec +++ b/rpm/mongodb-org-unstable-init.spec @@ -1,3 +1,11 @@ +%if 0%{?suse_version} +%define _sharedstatedir %{_localstatedir}/lib +%endif + +%if ! %{defined _docdir} +%define _docdir %{_datadir}/doc +%endif + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif diff --git a/rpm/mongodb-org-unstable.spec b/rpm/mongodb-org-unstable.spec index 1a786ba6b59..b6545c5cb22 100644 --- a/rpm/mongodb-org-unstable.spec +++ b/rpm/mongodb-org-unstable.spec @@ -1,3 +1,11 @@ +%if 0%{?suse_version} +%define _sharedstatedir %{_localstatedir}/lib +%endif + +%if ! %{defined _docdir} +%define _docdir %{_datadir}/doc +%endif + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif diff --git a/rpm/mongodb-org.spec b/rpm/mongodb-org.spec index 0f72271d0a7..569b18c795b 100644 --- a/rpm/mongodb-org.spec +++ b/rpm/mongodb-org.spec @@ -1,3 +1,11 @@ +%if 0%{?suse_version} +%define _sharedstatedir %{_localstatedir}/lib +%endif + +%if ! %{defined _docdir} +%define _docdir %{_datadir}/doc +%endif + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif |