Merge remote-tracking branch 'ms/x86_64' into next

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

diff --git a/make.sh b/make.sh
index 14f3aedfea1b15dd552bf20f8f1e4905387360d0..235964b4b90e4a482d9b0dea5666cb0123a27e26 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.17"                                                 # Version number
-CORE="92"                                                      # Core Level (Filename)
-PAKFIRE_CORE="91"                                              # Core Level (PAKFIRE)
+CORE="94"                                                      # Core Level (Filename)
+PAKFIRE_CORE="93"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -245,6 +245,11 @@ prepareenv() {
 buildtoolchain() {
     local error=false
     case "${TARGET_ARCH}:${BUILD_ARCH}" in
+        # x86_64
+        x86_64:x86_64)
+             # This is working.
+             ;;
+
         # x86
         i586:i586|i586:i686|i586:x86_64)
             # These are working.
@@ -405,9 +410,24 @@ buildipfire() {
   ipfiremake freetype
   ipfiremake grub
   ipfiremake libmnl
+  ipfiremake libnfnetlink
+  ipfiremake libnetfilter_queue
+  ipfiremake libnetfilter_conntrack
+  ipfiremake libnetfilter_cthelper
+  ipfiremake libnetfilter_cttimeout
   ipfiremake iptables
 
   case "${TARGET_ARCH}" in
+       x86_64)
+               ipfiremake linux                        KCFG=""
+               ipfiremake backports                    KCFG=""
+               ipfiremake cryptodev                    KCFG=""
+               ipfiremake e1000e                       KCFG=""
+#              ipfiremake igb                          KCFG=""
+               ipfiremake ixgbe                        KCFG=""
+               ipfiremake xtables-addons               KCFG=""
+               ipfiremake linux-initrd                 KCFG=""
+               ;;
        i586)
                # x86-pae (Native and new XEN) kernel build
                ipfiremake linux                        KCFG="-pae"
@@ -476,7 +496,9 @@ buildipfire() {
   ipfiremake curl
   ipfiremake tcl
   ipfiremake sqlite
+  ipfiremake libffi
   ipfiremake python
+  ipfiremake ca-certificates
   ipfiremake fireinfo
   ipfiremake libnet
   ipfiremake libnl
@@ -579,7 +601,6 @@ buildipfire() {
   ipfiremake python-mechanize
   ipfiremake python-feedparser
   ipfiremake python-rssdler
-  ipfiremake libffi
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
@@ -627,6 +648,7 @@ buildipfire() {
   ipfiremake screen
   ipfiremake smartmontools
   ipfiremake htop
+  ipfiremake chkconfig
   ipfiremake postfix
   ipfiremake fetchmail
   ipfiremake cyrus-imapd
@@ -634,6 +656,7 @@ buildipfire() {
   ipfiremake clamav
   ipfiremake spamassassin
   ipfiremake amavisd
+  ipfiremake dma
   ipfiremake alsa
   ipfiremake mpfire
   ipfiremake guardian
@@ -648,6 +671,7 @@ buildipfire() {
   ipfiremake libshout
   ipfiremake xvid
   ipfiremake libmpeg2
+  ipfiremake libarchive
   ipfiremake cmake
   ipfiremake gnump3d
   ipfiremake rsync
@@ -705,6 +729,8 @@ buildipfire() {
   ipfiremake perl-Net-SMTP-SSL
   ipfiremake perl-MIME-Base64
   ipfiremake perl-Authen-SASL
+  ipfiremake perl-MIME-Lite
+  ipfiremake perl-Email-Date-Format
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake vnstat