[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. db0798e82af1d7bdc83f319d06276c923d4fc012 - IPFire-SCM

16 Feb 2011

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 2.x development tree".
The branch, master has been updated
       via  db0798e82af1d7bdc83f319d06276c923d4fc012 (commit)
       via  6f928c4d380d096a1abd0831c2c1de1a920b3ad1 (commit)
       via  c74f6bce72cad9e2599416d9602dd426d864f1d4 (commit)
       via  8b316677104f8bd40a29979052bc546daee02454 (commit)
      from  9fd6aa06b69bf944ac615439ee28d328578af23a (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 db0798e82af1d7bdc83f319d06276c923d4fc012
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 16 21:07:41 2011 +0100
fireinfo: Update to version 2.0.5.
commit 6f928c4d380d096a1abd0831c2c1de1a920b3ad1
Merge: c74f6bc 9fd6aa0
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Feb 16 21:05:32 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
commit c74f6bce72cad9e2599416d9602dd426d864f1d4
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Feb 6 19:55:23 2011 +0100
icecc: Update of initscript.
commit 8b316677104f8bd40a29979052bc546daee02454
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Feb 6 19:27:55 2011 +0100
icecc: Update to 0.9.6.
-----------------------------------------------------------------------
Summary of changes:
 lfs/fireinfo                                |    4 +-
 lfs/icecc                                   |   13 ++--
 src/initscripts/init.d/icecream             |   20 ++++--
 src/patches/icecream-rename-scheduler.patch |  107 +++++++++++++++++++++++++++
 4 files changed, 130 insertions(+), 14 deletions(-)
 create mode 100644 src/patches/icecream-rename-scheduler.patch
Difference in files:

diff --git a/lfs/fireinfo b/lfs/fireinfo
index 6c502e1..6c2177a 100644
--- a/lfs/fireinfo
+++ b/lfs/fireinfo
@@ -24,7 +24,7 @@
include Config
-VER        = 2.0.4
+VER        = 2.0.5
THISAPP    = fireinfo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7433e108cce180980189339886621539
+$(DL_FILE)_MD5 = e0e959a6891262f45fc1cedc225a662b
install : $(TARGET)
diff --git a/lfs/icecc b/lfs/icecc
index a5b7af4..d661b19 100644
--- a/lfs/icecc
+++ b/lfs/icecc
@@ -24,15 +24,15 @@
include Config
-VER        = 0.9.4.8
+VER        = 0.9.6
-THISAPP    = icecream-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = icecc-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icecc
-PAK_VER    = 1
+PAK_VER    = 2
DEPS       = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f304865d3f68d0d5ee2c2084571b7b28
+$(DL_FILE)_MD5 = c6dacb3f28eade45f603a99245cde4fd
install : $(TARGET)
@@ -76,7 +76,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/icecream-rename-scheduler.patch
    cd $(DIR_APP) && ./configure \
    			--prefix=/opt/icecream
    cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
diff --git a/src/initscripts/init.d/icecream b/src/initscripts/init.d/icecream
index 6ce4660..f8fa4e3 100644
--- a/src/initscripts/init.d/icecream
+++ b/src/initscripts/init.d/icecream
@@ -15,24 +15,32 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
-SCHEDULER=minerva.ipfire.org
+#SCHEDULER=minerva.ipfire.org
+ENABLE_SCHEDULER=on
 JOBS=8
-PORT=10244
case "${1}" in
    start)
    	boot_mesg "Starting Icecream Daemon..."
-		/opt/icecream/sbin/iceccd -d -s ${SCHEDULER} -m ${JOBS} -p ${PORT}
+		ARGS="-d -m ${JOBS}"
+		if [ -n "${SCHEDULER}" ]; then
+			ARGS="${ARGS} -s ${SCHEDULER}"
+		fi
+		/opt/icecream/sbin/iceccd ${ARGS}
    	evaluate_retval
-		if ! grep -q "${PORT}" /var/ipfire/xtaccess/config ; then
-			echo "tcp,0.0.0.0/0,${PORT},on,0.0.0.0,Icecream" >> /var/ipfire/xtaccess/config
-			/usr/local/bin/setxtaccess
+
+		if [ "${ENABLE_SCHEDULER}" = "on" ]; then
+			/opt/icecream/sbin/icecc-scheduler -d
    	fi
    	;;
    	
    stop)
    	boot_mesg "Stopping Icecream Daemon..."
    	killproc /opt/icecream/sbin/iceccd
+
+		if [ "${ENABLE_SCHEDULER}" = "on" ]; then
+			killproc /opt/icecream/sbin/icecc-scheduler
+		fi
    	;;
