summaryrefslogtreecommitdiff
path: root/rpm
diff options
context:
space:
mode:
authorRyan Egesdahl <ryan.egesdahl@mongodb.com>2021-04-02 10:58:12 -0700
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-04-05 17:31:12 +0000
commit649dc04027667b30155be39be39a880cb0b8743a (patch)
tree6315c0d5d8e9cd16aaa0f4fa4a09fe8bc21907b8 /rpm
parent3042e4163892077a00ede19b57489b4d39f38ead (diff)
downloadmongo-649dc04027667b30155be39be39a880cb0b8743a.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.
Diffstat (limited to 'rpm')
-rw-r--r--rpm/mongodb-enterprise-init.spec8
-rw-r--r--rpm/mongodb-enterprise-unstable-init.spec8
-rw-r--r--rpm/mongodb-enterprise-unstable.spec8
-rw-r--r--rpm/mongodb-enterprise.spec8
-rw-r--r--rpm/mongodb-org-init.spec8
-rw-r--r--rpm/mongodb-org-unstable-init.spec8
-rw-r--r--rpm/mongodb-org-unstable.spec8
-rw-r--r--rpm/mongodb-org.spec8
8 files changed, 64 insertions, 0 deletions
diff --git a/rpm/mongodb-enterprise-init.spec b/rpm/mongodb-enterprise-init.spec
index 002ab45c471..034d2fb4890 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 b7128c73377..ef38ffb6df7 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 5ce9b32a142..7cf263e54aa 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 31fa224cf5a..ca4d1cc98e0 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 2c6897bca49..e13f8919816 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 9dfe5e2b4ff..f09d85c35cd 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 b8936243304..d28d6f6fb2d 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 8e81e20463a..0443b328d3e 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