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 db3602a9e4cf376b3234028f6bdf7accef2ce98f..f2dfbab3ad45731e2cc88d3c122946d22513f34f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -378,12 +378,11 @@ buildipfire() {
 
   # The xen and PAE kernels are only available for x86
   if [ "${MACHINE_TYPE}" != "arm" ]; then
-#    ipfiremake linux2                 KCFG="-xen"
+    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 cryptodev               KCFG="-xen"
+    ipfiremake compat-wireless         KCFG="-xen"
 #    ipfiremake r8169                  KCFG="-xen"
 #    ipfiremake r8168                  KCFG="-xen"
 #    ipfiremake r8101                  KCFG="-xen"
@@ -396,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"
@@ -411,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=""
@@ -427,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"
@@ -441,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"
@@ -456,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"
@@ -465,6 +459,7 @@ buildipfire() {
 #    ipfiremake e1000                  KCFG="-kirkwood"
 #    ipfiremake e1000e                 KCFG="-kirkwood"
 #    ipfiremake igb                    KCFG="-kirkwood"
+
   fi
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -581,6 +576,12 @@ buildipfire() {
   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
@@ -672,8 +673,6 @@ buildipfire() {
   ipfiremake nagios
   ipfiremake nagios_nrpe
   ipfiremake ebtables
-  ipfiremake fontconfig
-  ipfiremake freefont
   ipfiremake directfb
   ipfiremake dfb++
   ipfiremake faad2
@@ -727,7 +726,6 @@ buildipfire() {
   ipfiremake nut
   ipfiremake watchdog
   ipfiremake libpri
-  ipfiremake dahdi
   ipfiremake asterisk
   ipfiremake lcr
   ipfiremake usb_modeswitch