[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bfb8d9b7f9a41c1b7d37a098f7b4e0ef30d701f3
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, next has been updated via bfb8d9b7f9a41c1b7d37a098f7b4e0ef30d701f3 (commit) via 1d39d23dfa08e8eb194e0e3fa7b7254d02b89212 (commit) via 74fee3a10a40290c945508274dad719d8e6ea261 (commit) via f697875d92ce527c80e46460e87daa49c0f04a1c (commit) from 4e6e5af82cacd7b30e67a86904817ac3cb06e5f4 (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 bfb8d9b7f9a41c1b7d37a098f7b4e0ef30d701f3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 31 12:31:07 2014 +0200
Drop icecc package.
commit 1d39d23dfa08e8eb194e0e3fa7b7254d02b89212 Merge: 4e6e5af 74fee3a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 31 12:29:22 2014 +0200
Merge remote-tracking branch 'dweismueller/vdr_vnsiserver5_new' into next
Conflicts: make.sh
commit 74fee3a10a40290c945508274dad719d8e6ea261 Author: Daniel Weismüller daniel.weismueller@ipfire.org Date: Mon May 19 20:00:21 2014 +0200
vdr_vnsiserver5: edited the discription in the vnsiserver5.conf
commit f697875d92ce527c80e46460e87daa49c0f04a1c Author: Daniel Weismüller daniel.weismueller@ipfire.org Date: Mon May 19 13:37:57 2014 +0200
vdr-vnsi-server5-plugin: this is the first release of the vnsiserver5-plugin. It is used to access a VDR from a XBMC Media Center v13.
Conflicts: make.sh
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/packages/icecc | 23 ----- config/rootfiles/packages/vdr_vnsiserver5 | 4 + config/vdr/plugins.d/vnsiserver5.conf | 5 ++ lfs/icecc | 87 ------------------ lfs/{vdr_vnsiserver3 => vdr_vnsiserver5} | 26 +++--- make.sh | 2 +- src/initscripts/init.d/icecream | 62 ------------- src/paks/icecc/install.sh | 26 ------ src/paks/icecc/uninstall.sh | 26 ------ src/paks/icecc/update.sh | 26 ------ src/paks/{cacti => vdr_vnsiserver5}/install.sh | 3 +- src/paks/{cacti => vdr_vnsiserver5}/uninstall.sh | 4 +- src/paks/{apcupsd => vdr_vnsiserver5}/update.sh | 0 src/patches/icecream-0.9.7-platform-arm.patch | 22 ----- src/patches/icecream-rename-scheduler.patch | 107 ----------------------- 17 files changed, 27 insertions(+), 398 deletions(-) delete mode 100644 config/rootfiles/packages/icecc create mode 100644 config/rootfiles/packages/vdr_vnsiserver5 create mode 100644 config/vdr/plugins.d/vnsiserver5.conf delete mode 100644 lfs/icecc copy lfs/{vdr_vnsiserver3 => vdr_vnsiserver5} (85%) delete mode 100644 src/initscripts/init.d/icecream delete mode 100644 src/paks/icecc/install.sh delete mode 100644 src/paks/icecc/uninstall.sh delete mode 100644 src/paks/icecc/update.sh copy src/paks/{cacti => vdr_vnsiserver5}/install.sh (97%) copy src/paks/{cacti => vdr_vnsiserver5}/uninstall.sh (97%) copy src/paks/{apcupsd => vdr_vnsiserver5}/update.sh (100%) delete mode 100644 src/patches/icecream-0.9.7-platform-arm.patch delete mode 100644 src/patches/icecream-rename-scheduler.patch
Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index ecd01ec..5d5c692 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -34,7 +34,6 @@ etc/rc.d/init.d/functions #etc/rc.d/init.d/gnump3d etc/rc.d/init.d/halt #etc/rc.d/init.d/hostapd -#etc/rc.d/init.d/icecream #etc/rc.d/init.d/imspector etc/rc.d/init.d/ipsec #etc/rc.d/init.d/keepalived diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index b34ea91..fa3dbcd 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -36,7 +36,6 @@ etc/rc.d/init.d/functions #etc/rc.d/init.d/gnump3d etc/rc.d/init.d/halt #etc/rc.d/init.d/hostapd -#etc/rc.d/init.d/icecream #etc/rc.d/init.d/imspector etc/rc.d/init.d/ipsec #etc/rc.d/init.d/keepalived diff --git a/config/rootfiles/packages/icecc b/config/rootfiles/packages/icecc deleted file mode 100644 index d27df65..0000000 --- a/config/rootfiles/packages/icecc +++ /dev/null @@ -1,23 +0,0 @@ -#opt/icecream -#opt/icecream/bin -#opt/icecream/bin/c++ -#opt/icecream/bin/cc -#opt/icecream/bin/g++ -#opt/icecream/bin/gcc -#opt/icecream/bin/icecc -#opt/icecream/bin/icerun -#opt/icecream/include -#opt/icecream/include/icecc -#opt/icecream/include/icecc/comm.h -#opt/icecream/include/icecc/job.h -#opt/icecream/lib -#opt/icecream/lib/icecc -#opt/icecream/lib/icecc/icecc-create-env -#opt/icecream/lib/libicecc.a -#opt/icecream/lib/libicecc.la -#opt/icecream/lib/pkgconfig -#opt/icecream/lib/pkgconfig/icecc.pc -#opt/icecream/sbin -opt/icecream/sbin/icecc-scheduler -opt/icecream/sbin/iceccd -etc/rc.d/init.d/icecream diff --git a/config/rootfiles/packages/vdr_vnsiserver5 b/config/rootfiles/packages/vdr_vnsiserver5 new file mode 100644 index 0000000..9b27e97 --- /dev/null +++ b/config/rootfiles/packages/vdr_vnsiserver5 @@ -0,0 +1,4 @@ +etc/sysconfig/vdr-plugins.d/vnsiserver5.conf +etc/vdr/plugins/vnsiserver5 +etc/vdr/plugins/vnsiserver5/allowed_hosts.conf +usr/lib/vdr/libvdr-vnsiserver5.so.2.0.0 diff --git a/config/vdr/plugins.d/vnsiserver5.conf b/config/vdr/plugins.d/vnsiserver5.conf new file mode 100644 index 0000000..561552d --- /dev/null +++ b/config/vdr/plugins.d/vnsiserver5.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-vnsiserver5 -*- sh -*- +# +# Add command line options to pass to the vnsiserver5 plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/lfs/icecc b/lfs/icecc deleted file mode 100644 index 9c9651c..0000000 --- a/lfs/icecc +++ /dev/null @@ -1,87 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.9.7 - -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 = 3 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = c06900c2f4011428d0d48826a04f74fb - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @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) && patch -Np0 < $(DIR_SRC)/src/patches/icecream-0.9.7-platform-arm.patch - cd $(DIR_APP) && ./configure \ - --prefix=/opt/icecream - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/vdr_vnsiserver5 b/lfs/vdr_vnsiserver5 new file mode 100644 index 0000000..0416416 --- /dev/null +++ b/lfs/vdr_vnsiserver5 @@ -0,0 +1,99 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.0 +THISAPP = vdr-vnsiserver5-$(VER) +DL_FILE = $(THISAPP).tar.gz + +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr_vnsiserver5 +PAK_VER = 1 + +DEPS = "vdr" + +VDRPLUGVER = 2.0.0 + +EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +CFLAGS += $(EXTRA_FLAGS) +CXXFLAGS += $(EXTRA_FLAGS) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 3d1a0b21d11187e43a56f9e4cf7cb1c9 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download : $(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + LOCALEDIR=$$(pwd)/locale all + + -mkdir -pv /etc/vdr/plugins/vnsiserver5 + cd $(DIR_APP) && install -m 755 libvdr-vnsiserver5.so \ + /usr/lib/vdr/libvdr-vnsiserver5.so.$(VDRPLUGVER) + ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver5/allowed_hosts.conf + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver5.conf \ + /etc/sysconfig/vdr-plugins.d + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4450800..041a0f6 100755 --- a/make.sh +++ b/make.sh @@ -683,6 +683,7 @@ buildipfire() { ipfiremake ffmpeg ipfiremake vdr ipfiremake vdr_streamdev + ipfiremake vdr_vnsiserver5 ipfiremake vdr_vnsiserver3 ipfiremake vdr_epgsearch ipfiremake vdr_dvbapi @@ -725,7 +726,6 @@ buildipfire() { ipfiremake perl-DBD-SQLite ipfiremake perl-File-ReadBackwards ipfiremake cacti - ipfiremake icecc ipfiremake openvmtools ipfiremake nagiosql ipfiremake iftop diff --git a/src/initscripts/init.d/icecream b/src/initscripts/init.d/icecream deleted file mode 100644 index f8fa4e3..0000000 --- a/src/initscripts/init.d/icecream +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/icecream -# -# Description : This is a script that starts the icecream daemon. -# -# Authors : Michael Tremer (mitch@ipfire.org) -# -# Version : 01.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -#SCHEDULER=minerva.ipfire.org -ENABLE_SCHEDULER=on -JOBS=8 - -case "${1}" in - start) - boot_mesg "Starting Icecream Daemon..." - ARGS="-d -m ${JOBS}" - if [ -n "${SCHEDULER}" ]; then - ARGS="${ARGS} -s ${SCHEDULER}" - fi - /opt/icecream/sbin/iceccd ${ARGS} - evaluate_retval - - 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) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc /opt/icecream/sbin/iceccd - ;; - - *) - echo "Usage: ${0} {start|stop|reload|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/icecream diff --git a/src/paks/icecc/install.sh b/src/paks/icecc/install.sh deleted file mode 100644 index fa9a22d..0000000 --- a/src/paks/icecc/install.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -start_service --delay 90 --background icecream diff --git a/src/paks/icecc/uninstall.sh b/src/paks/icecc/uninstall.sh deleted file mode 100644 index 36331ef..0000000 --- a/src/paks/icecc/uninstall.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service icecream -remove_files diff --git a/src/paks/icecc/update.sh b/src/paks/icecc/update.sh deleted file mode 100644 index 88f1f3a..0000000 --- a/src/paks/icecc/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/etc/init.d/icecream stop -./install.sh diff --git a/src/paks/vdr_vnsiserver5/install.sh b/src/paks/vdr_vnsiserver5/install.sh new file mode 100644 index 0000000..3bb613e --- /dev/null +++ b/src/paks/vdr_vnsiserver5/install.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service vdr +extract_files +start_service --background vdr diff --git a/src/paks/vdr_vnsiserver5/uninstall.sh b/src/paks/vdr_vnsiserver5/uninstall.sh new file mode 100644 index 0000000..cb55446 --- /dev/null +++ b/src/paks/vdr_vnsiserver5/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service vdr +remove_files +start_service vdr --background diff --git a/src/paks/vdr_vnsiserver5/update.sh b/src/paks/vdr_vnsiserver5/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/vdr_vnsiserver5/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/patches/icecream-0.9.7-platform-arm.patch b/src/patches/icecream-0.9.7-platform-arm.patch deleted file mode 100644 index 53402f0..0000000 --- a/src/patches/icecream-0.9.7-platform-arm.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: services/scheduler.cpp -=================================================================== ---- services/scheduler.cpp (revision 1310078) -+++ services/scheduler.cpp (working copy) -@@ -52,7 +52,7 @@ - #include "config.h" - #include "bench.h" - --#define DEBUG_SCHEDULER 0 -+#define DEBUG_SCHEDULER 1 - - /* TODO: - * leak check -@@ -613,6 +613,8 @@ - - platform_map.insert( make_pair( string( "ppc" ), string( "ppc64" ) ) ); - platform_map.insert( make_pair( string( "s390" ), string( "s390x" ) ) ); -+ -+ platform_map.insert( make_pair( string( "armv5tel"), string( "armv7l" ) ) ); - } - - multimap<string, string>::const_iterator end = platform_map.upper_bound( target ); diff --git a/src/patches/icecream-rename-scheduler.patch b/src/patches/icecream-rename-scheduler.patch deleted file mode 100644 index 5de7738..0000000 --- a/src/patches/icecream-rename-scheduler.patch +++ /dev/null @@ -1,107 +0,0 @@ -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
-
git＠ipfire.org