X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=make.sh;h=5a5d0d630c632c58d3424ddd5fcf1c04ac55b635;hb=87bcb6cf73f1ec0f85c45d0d559ad7690b57db92;hp=c62e748d003ed5c1ca653f606a2429848ada1a62;hpb=6db78002695b1de848137b0b2813a95e13db79a0;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index c62e748d00..5a5d0d630c 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.11"							# Version number
+VERSION="2.13"							# Version number
 CORE="62"							# Core Level (Filename)
 PAKFIRE_CORE="61"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
@@ -42,7 +42,6 @@ TOOLCHAINVER=5
 BUILDMACHINE=$MACHINE
     if [ "$MACHINE" = "x86_64" ]; then
         BUILDMACHINE="i686";
-        linux32="linux32";
     fi
 
 
@@ -214,11 +213,6 @@ prepareenv() {
     mount --bind $BASEDIR/log    $BASEDIR/build/usr/src/log
     mount --bind $BASEDIR/src    $BASEDIR/build/usr/src/src
 
-    # This is a temporary hack!!!
-    if [ ! -f /tools/bin/hostname ]; then
-      cp -f /bin/hostname /tools/bin/hostname 2>/dev/null
-    fi
-
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
@@ -290,6 +284,7 @@ buildtoolchain() {
     lfsmake1 sed
     lfsmake1 tar
     lfsmake1 texinfo
+    lfsmake1 xz
     lfsmake1 fake-environ
     lfsmake1 cleanup-toolchain		PASS=2
     export PATH=$ORG_PATH
@@ -322,6 +317,9 @@ buildbase() {
     lfsmake2 libtool
     lfsmake2 perl
     lfsmake2 readline
+    lfsmake2 readline-compat
+    lfsmake2 pcre
+    lfsmake2 pcre-compat
     lfsmake2 autoconf
     lfsmake2 automake
     lfsmake2 bash
@@ -340,7 +338,6 @@ buildbase() {
     lfsmake2 iproute2
     lfsmake2 kbd
     lfsmake2 less
-    lfsmake2 libaal
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
@@ -356,6 +353,7 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 util-linux
     lfsmake2 vim
+    lfsmake2 xz
     lfsmake2 grub
 }
 
@@ -372,7 +370,6 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-  ipfiremake xz
   ipfiremake linux-firmware
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
@@ -384,7 +381,6 @@ buildipfire() {
     ipfiremake linux2			KCFG="-xen"
 #    ipfiremake v4l-dvb			KCFG="-xen"
 #    ipfiremake mISDN			KCFG="-xen"
-#    ipfiremake dahdi			KCFG="-xen" KMOD=1
     ipfiremake cryptodev		KCFG="-xen"
     ipfiremake compat-wireless		KCFG="-xen"
 #    ipfiremake r8169			KCFG="-xen"
@@ -399,7 +395,6 @@ buildipfire() {
 #    ipfiremake v4l-dvb			KCFG="-pae"
     ipfiremake alsa			KCFG="-pae" KMOD=1
 #    ipfiremake mISDN			KCFG="-pae"
-#    ipfiremake dahdi			KCFG="-pae" KMOD=1
     ipfiremake cryptodev		KCFG="-pae"
     ipfiremake compat-wireless		KCFG="-pae"
 #    ipfiremake r8169			KCFG="-pae"
@@ -414,7 +409,6 @@ buildipfire() {
 #    ipfiremake v4l-dvb			KCFG=""
     ipfiremake alsa			KCFG="" KMOD=1
 #    ipfiremake mISDN			KCFG=""
-#    ipfiremake dahdi			KCFG="" KMOD=1
     ipfiremake cryptodev		KCFG=""
     ipfiremake compat-wireless		KCFG=""
 #    ipfiremake r8169			KCFG=""
@@ -430,7 +424,6 @@ buildipfire() {
 #    ipfiremake v4l-dvb			KCFG="-rpi"
 #    ipfiremake kvm-kmod			KCFG="-rpi"
 #    ipfiremake mISDN			KCFG="-rpi"
-#    ipfiremake dahdi			KCFG="-rpi" KMOD=1
     ipfiremake cryptodev		KCFG="-rpi"
     ipfiremake compat-wireless		KCFG="-rpi"
 #    ipfiremake r8169			KCFG="-rpi"
@@ -444,7 +437,6 @@ buildipfire() {
 #    ipfiremake v4l-dvb			KCFG="-omap"
 #    ipfiremake kvm-kmod			KCFG="-omap"
 #    ipfiremake mISDN			KCFG="-omap"
-#    ipfiremake dahdi			KCFG="-omap" KMOD=1
     ipfiremake cryptodev		KCFG="-omap"
     ipfiremake compat-wireless		KCFG="-omap"
 #    ipfiremake r8169			KCFG="-omap"
@@ -459,7 +451,6 @@ buildipfire() {
 #    ipfiremake v4l-dvb			KCFG="-kirkwood"
 #    ipfiremake kvm-kmod			KCFG="-kirkwood"
 #    ipfiremake mISDN			KCFG="-kirkwood"
-#    ipfiremake dahdi			KCFG="-kirkwood" KMOD=1
     ipfiremake cryptodev		KCFG="-kirkwood"
     ipfiremake compat-wireless		KCFG="-kirkwood"
 #    ipfiremake r8169			KCFG="-kirkwood"
@@ -468,6 +459,7 @@ buildipfire() {
 #    ipfiremake e1000			KCFG="-kirkwood"
 #    ipfiremake e1000e			KCFG="-kirkwood"
 #    ipfiremake igb			KCFG="-kirkwood"
+
   fi
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -486,6 +478,7 @@ buildipfire() {
   ipfiremake libnl
   ipfiremake libidn
   ipfiremake libjpeg
+  ipfiremake libexif
   ipfiremake libpng
   ipfiremake libtiff
   ipfiremake libart
@@ -535,7 +528,6 @@ buildipfire() {
   ipfiremake iptables
   ipfiremake libupnp
   ipfiremake ipaddr
-  ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
   ipfiremake mISDNuser
@@ -577,12 +569,19 @@ buildipfire() {
   ipfiremake python-mechanize
   ipfiremake python-feedparser
   ipfiremake python-rssdler
+  ipfiremake libffi
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
   ipfiremake noip_updater
   ipfiremake ntp
   ipfiremake openssh
+  ipfiremake fontconfig
+  ipfiremake dejavu-fonts-ttf
+  ipfiremake freefont
+  ipfiremake pixman
+  ipfiremake cairo
+  ipfiremake pango
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
@@ -614,7 +613,7 @@ buildipfire() {
   ipfiremake screen
   ipfiremake smartmontools
   ipfiremake htop
-#  ipfiremake postfix               # unknown system type linux 3.2.x
+  ipfiremake postfix
   ipfiremake fetchmail
   ipfiremake cyrus-imapd
   ipfiremake openmailadmin
@@ -629,6 +628,7 @@ buildipfire() {
   ipfiremake libogg
   ipfiremake libvorbis
   ipfiremake libdvbpsi
+  ipfiremake flac
   ipfiremake lame
   ipfiremake sox
   ipfiremake libshout
@@ -637,7 +637,6 @@ buildipfire() {
   ipfiremake cmake
   ipfiremake gnump3d
   ipfiremake libsigc++
-  ipfiremake applejuice
   ipfiremake libtorrent
   ipfiremake rtorrent
   ipfiremake ipfireseeder
@@ -656,7 +655,6 @@ buildipfire() {
   ipfiremake vsftpd
   ipfiremake strongswan
   ipfiremake lsof
-  ipfiremake centerim
   ipfiremake br2684ctl
   ipfiremake pcmciautils
   ipfiremake lm_sensors
@@ -675,8 +673,6 @@ buildipfire() {
   ipfiremake nagios
   ipfiremake nagios_nrpe
   ipfiremake ebtables
-  ipfiremake fontconfig
-  ipfiremake freefont
   ipfiremake directfb
   ipfiremake dfb++
   ipfiremake faad2
@@ -709,7 +705,6 @@ buildipfire() {
   ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
-  ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
   ipfiremake taglib
@@ -731,9 +726,8 @@ buildipfire() {
   ipfiremake nut
   ipfiremake watchdog
   ipfiremake libpri
-#  ipfiremake dahdi               # update needed for 3.2.x
-#  ipfiremake asterisk
-#  ipfiremake lcr
+  ipfiremake asterisk
+  ipfiremake lcr
   ipfiremake usb_modeswitch
   ipfiremake usb_modeswitch_data
   ipfiremake zerofree
@@ -743,7 +737,7 @@ buildipfire() {
   ipfiremake minicom
   ipfiremake ddrescue
   ipfiremake imspector
-#  ipfiremake miniupnpd              # will not build
+  ipfiremake miniupnpd
   ipfiremake client175
   ipfiremake powertop
   ipfiremake parted
@@ -763,6 +757,8 @@ buildipfire() {
   ipfiremake lcd4linux
   ipfiremake mtr
   ipfiremake tcpick
+  ipfiremake minidlna
+  ipfiremake acpid
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -1028,7 +1024,7 @@ toolchain)
 	echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $MACHINE" | tee -a $LOGFILE
 	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-$MACHINE.tar.gz \
-		build/tools log >> $LOGFILE
+		build/tools build/bin/sh log >> $LOGFILE
 	md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
 		> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.md5
 	stdumount