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 365629c0bb90b794b392b1088e2404ffc565e0f1 (commit) via 69e29b22deca7d82f1cc21202fdb7e101bcecb62 (commit) from 03a3f90805eed4de204d73c7ce53af7d26660076 (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 365629c0bb90b794b392b1088e2404ffc565e0f1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jul 12 00:37:13 2010 +0200

Fix backupiso (2.7).

commit 69e29b22deca7d82f1cc21202fdb7e101bcecb62 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jul 12 00:24:26 2010 +0200

Add ddrescue package.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/39/filelists/files | 1 + config/rootfiles/packages/ddrescue | 3 +++ doc/packages-list.txt | 1 + lfs/{bwm-ng => ddrescue} | 12 ++++++------ make.sh | 1 + src/scripts/backupiso | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 config/rootfiles/packages/ddrescue copy lfs/{bwm-ng => ddrescue} (94%)

Difference in files: diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files index 5b9c934..227a62c 100644 --- a/config/rootfiles/core/39/filelists/files +++ b/config/rootfiles/core/39/filelists/files @@ -3,3 +3,4 @@ etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/networking/red etc/rc.d/helper/getdnsfromdhcpc.pl srv/web/ipfire/cgi-bin/pppsetup.cgi +usr/local/bin/backupiso diff --git a/config/rootfiles/packages/ddrescue b/config/rootfiles/packages/ddrescue new file mode 100644 index 0000000..3d0a0b9 --- /dev/null +++ b/config/rootfiles/packages/ddrescue @@ -0,0 +1,3 @@ +usr/bin/ddrescue +#usr/share/info/ddrescue.info +#usr/share/man/man1/ddrescue.1 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 1f0f4d3..12cf33a 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -84,6 +84,7 @@ * dahdi-2.2.1-kmod-2.6.32.15-ipfire-xen * db-4.4.20 * dbus-1.0.3 +* ddrescue-1.12 * dhcp-3.1.0 * dhcpcd-5.1.3 * diffutils-2.8.1 diff --git a/lfs/ddrescue b/lfs/ddrescue new file mode 100644 index 0000000..c61e2d7 --- /dev/null +++ b/lfs/ddrescue @@ -0,0 +1,84 @@ +############################################################################### +# # +# 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 = 1.12 +THISAPP = ddrescue-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = ddrescue +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b3d8a9a9098b87939fba05a45848bd8d + +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) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index c4511ed..e0cf399 100755 --- a/make.sh +++ b/make.sh @@ -641,6 +641,7 @@ buildipfire() { ipfiremake eject ipfiremake pound ipfiremake minicom + ipfiremake ddrescue echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 71e7974..c1cc35b 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -3,7 +3,7 @@ COREVER=`cat /opt/pakfire/db/core/mine` # FIXME: edit this lines before release URL=http://download.ipfire.org/iso/ -ISO=ipfire-2.5.i586-full-core$COREVER.iso +ISO=ipfire-2.7.i586-full-core$COREVER.iso

if [ -z "$1" ]; then echo usage: $0 backup-file

hooks/post-receive -- IPFire 2.x development tree