Merge remote-tracking branch 'origin/next' into glibc-update2

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

diff --git a/make.sh b/make.sh
index 3536aba6bc6bb45d841dd2a3d95b9d002d33be15..450ee003b463d79ef0a3d946a4b17d4d30cea0fe 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
@@ -374,12 +378,12 @@ 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"
@@ -479,6 +483,7 @@ buildipfire() {
   ipfiremake libnl
   ipfiremake libidn
   ipfiremake libjpeg
+  ipfiremake libexif
   ipfiremake libpng
   ipfiremake libtiff
   ipfiremake libart
@@ -621,6 +626,7 @@ buildipfire() {
   ipfiremake libogg
   ipfiremake libvorbis
   ipfiremake libdvbpsi
+  ipfiremake flac
   ipfiremake lame
   ipfiremake sox
   ipfiremake libshout
@@ -752,6 +758,7 @@ buildipfire() {
   ipfiremake lcd4linux
   ipfiremake mtr
   ipfiremake tcpick
+  ipfiremake minidlna
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild