Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen

[people/teissler/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 4eb0ed2e1c3df0d4d634850fa941bc2b29af7df0..f2dfbab3ad45731e2cc88d3c122946d22513f34f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -284,6 +284,7 @@ buildtoolchain() {
     lfsmake1 sed
     lfsmake1 tar
     lfsmake1 texinfo
+    lfsmake1 xz
     lfsmake1 fake-environ
     lfsmake1 cleanup-toolchain         PASS=2
     export PATH=$ORG_PATH
@@ -316,6 +317,9 @@ buildbase() {
     lfsmake2 libtool
     lfsmake2 perl
     lfsmake2 readline
+    lfsmake2 readline-compat
+    lfsmake2 pcre
+    lfsmake2 pcre-compat
     lfsmake2 autoconf
     lfsmake2 automake
     lfsmake2 bash
@@ -349,6 +353,7 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 util-linux
     lfsmake2 vim
+    lfsmake2 xz
     lfsmake2 grub
 }
 
@@ -365,7 +370,6 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-  ipfiremake xz
   ipfiremake linux-firmware
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
@@ -377,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"
@@ -392,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"
@@ -407,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=""
@@ -423,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"
@@ -437,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"
@@ -452,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"
@@ -461,6 +459,7 @@ buildipfire() {
 #    ipfiremake e1000                  KCFG="-kirkwood"
 #    ipfiremake e1000e                 KCFG="-kirkwood"
 #    ipfiremake igb                    KCFG="-kirkwood"
+
   fi
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -479,6 +478,7 @@ buildipfire() {
   ipfiremake libnl
   ipfiremake libidn
   ipfiremake libjpeg
+  ipfiremake libexif
   ipfiremake libpng
   ipfiremake libtiff
   ipfiremake libart
@@ -569,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
@@ -606,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
@@ -621,6 +628,7 @@ buildipfire() {
   ipfiremake libogg
   ipfiremake libvorbis
   ipfiremake libdvbpsi
+  ipfiremake flac
   ipfiremake lame
   ipfiremake sox
   ipfiremake libshout
@@ -665,8 +673,6 @@ buildipfire() {
   ipfiremake nagios
   ipfiremake nagios_nrpe
   ipfiremake ebtables
-  ipfiremake fontconfig
-  ipfiremake freefont
   ipfiremake directfb
   ipfiremake dfb++
   ipfiremake faad2
@@ -699,7 +705,6 @@ buildipfire() {
   ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
-  ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
   ipfiremake taglib
@@ -721,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
@@ -733,7 +737,7 @@ buildipfire() {
   ipfiremake minicom
   ipfiremake ddrescue
   ipfiremake imspector
-#  ipfiremake miniupnpd              # will not build
+  ipfiremake miniupnpd
   ipfiremake client175
   ipfiremake powertop
   ipfiremake parted
@@ -753,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