* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e0c923f424c0d4a8a8a873ee3f84a065ecce58f7
@ 2015-04-25 11:24 git
0 siblings, 0 replies; only message in thread
From: git @ 2015-04-25 11:24 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7204 bytes --]
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 e0c923f424c0d4a8a8a873ee3f84a065ecce58f7 (commit)
via 7f16c6664788ef9616c16a4b87ba98893c46fedb (commit)
from 0594323b79a4bf8ba390a4cd9a2c6833983174ac (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 e0c923f424c0d4a8a8a873ee3f84a065ecce58f7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 25 13:23:34 2015 +0200
Add rootfile check for hardcoded machine type.
commit 7f16c6664788ef9616c16a4b87ba98893c46fedb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 25 09:49:37 2015 +0200
libsrtp: update rootfile.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/libsrtp | 1 +
make.sh | 2 +-
tools/{checkwronginitlinks => checkrootfiles} | 16 +++++++++++++++-
3 files changed, 17 insertions(+), 2 deletions(-)
rename tools/{checkwronginitlinks => checkrootfiles} (76%)
Difference in files:
diff --git a/config/rootfiles/packages/libsrtp b/config/rootfiles/packages/libsrtp
index 105f3f0..3ee2e3b 100644
--- a/config/rootfiles/packages/libsrtp
+++ b/config/rootfiles/packages/libsrtp
@@ -37,4 +37,5 @@
#usr/include/srtp/ut_sim.h
#usr/include/srtp/xfm.h
usr/lib/libsrtp.so
+usr/lib/libsrtp.so.1
#usr/lib/pkgconfig/libsrtp.pc
diff --git a/make.sh b/make.sh
index db40b56..26f9d42 100755
--- a/make.sh
+++ b/make.sh
@@ -978,7 +978,7 @@ build)
cd $BASEDIR
tools/checknewlog.pl
- tools/checkwronginitlinks
+ tools/checkrootfiles
cd $PWD
beautify build_end
diff --git a/tools/checkrootfiles b/tools/checkrootfiles
new file mode 100755
index 0000000..74fab3e
--- /dev/null
+++ b/tools/checkrootfiles
@@ -0,0 +1,48 @@
+#!/bin/bash
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2015 IPFire Team info(a)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
+
+grep -r "^var/run//*" ./config/rootfiles/ >/dev/null 2>&1
+if [ "${?}" == "0" ]; then
+ echo "Error! 'var/run/...' in rootfiles files found!"
+ grep -r "^var/run//*" ./config/rootfiles/
+ echo "Comment this and create it at initskript if needed !"
+fi
+
+grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1
+if [ "${?}" == "0" ]; then
+ echo "Error! '/i586' in rootfiles files found!"
+ grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore
+ echo "Replace by MACHINE !"
+fi
+
+grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1
+if [ "${?}" == "0" ]; then
+ echo "Error! '/armv5tel' in rootfiles files found!"
+ grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore
+ echo "Replace by MACHINE !"
+fi
diff --git a/tools/checkwronginitlinks b/tools/checkwronginitlinks
deleted file mode 100755
index 65fc946..0000000
--- a/tools/checkwronginitlinks
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team info(a)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
-
-grep -r "^var/run//*" ./config/rootfiles/ >/dev/null 2>&1
-if [ "${?}" == "0" ]; then
- echo "Error! 'var/run/...' in rootfiles files found!"
- grep -r "^var/run//*" ./config/rootfiles/
- echo "Comment this and create it at initskript if needed !"
-fi
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-25 11:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-25 11:24 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e0c923f424c0d4a8a8a873ee3f84a065ecce58f7 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox