This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 15bf90daae2981cbebc043dfe630c4e05f87035f (commit) via 37d94d170783eadb6be37c39cce148527cd6c01c (commit) via 84f3809e6e13d93286911e2a142739472d9a0900 (commit) from 127d581f30c1e2d6f0e0f69161015021a3b1c387 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 15bf90daae2981cbebc043dfe630c4e05f87035f Merge: 84f3809 37d94d1 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Nov 3 23:11:59 2011 +0100
Merge remote-tracking branch 'stevee/tcl-testsuite'
commit 37d94d170783eadb6be37c39cce148527cd6c01c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Nov 3 20:21:15 2011 +0100
tcl: Remove remote tests from testsuite.
Also remove unixInit-1.1 this test fails on a non supported command.
Fixes #261
commit 84f3809e6e13d93286911e2a142739472d9a0900 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Nov 2 21:45:40 2011 +0100
icecream: Add service files, create logfiles.
Fixes #266
-----------------------------------------------------------------------
Summary of changes: icecream/icecream.nm | 31 +++++++++++++++++++++++++++-- icecream/systemd/icecc-scheduler.service | 10 +++++++++ icecream/systemd/iceccd.service | 10 +++++++++ tcl/tcl.nm | 7 ++++- 4 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 icecream/systemd/icecc-scheduler.service create mode 100644 icecream/systemd/iceccd.service
Difference in files: diff --git a/icecream/icecream.nm b/icecream/icecream.nm index dad6c99..be1ee15 100644 --- a/icecream/icecream.nm +++ b/icecream/icecream.nm @@ -3,11 +3,9 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-# XXX initscripts for daemons are missing - name = icecream version = 0.9.7 -release = 1 +release = 2
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -77,6 +75,10 @@ build rm -rvf %{BUILDROOT}/usr/bin/cc rm -rvf %{BUILDROOT}/usr/bin/g++ rm -rvf %{BUILDROOT}/usr/bin/gcc + + # Create Logfiles. + mkdir -pv %{BUILDROOT}/var/log + touch %{BUILDROOT}/var/log/icecc{d,-scheduler}.log end end
@@ -86,6 +88,29 @@ packages gcc-c++ /usr/bin/ldd end + + prerequires += systemd-units + + script postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + /bin/systemctl --no-reload disable iceccd.service \ + icecc-scheduler.service >/dev/null 2>&1 || : + /bin/systemctl stop iceccd.service \ + icecc-scheduler.service >/dev/null 2>&1 || : + end + + script postun + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart iceccd.service \ + icecc-scheduler.service >/dev/null 2>&1 || : + end end package %{name}-devel diff --git a/icecream/systemd/icecc-scheduler.service b/icecream/systemd/icecc-scheduler.service new file mode 100644 index 0000000..38a1402 --- /dev/null +++ b/icecream/systemd/icecc-scheduler.service @@ -0,0 +1,10 @@ +[Unit] +Description=Icecream job scheduler +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/icecc-scheduler -vvv -d -p 8765 -l /var/log/icecc-scheduler.log + +[Install] +WantedBy=multi-user.target diff --git a/icecream/systemd/iceccd.service b/icecream/systemd/iceccd.service new file mode 100644 index 0000000..aab8d30 --- /dev/null +++ b/icecream/systemd/iceccd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Icecream daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/iceccd -vvv -d -s localhost -m 2 -l /var/log/iceccd.log + +[Install] +WantedBy=multi-user.target diff --git a/tcl/tcl.nm b/tcl/tcl.nm index 7b941f2..528b3db 100644 --- a/tcl/tcl.nm +++ b/tcl/tcl.nm @@ -5,7 +5,7 @@
name = tcl version = 8.5.10 -release = 1 +release = 2
groups = Development/Languages url = http://tcl.sourceforge.net/ @@ -44,7 +44,10 @@ build end
test - make test + # Skip remote tests http, httpold and socket. + # Also skip unixInit-1.1. This test fails because "kill -PIPE" + # will be executed and we don't support that. + make test TESTFLAGS="-skip 'http* socket* unixInit-1.1'" end
install_cmds
hooks/post-receive -- IPFire 3.x development tree