############################################################################
#
-NAME="IPFire" # Software name
-SNAME="ipfire" # Short name
-VERSION="2.5"
-CORE="30"
-GIT_BRANCH=master:master # Version number
-SLOGAN="www.ipfire.org" # Software slogan
-CONFIG_ROOT=/var/ipfire # Configuration rootdir
-NICE=10 # Nice level
-MAX_RETRIES=1 # prefetch/check loop
+NAME="IPFire" # Software name
+SNAME="ipfire" # Short name
+VERSION="2.5" # Version number
+CORE="35" # Core Level (Filename)
+PAKFIRE_CORE="34" # 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
+NICE=10 # Nice level
+MAX_RETRIES=1 # prefetch/check loop
KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
MACHINE=`uname -m`
-GIT_TAG=$(git tag | tail -1)
+GIT_TAG=$(git tag | tail -1) # Git Tag
+GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
TOOLCHAINVER=1
IPFVER="full" # Which versions should be compiled? (full|devel)
ipfiremake pptp
ipfiremake unzip
ipfiremake which
- #ipfiremake linux XEN=1
- #ipfiremake atl2 XEN=1
- #ipfiremake hso XEN=1
- #ipfiremake e1000e XEN=1
- #ipfiremake kqemu XEN=1
- #ipfiremake v4l-dvb XEN=1
- #ipfiremake madwifi XEN=1
-# ipfiremake alsa XEN=1 KMOD=1
- #ipfiremake openswan XEN=1 KMOD=1
- #ipfiremake mISDN XEN=1
- #ipfiremake compat-wireless XEN=1
+ ipfiremake linux XEN=1
+ ipfiremake atl1c XEN=1
+ ipfiremake atl2 XEN=1
+ ipfiremake hso XEN=1
+ ipfiremake e1000e 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 linux
+ ipfiremake atl1c
ipfiremake atl2
ipfiremake hso
ipfiremake e1000e
+ ipfiremake r8101
+ ipfiremake r8169
+ ipfiremake r8168
ipfiremake kqemu
+ 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 xvid
ipfiremake libmpeg2
ipfiremake cmake
- ipfiremake libpri
- ipfiremake asterisk
ipfiremake gnump3d
ipfiremake libsigc++
ipfiremake applejuice
ipfiremake icecast
ipfiremake icegenerator
ipfiremake mpd
+ ipfiremake libmpdclient
ipfiremake mpc
ipfiremake git
ipfiremake squidclamav
ipfiremake sshfs
ipfiremake sqlite
ipfiremake taglib
-# ipfiremake mediatomb
+ ipfiremake mediatomb
ipfiremake sslh
ipfiremake perl-gettext
ipfiremake vdradmin
# ipfiremake x11libs
# ipfiremake xen
ipfiremake miau
- ipfiremake net-snmp
+ ipfiremake netsnmpd
ipfiremake perl-DBI
ipfiremake perl-DBD-mysql
- ipfiremake lcr
ipfiremake cacti
ipfiremake icecc
ipfiremake open-vm-tools
ipfiremake nagiosql
ipfiremake iftop
ipfiremake motion
+ ipfiremake joe
+ ipfiremake nut
+ ipfiremake watchdog
+ ipfiremake libpri
+ ipfiremake dahdi
+ ipfiremake asterisk
+ ipfiremake lcr
+ ipfiremake usb_modeswitch
+ ipfiremake zerofree
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
git status >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
- echo $CORE > $BASEDIR/build/opt/pakfire/db/core/mine
- echo $NAME $VERSION - Core$CORE > $BASEDIR/build/etc/system-release
+ echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
+ if [ "$GIT_BRANCH" = "master" ]; then
+ echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
+ else
+ echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+ fi
}
buildinstaller() {
# Check if there is a loop device for building in virtual environments
if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
+ cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
ipfiremake xen-image ED=$IPFVER
rm -rf $LFS/install/packages/linux-xen-*.ipfire
+ rm -rf $LFS/install/packages/meta-linux-xen
fi
mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
buildtoolchain
BUILDMACHINE=`uname -m`
echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
- test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains
+ test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
build/{bin,etc,usr/bin,usr/local} \
build/tools/{bin,etc,*-linux-gnu,include,lib,libexec,sbin,share,var} \
PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then
URL_TOOLCHAIN=`grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }'`
- test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains
+ test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
cd $BASEDIR/cache/toolchains
wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
[ -z $GIT_USER ] && exiterror "You have to setup GIT_USER first."
GIT_URL="ssh://${GIT_USER}@git.ipfire.org/pub/git/ipfire-2.x"
- git push ${GIT_URL} ${GIT_BRANCH} $3
+ git push ${GIT_URL} $3
;;
log)
[ -z $GIT_TAG ] || LAST_TAG=$GIT_TAG
projects / people / pmueller / ipfire-2.x.git / blobdiff