diff mbox

[rdma-core,v3] redhat/spec: further cleanups to depdendencies, descriptions, formatting

Message ID 20170109223631.GB10850@obsidianresearch.com (mailing list archive)
State Accepted
Headers show

Commit Message

Jason Gunthorpe Jan. 9, 2017, 10:36 p.m. UTC 
On Mon, Jan 09, 2017 at 04:39:10PM -0500, Jarod Wilson wrote:
> These are numerous additional little fixups for the Fedora/Red Hat spec
> file, stemming from Fedora package review.
> 
> - Per https://fedoraproject.org/wiki/Packaging:Systemd it seems we need to
>   have systemd as a BuildRequires for %{_unitdir} to evaluate properly.
> 
> - Add explicit dependencies on kmod, and systemd, because in the world of
>   containers and some virt guests, these aren't automatically pulled in,
>   due to not having a kernel installed in the container or guest.
> 
> - Add missing Requires to rdma-core-devel on each sub-package it provides
>   devel headers and libs for
> 
> - Update summary of libibverbs to mention RoCE too
> 
> - Add requirement on logrotate to srp_daemon

I thought we agreed to just dump the rsyslog stuff?

From 304bbeadf79efe01e8db8230e21d812e1fec152f Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Date: Mon, 9 Jan 2017 15:34:44 -0700
Subject: [PATCH] srp: Do no include example log rsyslog configuration

Distros are now using systemd so 'journalctl -u srp_daemon' does
the same thing.

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
---
 srp_daemon/CMakeLists.txt          | 2 --
 srp_daemon/logrotate-srp_daemon    | 7 -------
 srp_daemon/rsyslog-srp_daemon.conf | 3 ---
 3 files changed, 12 deletions(-)
 delete mode 100644 srp_daemon/logrotate-srp_daemon
 delete mode 100644 srp_daemon/rsyslog-srp_daemon.conf

Comments

Jarod Wilson Jan. 10, 2017, 3:20 a.m. UTC | #1 
On 2017-01-09 5:36 PM, Jason Gunthorpe wrote:
> On Mon, Jan 09, 2017 at 04:39:10PM -0500, Jarod Wilson wrote:
>> These are numerous additional little fixups for the Fedora/Red Hat spec
>> file, stemming from Fedora package review.
>>
>> - Per https://fedoraproject.org/wiki/Packaging:Systemd it seems we need to
>>   have systemd as a BuildRequires for %{_unitdir} to evaluate properly.
>>
>> - Add explicit dependencies on kmod, and systemd, because in the world of
>>   containers and some virt guests, these aren't automatically pulled in,
>>   due to not having a kernel installed in the container or guest.
>>
>> - Add missing Requires to rdma-core-devel on each sub-package it provides
>>   devel headers and libs for
>>
>> - Update summary of libibverbs to mention RoCE too
>>
>> - Add requirement on logrotate to srp_daemon
>
> I thought we agreed to just dump the rsyslog stuff?
>
> From 304bbeadf79efe01e8db8230e21d812e1fec152f Mon Sep 17 00:00:00 2001
> From: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
> Date: Mon, 9 Jan 2017 15:34:44 -0700
> Subject: [PATCH] srp: Do no include example log rsyslog configuration
>
> Distros are now using systemd so 'journalctl -u srp_daemon' does
> the same thing.
>
> Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>

Ah, yes. Whoops. I blame vacation, I forgot about that when trying to 
get back up to speed on this today. :)
diff mbox

Patch

diff --git a/srp_daemon/CMakeLists.txt b/srp_daemon/CMakeLists.txt
index acb851bcb8a438..305682d740085b 100644
--- a/srp_daemon/CMakeLists.txt
+++ b/srp_daemon/CMakeLists.txt
@@ -25,8 +25,6 @@  rdma_subst_install(FILES "srp_daemon.sh.in"
   RENAME "srp_daemon.sh"
   PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
 
-install(FILES logrotate-srp_daemon DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d" RENAME "srp_daemon")
-install(FILES rsyslog-srp_daemon.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/rsyslog.d" RENAME "srp_daemon.conf")
 install(FILES srp_daemon.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}")
 
 if ("${DISTRO_FLAVOUR}" STREQUAL "Debian")
diff --git a/srp_daemon/logrotate-srp_daemon b/srp_daemon/logrotate-srp_daemon
deleted file mode 100644
index 066b6325ed27ff..00000000000000
--- a/srp_daemon/logrotate-srp_daemon
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/var/log/srp_daemon {
-	missingok
-	notifempty
-	copytruncate
-	weekly
-	compress
-}
diff --git a/srp_daemon/rsyslog-srp_daemon.conf b/srp_daemon/rsyslog-srp_daemon.conf
deleted file mode 100644
index 191ca799b1c371..00000000000000
--- a/srp_daemon/rsyslog-srp_daemon.conf
+++ /dev/null
@@ -1,3 +0,0 @@ 
-if	$programname == 'srp_daemon' or $syslogtag == '[srp_daemon]:' \
-then	-/var/log/srp_daemon.log
-&	~