make.sh: Build lua before haproxy.

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

diff --git a/make.sh b/make.sh
index cf2e4387420641c29502f8d43bf307b6ce154ab2..c0137ecc07d15b2b3d5889999e5cf73d0e73a954 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,20 +25,22 @@
 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.23"                                                 # Version number
-CORE="136"                                                     # Core Level (Filename)
-PAKFIRE_CORE="135"                                             # Core Level (PAKFIRE)
-GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
+VERSION="2.25"                                                 # Version number
+CORE="142"                                                     # Core Level (Filename)
+PAKFIRE_CORE="141"                                             # Core Level (PAKFIRE)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level
 MAX_RETRIES=1                                                  # prefetch/check loop
 BUILD_IMAGES=1                                                 # Flash and Xen Downloader
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
-GIT_TAG=$(git tag | tail -1)                                   # Git Tag
-GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
 
-TOOLCHAINVER=20190814
+# Information from Git
+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=20200108
 
 ###############################################################################
 #
@@ -174,6 +176,7 @@ configure_build() {
                        CROSSTARGET="${build_arch}-cross-linux-gnueabi"
                        BUILD_PLATFORM="arm"
                        CFLAGS_ARCH="-march=armv5te -mfloat-abi=soft -fomit-frame-pointer"
+                       RUSTFLAGS="-Ccodegen-units=1"
                        ;;
 
                *)
@@ -462,7 +465,7 @@ prepareenv() {
        # Setup environment
        set +h
        LC_ALL=POSIX
-       export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM
+       export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS
        unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
        # Make some extra directories
@@ -473,7 +476,7 @@ prepareenv() {
 
        if [ "${ENABLE_RAMDISK}" = "on" ]; then
                mkdir -p $BASEDIR/build/usr/src
-               mount -t tmpfs tmpfs -o size=4G,mode=1777 $BASEDIR/build/usr/src
+               mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src
        fi
 
        mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache}
@@ -506,19 +509,36 @@ prepareenv() {
        rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
 
        # Prepare string for /etc/system-release.
-       SYSTEM_RELEASE="${NAME} ${VERSION} (${BUILD_ARCH})"
-       if [ "$(git status -s | wc -l)" == "0" ]; then
-       GIT_STATUS=""
-       else
-       GIT_STATUS="-dirty"
+       local system_release="${NAME} ${VERSION} (${BUILD_ARCH})"
+
+       case "${GIT_BRANCH}" in
+               core*|beta?|rc?)
+                       system_release="${system_release} - ${GIT_BRANCH}"
+                       ;;
+               *)
+                       system_release="${system_release} - Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
+                       ;;
+       esac
+
+       # Append -dirty tag for local changes
+       if [ "$(git status -s | wc -l)" != "0" ]; then
+               system_release="${system_release}-dirty"
        fi
-       case "$GIT_BRANCH" in
-       core*|beta?|rc?)
-               SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
-               ;;
-       *)
-               SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
-               ;;
+
+       # Export variable
+       SYSTEM_RELEASE="${system_release}"
+
+       # Decide on PAKFIRE_TREE
+       case "${GIT_BRANCH}" in
+               core*)
+                       PAKFIRE_TREE="stable"
+                       ;;
+               master)
+                       PAKFIRE_TREE="testing"
+                       ;;
+               *)
+                       PAKFIRE_TREE="unstable"
+                       ;;
        esac
 
        # Setup ccache cache size
