webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into thirteen

Browse Source 
Conflicts:
	config/rootfiles/common/stage2
	make.sh
This commit is contained in:
Arne Fitzenreiter
2012-12-06 19:29:29 +01:00
parent 2e732994a1 36e1dc20f4
commit d7a3254ace
44 changed files with 3641 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
make.sh
View File

@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.13" # Version number
CORE="64" # Core Level (Filename)
PAKFIRE_CORE="64" # Core Level (PAKFIRE)
CORE="65" # Core Level (Filename)
PAKFIRE_CORE="65" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
@@ -747,6 +747,9 @@ buildipfire() {
ipfiremake gpgme
ipfiremake pygpgme
ipfiremake pakfire3
ipfiremake stress
ipfiremake libstatgrab
ipfiremake sarg
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild