[PATCH] etc: Do not clean guix-gc.timer

DoneSubmitted by Matthew James Kraai.
Details
2 participants
  • Matthew James Kraai
  • Mathieu Othacehe
Owner
unassigned
Severity
normal
M
M
Matthew James Kraai wrote on 1 Oct 2021 16:37
(address . guix-patches@gnu.org)(name . Matthew James Kraai)(address . kraai@ftbfs.org)
20211001143706.1673-1-kraai@ftbfs.org
* nix/local.mk (dist_systemdservice_DATA): New.
(nodist_systemdservice_DATA): Remove guix-gc.timer.
(EXTRA_DIST): Remove guix-gc.timer.
---
nix/local.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (30 lines)
diff --git a/nix/local.mk b/nix/local.mk
index d6b4d7faeb..b0cce85cab 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -150,12 +150,13 @@ noinst_HEADERS =						\
 
 # The '.service' files for systemd.
 systemdservicedir = $(libdir)/systemd/system
+dist_systemdservice_DATA =			\
+  etc/guix-gc.timer
 nodist_systemdservice_DATA =			\
   etc/gnu-store.mount				\
   etc/guix-daemon.service			\
   etc/guix-publish.service			\
-  etc/guix-gc.service				\
-  etc/guix-gc.timer
+  etc/guix-gc.service
 
 etc/%.mount: etc/%.mount.in	\
 			 $(top_builddir)/config.status
@@ -219,7 +220,6 @@ EXTRA_DIST +=					\
   etc/guix-publish.service.in			\
   etc/guix-publish.conf.in			\
   etc/guix-gc.service.in			\
-  etc/guix-gc.timer				\
   etc/init.d/guix-daemon.in			\
   etc/openrc/guix-daemon.in
 
-- 
2.33.0
M
M
Mathieu Othacehe wrote on 2 Oct 2021 19:04
(name . Matthew James Kraai)(address . kraai@ftbfs.org)(address . 50938@debbugs.gnu.org)
87ee93we6x.fsf@gnu.org
Hello,

Toggle quote (2 lines)
> - etc/guix-gc.timer

Commit 8579304e8f4deaca33b816b2d56af1d814a03bde already removes
guix-gc.timer from the nodist_systemdservice_DATA list.

Toggle quote (5 lines)
> etc/guix-gc.service.in \
> - etc/guix-gc.timer \
> etc/init.d/guix-daemon.in \
> etc/openrc/guix-daemon.in

Why should we move guix-gc.timer from EXTRA_DIST to
dist_systemdservice_DATA?

Thanks,

Mathieu
M
M
Matthew James Kraai wrote on 2 Oct 2021 22:27
Fwd: bug#50938: [PATCH] etc: Do not clean guix-gc.timer
(address . 50938@debbugs.gnu.org)
1668e5a7-b12b-e6bd-74f5-646580da4143@ftbfs.org
-------- Forwarded Message --------
Subject: Re: bug#50938: [PATCH] etc: Do not clean guix-gc.timer
Date: Sat, 2 Oct 2021 13:26:04 -0700
From: Matthew James Kraai <kraai@ftbfs.org>
To: Mathieu Othacehe <othacehe@gnu.org>



Hi,

On 10/2/21 10:04 AM, Mathieu Othacehe wrote:
Toggle quote (13 lines)
> Hello,
>
>> - etc/guix-gc.timer
> Commit 8579304e8f4deaca33b816b2d56af1d814a03bde already removes
> guix-gc.timer from the nodist_systemdservice_DATA list.
>
>> etc/guix-gc.service.in \
>> - etc/guix-gc.timer \
>> etc/init.d/guix-daemon.in \
>> etc/openrc/guix-daemon.in
> Why should we move guix-gc.timer from EXTRA_DIST to
> dist_systemdservice_DATA?

I think it has to be in dist_systemdservice_DATA in order to be
installed.  Is that not the case?

Matt
Attachment: file
M
M
Mathieu Othacehe wrote on 3 Oct 2021 21:39
Re: bug#50938: [PATCH] etc: Do not clean guix-gc.timer
(name . Matthew James Kraai)(address . kraai@ftbfs.org)(address . 50938-done@debbugs.gnu.org)
8735phsxs4.fsf_-_@gnu.org
Hey Matt,

Toggle quote (3 lines)
> I think it has to be in dist_systemdservice_DATA in order to be
> installed. Is that not the case?

Looks like having this file in the EXTRA_DIST list is enough to have it
installed. I think we can close this one.

Thanks,

Mathieu
Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 50938@debbugs.gnu.org