perl: Fix build in toolchain stage

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

diff --git a/make.sh b/make.sh
index d2ce7d4d3faebdcc666fd6e5f6f63b04fffd2213..f371a36a5159843b7e169a2e3c3393a6eddd2215 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"                                                 # Version number
-CORE="145"                                                     # Core Level (Filename)
+CORE="149"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level
@@ -39,7 +39,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"                       # Git Branch
 GIT_TAG="$(git tag | tail -1)"                                 # Git Tag
 GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)"                        # Last commit
 
-TOOLCHAINVER=20200324
+TOOLCHAINVER=20200814
 
 ###############################################################################
 #
@@ -146,21 +146,21 @@ configure_build() {
                        BUILDTARGET="${build_arch}-unknown-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="x86"
-                       CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic"
+                       CFLAGS_ARCH="-m64 -mtune=generic -fstack-clash-protection -fcf-protection"
                        ;;
 
                i586)
                        BUILDTARGET="${build_arch}-pc-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="x86"
-                       CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer"
+                       CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer -fcf-protection"
                        ;;
 
                aarch64)
                        BUILDTARGET="${build_arch}-unknown-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="arm"
-                       CFLAGS_ARCH=""
+                       CFLAGS_ARCH="-fstack-clash-protection"
                        ;;
 
                armv7hl)
@@ -804,7 +804,7 @@ qemu_is_required() {
        fi
 
        case "${HOST_ARCH},${build_arch}" in
-               x86_64,arm*|i?86,arm*|i?86,x86_64)
+               x86_64,arm*|x86_64,aarch64|i?86,arm*|i?86,aarch64|i?86,x86_64)
                        return 0
                        ;;
                *)
@@ -862,6 +862,9 @@ qemu_find_build_helper_name() {
 
        local magic
        case "${build_arch}" in
+               aarch64)
+                       magic="7f454c460201010000000000000000000200b700"
+                       ;;
                arm*)
                        magic="7f454c4601010100000000000000000002002800"
                        ;;
@@ -1188,15 +1191,6 @@ buildipfire() {
                lfsmake2 linux-initrd                   KCFG=""
                ;;
        i586)
-               # x86-pae (Native and new XEN) kernel build
-               lfsmake2 linux                  KCFG="-pae"
-#              lfsmake2 backports                      KCFG="-pae"
-#              lfsmake2 e1000e                 KCFG="-pae"
-#              lfsmake2 igb                            KCFG="-pae"
-#              lfsmake2 ixgbe                  KCFG="-pae"
-               lfsmake2 xtables-addons         KCFG="-pae"
-               lfsmake2 linux-initrd                   KCFG="-pae"
-
                # x86 kernel build
                lfsmake2 linux                  KCFG=""
 #              lfsmake2 backports                      KCFG=""
@@ -1306,6 +1300,7 @@ buildipfire() {
   lfsmake2 sdparm
   lfsmake2 mtools
   lfsmake2 whatmask
+  lfsmake2 libtirpc
   lfsmake2 conntrack-tools
   lfsmake2 libupnp
   lfsmake2 ipaddr
@@ -1439,9 +1434,10 @@ buildipfire() {
   lfsmake2 libmpeg2
   lfsmake2 gnump3d
   lfsmake2 rsync
-  lfsmake2 libtirpc
   lfsmake2 rpcbind
   lfsmake2 keyutils
+  lfsmake2 rpcsvc-proto
+  lfsmake2 libnfsidmap
   lfsmake2 nfs
   lfsmake2 gnu-netcat
   lfsmake2 ncat
@@ -1697,9 +1693,6 @@ buildpackages() {
 
   ipfirepackages
 
-  lfsmake2 xen-image
-  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
-
   cd $BASEDIR
 
   # remove not useable iso on armv5tel (needed to build flash images)