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 dd8565044ba6f486ef6b1080cf8c78a649a5fb01 (commit) via 39e56fae7439814974ef9c4801601e5bbf962a8f (commit) from b843030f09722737b08cbfdd3371e2bd26923d6f (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 dd8565044ba6f486ef6b1080cf8c78a649a5fb01 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 21 23:20:05 2013 +0200
buildsystem: remove linux-xen from logs to check.
This log was always listed because parsing problems.
commit 39e56fae7439814974ef9c4801601e5bbf962a8f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 21 23:17:46 2013 +0200
buildsystem: add a check for wrong "etc/init.d/..." entries.
This will destroy the symlink from /etc/init.d to /etc/rc.d/init.d at unpack.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/oldcore/27/filelists/files | 4 ++-- make.sh | 1 + tools/checknewlog.pl | 2 +- .../libsmooth/makelangs.pl => tools/checkwronginitlinks | 16 ++++++++-------- 4 files changed, 12 insertions(+), 11 deletions(-) copy src/install+setup/libsmooth/makelangs.pl => tools/checkwronginitlinks (82%) mode change 100644 => 100755
Difference in files: diff --git a/config/rootfiles/oldcore/27/filelists/files b/config/rootfiles/oldcore/27/filelists/files index 12dcde1..3b65c4f 100644 --- a/config/rootfiles/oldcore/27/filelists/files +++ b/config/rootfiles/oldcore/27/filelists/files @@ -1,4 +1,4 @@ -etc/init.d/squid +etc/rc.d/init.d/squid etc/sysctl.conf etc/squid/errors usr/bin/squidclient @@ -32,7 +32,7 @@ srv/web/ipfire/cgi-bin/updatexlrator.cgi var/ipfire/langs lib/modules/KVER-ipfire/kernel/drivers/net/imq.ko var/ipfire/qos/bin/makeqosscripts.pl -etc/init.d/network +etc/rc.d/init.d/network bin/ntfs-3g lib/libntfs-3g.so lib/libntfs-3g.so.49 diff --git a/make.sh b/make.sh index 6be04a3..f3c4a58 100755 --- a/make.sh +++ b/make.sh @@ -950,6 +950,7 @@ build)
cd $BASEDIR tools/checknewlog.pl + tools/checkwronginitlinks cd $PWD
beautify build_end diff --git a/tools/checknewlog.pl b/tools/checknewlog.pl index c007f5a..dd78a29 100755 --- a/tools/checknewlog.pl +++ b/tools/checknewlog.pl @@ -28,7 +28,7 @@ foreach(@FILES) { # print $_."\n"; my $Found = 0;
- if ( $_ =~ /$.log/ || $_ =~ /^.+/ || $_=~ /-install/ || $_=~ /-tools/ || $_=~ /-config/ || $_=~ /-kmod-/|| $_=~ /coreutils/ || $_=~ /esniper/ || $_=~ /libsigc/ || $_ eq 'FILES' ){ + if ( $_ =~ /$.log/ || $_ =~ /^.+/ || $_=~ /-install/ || $_=~ /-tools/ || $_=~ /-config/ || $_=~ /-kmod-/|| $_=~ /coreutils/ || $_=~ /linux-xen/ || $_=~ /libsigc/ || $_ eq 'FILES' ){ next; } elsif ( $_=~ /missing_rootfile/ ){ print "Rootfile for $_ missing!\n"; diff --git a/tools/checkwronginitlinks b/tools/checkwronginitlinks new file mode 100755 index 0000000..6f001c0 --- /dev/null +++ b/tools/checkwronginitlinks @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################### +# # +# 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/. # +# # +############################################################################### + +grep -r "^etc/init.d//*" ./config/rootfiles/ >/dev/null 2>&1 +if [ "${?}" == "0" ]; then + echo "Error! 'etc/init.d/...' in rootfiles files found!" + grep -r "^etc/init.d//*" ./config/rootfiles/ + echo "Change this to 'etc/rc.d/init.d/...' !" +fi
hooks/post-receive -- IPFire 2.x development tree