@@ -538,6 +558,7 @@ enterchroot() {
                PATH="${PATH}" \
                SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
                PAKFIRE_CORE="${PAKFIRE_CORE}" \
+               PAKFIRE_TREE="${PAKFIRE_TREE}" \
                NAME="${NAME}" \
                SNAME="${SNAME}" \
                VERSION="${VERSION}" \
@@ -547,6 +568,7 @@ enterchroot() {
                CONFIG_ROOT="${CONFIG_ROOT}" \
                CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
                CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
+               RUSTFLAGS="${RUSTFLAGS}" \
                BUILDTARGET="${BUILDTARGET}" \
                CROSSTARGET="${CROSSTARGET}" \
                BUILD_ARCH="${BUILD_ARCH}" \
@@ -554,6 +576,7 @@ enterchroot() {
                CCACHE_DIR=/usr/src/ccache \
                CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
                CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
+               GOCACHE="/usr/src/ccache/go" \
                KVER="${KVER}" \
                XZ_OPT="${XZ_OPT}" \
                DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \
@@ -894,9 +917,14 @@ update_contributors() {
        local contributors="$(contributors | paste -sd , - | sed -e "s/,/&\\\\n/g")"
 
        # Edit contributors into credits.cgi
-       awk -i inplace \
-               "/<!-- CONTRIBUTORS -->/{ p=1; print; printf \"${contributors}\n\"}/<!-- END -->/{ p=0 } !p" \
-               "${BASEDIR}/html/cgi-bin/credits.cgi"
+       local tmp="$(mktemp)"
+
+       awk "/<!-- CONTRIBUTORS -->/{ p=1; print; printf \"${contributors}\n\"}/<!-- END -->/{ p=0 } !p" \
+               < "${BASEDIR}/html/cgi-bin/credits.cgi" > "${tmp}"
+
+       # Copy back modified content
+       cat "${tmp}" > "${BASEDIR}/html/cgi-bin/credits.cgi"
+       unlink "${tmp}"
 
        print_status DONE
        return 0
@@ -1132,9 +1160,6 @@ buildipfire() {
   lfsmake2 lvm2
   lfsmake2 multipath-tools
   lfsmake2 freetype
-  lfsmake2 grub
-  lfsmake2 efivar
-  lfsmake2 efibootmgr
   lfsmake2 libmnl
   lfsmake2 libnfnetlink
   lfsmake2 libnetfilter_queue
@@ -1176,15 +1201,6 @@ buildipfire() {
                ;;
 
        armv5tel)
-               # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
-               lfsmake2 linux                  KCFG="-kirkwood"
-#              lfsmake2 backports                      KCFG="-kirkwood"
-#              lfsmake2 e1000e                 KCFG="-kirkwood"
-#              lfsmake2 igb                            KCFG="-kirkwood"
-#              lfsmake2 ixgbe                  KCFG="-kirkwood"
-               lfsmake2 xtables-addons         KCFG="-kirkwood"
-               lfsmake2 linux-initrd                   KCFG="-kirkwood"
-
                # arm multi platform (Panda, Wandboard ...) kernel build
                lfsmake2 linux                  KCFG="-multi"
 #              lfsmake2 backports                      KCFG="-multi"
@@ -1222,6 +1238,9 @@ buildipfire() {
   lfsmake2 libffi
   lfsmake2 python
   lfsmake2 python3
+  lfsmake2 grub
+  lfsmake2 efivar
+  lfsmake2 efibootmgr
   lfsmake2 ca-certificates
   lfsmake2 fireinfo
   lfsmake2 libnet
@@ -1259,6 +1278,7 @@ buildipfire() {
   lfsmake2 beep
   lfsmake2 libarchive
   lfsmake2 cmake
+  lfsmake2 libssh
   lfsmake2 cdrkit
   lfsmake2 dosfstools
   lfsmake2 reiserfsprogs
@@ -1330,6 +1350,7 @@ buildipfire() {
   lfsmake2 python-ipaddress
   lfsmake2 glib
   lfsmake2 GeoIP
+  lfsmake2 geoip-database
   lfsmake2 ntp
   lfsmake2 openssh
   lfsmake2 fontconfig
@@ -1343,6 +1364,7 @@ buildipfire() {
   lfsmake2 setserial
   lfsmake2 setup
   lfsmake2 libdnet
+  lfsmake2 rust
   lfsmake2 jansson
   lfsmake2 yaml
   lfsmake2 libhtp
@@ -1596,9 +1618,9 @@ buildipfire() {
   lfsmake2 pigz
   lfsmake2 tmux
   lfsmake2 perl-Text-CSV_XS
+  lfsmake2 lua
   lfsmake2 haproxy
   lfsmake2 ipset
-  lfsmake2 lua
   lfsmake2 dnsdist
   lfsmake2 bird
   lfsmake2 frr
@@ -1628,6 +1650,9 @@ buildipfire() {
   lfsmake2 firmware-update
   lfsmake2 tshark
   lfsmake2 geoip-generator
+  lfsmake2 speedtest-cli
+  lfsmake2 rfkill
+  lfsmake2 amazon-ssm-agent
 }
 
 buildinstaller() {