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 8fb6ecda94638e10b5607bddce2881d6e4b2ed17 (commit) via f3df269f02c7f747791b07d8f54005cff5fee719 (commit) via eed83b35a37a67db074efbcfd5e6caf61d9a30e7 (commit) from 9b8287772ae3a87be76dcc95aaad8211d1c98571 (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 8fb6ecda94638e10b5607bddce2881d6e4b2ed17 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 2 14:52:27 2011 +0200
make.sh: add machine type to system-release.
commit f3df269f02c7f747791b07d8f54005cff5fee719 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 2 14:49:12 2011 +0200
make.sh: remove question for creating .config
commit eed83b35a37a67db074efbcfd5e6caf61d9a30e7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 2 14:08:43 2011 +0200
transmission: add initskript and backup include to package.
-----------------------------------------------------------------------
Summary of changes: config/backup/includes/transmission | 1 + config/rootfiles/packages/transmission | 2 ++ lfs/transmission | 7 ++++++- make.sh | 12 ++---------- 4 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 config/backup/includes/transmission
Difference in files: diff --git a/config/backup/includes/transmission b/config/backup/includes/transmission new file mode 100644 index 0000000..d2ec52c --- /dev/null +++ b/config/backup/includes/transmission @@ -0,0 +1 @@ +/etc/transmission/ diff --git a/config/rootfiles/packages/transmission b/config/rootfiles/packages/transmission index a784341..6a0c22e 100644 --- a/config/rootfiles/packages/transmission +++ b/config/rootfiles/packages/transmission @@ -1,3 +1,4 @@ +var/ipfire/backup/addons/includes/transmission #etc/transmission etc/transmission/settings.json usr/bin/transmission-cli @@ -64,3 +65,4 @@ usr/share/transmission #usr/share/transmission/web/stylesheets/ie6.css #usr/share/transmission/web/stylesheets/ie7.css #usr/share/transmission/web/stylesheets/iphone.css +etc/rc.d/init.d/transmission diff --git a/lfs/transmission b/lfs/transmission index 7ce4b83..b4ba4c4 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 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 # @@ -85,5 +85,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /etc/transmission cp -vf $(DIR_SRC)/config/transmission/* /etc/transmission/ chown -Rv nobody.nobody /etc/transmission + + # Install backup include + install -v -m 644 $(DIR_SRC)/config/backup/includes/transmission \ + /var/ipfire/backup/addons/includes/transmission + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 9d7581b..161319d 100755 --- a/make.sh +++ b/make.sh @@ -71,14 +71,6 @@ mkdir $BASEDIR/log/ 2>/dev/null
if [ -f .config ]; then . .config -else - echo -e "${BOLD}No configuration found!${NORMAL}" - echo -ne "Do you want to create one (y/N)?" - read CREATE_CONFIG - echo "" - if [ "$CREATE_CONFIG" == "y" ]; then - make_config - fi fi
if [ -z $EDITOR ]; then @@ -732,9 +724,9 @@ buildipfire() { cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine if [ "$GIT_BRANCH" = "next" ]; then - echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release + echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release else - echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release + echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release fi }
hooks/post-receive -- IPFire 2.x development tree