enable packaging for Amazon Linux 2

Author: Andrei Zavada

rel/files/riak

@@ -28,8 +28,9 @@ function delete_pid_file {
     rm -f $PID_DIR/riak.pid
 }
 
-# prevents centos8 su from contacting pam and printing the "Last logged in" message
-if [ "`cat /etc/redhat-release 2>&1`" = "CentOS Stream release 8" ]; then
+# centos7-based distros have a su that contacts pam and prints the "Last logged in" message
+if [ "`cat /etc/redhat-release 2>&1`" = "CentOS Stream release 8" ] ||
+   [ "`cat /etc/system-release 2>&1`" = "Amazon Linux release 2 (Karoo)" ]; then
     SU="su --session-command"
 else
     SU=su

rel/pkg/Makefile

@@ -12,9 +12,16 @@ DEPS_DIR     ?= deps
 ##
 ifeq ($(OS),Linux)
 ARCH          = $(shell uname -m)
+ISAMZ         = $(shell cat /etc/system-release 2> /dev/null)
 ISRPM         = $(shell cat /etc/redhat-release 2> /dev/null)
+ISAMZ         = $(shell cat /etc/system-release 2> /dev/null)
 ISDEB         = $(shell cat /etc/debian_version 2> /dev/null)
 ISSLES        = $(shell cat /etc/SuSE-release 2> /dev/null)
+ifneq ($(ISAMZ),)
+OSNAME        = Amazon
+PKGERDIR      = rpm
+BUILDDIR      = rpmbuild
+else
 ifneq ($(ISRPM),)
 OSNAME        = RedHat
 PKGERDIR      = rpm
@@ -32,6 +39,7 @@ BUILDDIR      = rpmbuild
 endif  # SLES
 endif  # deb
 endif  # rpm
+endif  # amazon
 endif  # linux
 
 ifeq ($(OS),Darwin)          # OSX

rel/pkg/rpm/specfile

@@ -29,7 +29,7 @@ Vendor: "Riak"
 Packager: "Riak Package Maint" <"[email protected]">
 BuildRoot: %{_tmppath}/%{name}-%{_revision}-%{release}-root
 Summary: "Riak is a distributed data store"
-BuildRequires: systemd systemd-rpm-macros gcc-c++ pam-devel
+BuildRequires: systemd gcc-c++ pam-devel
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd