webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Conflicts:
	config/rootfiles/core/37/filelists/files
	config/rootfiles/packages/gutenprint
	doc/packages-list.txt
	src/pakfire/lib/functions.sh
This commit is contained in:
Arne Fitzenreiter
2010-04-03 00:19:44 +02:00
parent 4e7418a998 5487c71bbe
commit 0a8db55873
158 changed files with 14436 additions and 4216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
make.sh
View File

@@ -24,8 +24,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.5" # Version number
CORE="37" # Core Level (Filename)
VERSION="2.6" # Version number
CORE="38" # Core Level (Filename)
PAKFIRE_CORE="37" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
@@ -36,7 +36,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
MACHINE=`uname -m`
GIT_TAG=$(git tag | tail -1) # Git Tag
GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
TOOLCHAINVER=1
TOOLCHAINVER=2
IPFVER="full" # Which versions should be compiled? (full|devel)
# Debian specific settings
@@ -340,42 +340,30 @@ buildipfire() {
ipfiremake pptp
ipfiremake unzip
ipfiremake which
ipfiremake xz
ipfiremake linux-firmware
ipfiremake linux XEN=1
ipfiremake atl1c XEN=1
ipfiremake atl2 XEN=1
ipfiremake hso XEN=1
ipfiremake e1000e XEN=1
ipfiremake et131x XEN=1
ipfiremake r8101 XEN=1
ipfiremake r8169 XEN=1
ipfiremake r8168 XEN=1
ipfiremake kqemu XEN=1
#ipfiremake kvm-kmod XEN=1
ipfiremake v4l-dvb XEN=1
ipfiremake madwifi XEN=1
#ipfiremake alsa XEN=1 KMOD=1
ipfiremake dahdi XEN=1 KMOD=1
ipfiremake openswan XEN=1 KMOD=1
ipfiremake mISDN XEN=1
ipfiremake compat-wireless XEN=1
# ipfiremake openswan XEN=1 KMOD=1
#ipfiremake mISDN XEN=1
#ipfiremake compat-wireless XEN=1
ipfiremake cryptodev XEN=1
ipfiremake linux
ipfiremake atl1c
ipfiremake atl2
ipfiremake hso
ipfiremake e1000e
ipfiremake et131x
ipfiremake r8101
ipfiremake r8169
ipfiremake r8168
ipfiremake kqemu
ipfiremake kvm-kmod
#ipfiremake kvm-kmod
ipfiremake v4l-dvb
ipfiremake madwifi
ipfiremake alsa KMOD=1
ipfiremake dahdi KMOD=1
ipfiremake openswan KMOD=1
ipfiremake mISDN
ipfiremake compat-wireless
# ipfiremake openswan KMOD=1
#ipfiremake mISDN
#ipfiremake compat-wireless
ipfiremake cryptodev
ipfiremake pkg-config
ipfiremake linux-atm
ipfiremake cpio
@@ -559,12 +547,14 @@ buildipfire() {
ipfiremake tripwire
ipfiremake sysstat
ipfiremake vsftpd
ipfiremake openswan
# ipfiremake openswan
ipfiremake strongswan
ipfiremake lsof
ipfiremake centerim
ipfiremake br2684ctl
ipfiremake pcmciautils
ipfiremake lm_sensors
ipfiremake liboping
ipfiremake collectd
ipfiremake lcd4linux
ipfiremake tcptrack
@@ -658,7 +648,7 @@ buildipfire() {
echo >> $BASEDIR/build/var/ipfire/firebuild
cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
if [ "$GIT_BRANCH" = "master" ]; then
if [ "$GIT_BRANCH" = "next" ]; then
echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
else
echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release