restart)
diff --git a/src/patches/icecream-rename-scheduler.patch b/src/patches/icecream-rename-scheduler.patch
new file mode 100644
index 0000000..5de7738
--- /dev/null
+++ b/src/patches/icecream-rename-scheduler.patch
@@ -0,0 +1,107 @@
+Index: icecc-0.9.6/doc/man-scheduler.1.docbook
+===================================================================
+--- icecc-0.9.6.orig/doc/man-scheduler.1.docbook
++++ icecc-0.9.6/doc/man-scheduler.1.docbook
+@@ -23,13 +23,13 @@
+ </refmeta>
+ 
+ <refnamediv>
+-	<refname>scheduler</refname>
++	<refname>icecc-scheduler</refname>
+ 	<refpurpose>Icecream scheduler</refpurpose>
+ </refnamediv>
+ 
+ <refsynopsisdiv>
+ <cmdsynopsis>
+-<command>scheduler</command>
++<command>icecc-scheduler</command>
+ <group>
+   <arg choice="opt">
+     <option>-n</option>
+@@ -151,7 +151,7 @@ need to run the scheduler with root righ
+ 
+ <refsect1>
+ <title>See Also</title>
+-<para>icecream, scheduler, iceccd, icemon</para>
++<para>icecream, icecc-scheduler, iceccd, icemon</para>
+ </refsect1>
+ 
+ <refsect1>
+Index: icecc-0.9.6/services/Makefile.am
+===================================================================
+--- icecc-0.9.6.orig/services/Makefile.am
++++ icecc-0.9.6/services/Makefile.am
+@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h
+ noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
+ icedir = $(includedir)/icecc
+ 
+-sbin_PROGRAMS = scheduler
+-scheduler_SOURCES = scheduler.cpp
+-scheduler_LDADD = libicecc.la
++sbin_PROGRAMS = icecc-scheduler
++icecc_scheduler_SOURCES = scheduler.cpp
++icecc_scheduler_LDADD = libicecc.la
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = icecc.pc
+Index: icecc-0.9.6/services/Makefile.in
+===================================================================
+--- icecc-0.9.6.orig/services/Makefile.in
++++ icecc-0.9.6/services/Makefile.in
+@@ -37,7 +37,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-sbin_PROGRAMS = scheduler$(EXEEXT)
++sbin_PROGRAMS = icecc-scheduler$(EXEEXT)
+ subdir = services
+ DIST_COMMON = $(ice_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/icecc.pc.in
+@@ -82,9 +82,9 @@ libicecc_la_LINK = $(LIBTOOL) --tag=CXX 
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libicecc_la_CXXFLAGS) \
+ 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ PROGRAMS = $(sbin_PROGRAMS)
+-am_scheduler_OBJECTS = scheduler.$(OBJEXT)
+-scheduler_OBJECTS = $(am_scheduler_OBJECTS)
+-scheduler_DEPENDENCIES = libicecc.la
++am_icecc_scheduler_OBJECTS = scheduler.$(OBJEXT)
++icecc_scheduler_OBJECTS = $(am_icecc_scheduler_OBJECTS)
++icecc_scheduler_DEPENDENCIES = libicecc.la
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -107,8 +107,8 @@ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+-SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES)
+-DIST_SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES)
++SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES)
++DIST_SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES)
+ DATA = $(pkgconfig_DATA)
+ HEADERS = $(ice_HEADERS) $(noinst_HEADERS)
+ ETAGS = etags
+@@ -242,8 +242,8 @@ libicecc_la_CXXFLAGS = -fPIC -DPIC
+ ice_HEADERS = job.h comm.h
+ noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
+ icedir = $(includedir)/icecc
+-scheduler_SOURCES = scheduler.cpp
+-scheduler_LDADD = libicecc.la
++icecc_scheduler_SOURCES = scheduler.cpp
++icecc_scheduler_LDADD = libicecc.la
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = icecc.pc
+ all: all-am
+@@ -358,9 +358,9 @@ clean-sbinPROGRAMS:
+ 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ 	echo " rm -f" $$list; \
+ 	rm -f $$list
+-scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES) 
+-	@rm -f scheduler$(EXEEXT)
+-	$(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS)
++icecc-scheduler$(EXEEXT): $(icecc_scheduler_OBJECTS) $(icecc_scheduler_DEPENDENCIES) 
++	@rm -f icecc-scheduler$(EXEEXT)
++	$(CXXLINK) $(icecc_scheduler_OBJECTS) $(icecc_scheduler_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
hooks/post-receive
--
IPFire 2.x development tree

    