make.sh: Build in ramdisk

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

diff --git a/make.sh b/make.sh
index 14f42a35bf1f77033f6ceaa4571d1a27fde415d4..fb529b669c42fd171b57db9cc9fd2c2b2508b619 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.21"                                                 # Version number
-CORE="123"                                                     # Core Level (Filename)
-PAKFIRE_CORE="122"                                             # Core Level (PAKFIRE)
+CORE="127"                                                     # Core Level (Filename)
+PAKFIRE_CORE="126"                                             # 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
@@ -37,7 +37,7 @@ 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=20180606
+TOOLCHAINVER=20181030
 
 ###############################################################################
 #
@@ -253,7 +253,10 @@ configure_build() {
 
 configure_build_guess() {
        case "${HOST_ARCH}" in
-               x86_64|i686|i586)
+               x86_64)
+                       echo "x86_64"
+                       ;;
+               i?86)
                        echo "i586"
                        ;;
 
@@ -287,6 +290,9 @@ stdumount() {
        umount $BASEDIR/build/usr/src/lfs               2>/dev/null;
        umount $BASEDIR/build/usr/src/log               2>/dev/null;
        umount $BASEDIR/build/usr/src/src               2>/dev/null;
+
+       # Umount ramdisk
+       ramdisk_save "${BASEDIR}/build"
 }
 
 now() {
@@ -420,6 +426,68 @@ exiterror() {
        exit 1
 }
 
+ramdisk_save() {
+       local path="${1}"
+
+       # Check if the ramdisk is actually mounted
+       if ! mountpoint "${path}" &>/dev/null; then
+               return 1
+       fi
+
+       # Remove the bind-mount
+       umount "${path}"
+
+       echo -n "Saving ramdisk (this might take a moment)..."
+
+       # Copy all data
+       mkdir -p "${path}.tmpfs"
+       if ! rsync -aHAXq --delete "${path}.tmpfs/" "${path}/"; then
+               print_status FAIL
+               return 1
+       fi
+
+       # Umount ramdisk
+       umount "${path}.tmpfs"
+       rm -rf "${path}.tmpfs"
+
+       print_status DONE
+}
+
+ramdisk_restore() {
+       local path="${1}"
+
+       # Don't do anything if ramdisk support isn't enabled
+       if [ "${USE_RAMDISK}" != "1" ]; then
+               return 1
+       fi
+
+       # Check for sufficient memory
+       # XXX TODO
+
+       echo -n "Restoring ramdisk (this might take a moment)..."
+
+       # Mount new ramdisk
+       mkdir -p "${path}.tmpfs"
+       if ! mount -t tmpfs none "${path}.tmpfs"; then
+               exiterror "Could not mount ramdisk"
+       fi
+
+       # Restore all data
+       if ! rsync -aHAXq --delete "${path}/" "${path}.tmpfs/"; then
+               umount "${path}.tmpfs"
+               rm -rf "${path}.tmpfs"
+
+               exiterror "Could not restore ramdisk"
+       fi
+
+       # Overlay the files on disk
+       # We would use "mount --move ..." but systemd is always
+       # mounting / as shared which doesn't allow moving anything
+       mount --bind "${path}.tmpfs" "${path}"
+
+       print_status DONE
+}
+
 prepareenv() {
        # Are we running the right shell?
        if [ -z "${BASH}" ]; then
@@ -469,6 +537,9 @@ prepareenv() {
        export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
        unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
+       # Mount ramdisk (if requested)
+       ramdisk_restore "${BASEDIR}/build"
+
        # Make some extra directories
        mkdir -p "${BASEDIR}/build${TOOLS_DIR}" 2>/dev/null
        mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null
@@ -1039,6 +1110,7 @@ buildbase() {
        lfsmake2 readline
        lfsmake2 readline-compat
        lfsmake2 bzip2
+       lfsmake2 xz
        lfsmake2 pcre
        lfsmake2 pcre-compat
        lfsmake2 bash
@@ -1073,8 +1145,6 @@ buildbase() {
        lfsmake2 util-linux
        lfsmake2 udev
        lfsmake2 vim
-       lfsmake2 xz
-       lfsmake2 paxctl
 }
 
 buildipfire() {
@@ -1083,6 +1153,10 @@ buildipfire() {
   lfsmake2 configroot
   lfsmake2 initscripts
   lfsmake2 backup
+  lfsmake2 openssl
+  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+  lfsmake2 openssl-compat
+  lfsmake2 popt
   lfsmake2 libusb
   lfsmake2 libusb-compat
   lfsmake2 libpcap
@@ -1100,10 +1174,13 @@ buildipfire() {
   lfsmake2 cpio
   lfsmake2 mdadm
   lfsmake2 dracut
+  lfsmake2 libaio
   lfsmake2 lvm2
   lfsmake2 multipath-tools
   lfsmake2 freetype
   lfsmake2 grub
+  lfsmake2 efivar
+  lfsmake2 efibootmgr
   lfsmake2 libmnl
   lfsmake2 libnfnetlink
   lfsmake2 libnetfilter_queue
@@ -1166,13 +1243,12 @@ buildipfire() {
   esac
   lfsmake2 intel-microcode
   lfsmake2 xtables-addons                      USPACE="1"
-  lfsmake2 openssl
-  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
-  lfsmake2 openssl-compat
   lfsmake2 libgpg-error
   lfsmake2 libgcrypt
   lfsmake2 libassuan
   lfsmake2 nettle
+  lfsmake2 json-c
+  lfsmake2 libconfig
   lfsmake2 libevent
   lfsmake2 libevent2
   lfsmake2 expat
@@ -1207,7 +1283,6 @@ buildipfire() {
   lfsmake2 libtiff
   lfsmake2 libart
   lfsmake2 gd
-  lfsmake2 popt
   lfsmake2 slang
   lfsmake2 newt
   lfsmake2 libsmooth
@@ -1228,7 +1303,9 @@ buildipfire() {
   lfsmake2 bootstrap
   lfsmake2 arping
   lfsmake2 beep
-  lfsmake2 dvdrtools
+  lfsmake2 libarchive
+  lfsmake2 cmake
+  lfsmake2 cdrkit
   lfsmake2 dosfstools
   lfsmake2 reiserfsprogs
   lfsmake2 xfsprogs
@@ -1367,15 +1444,15 @@ buildipfire() {
   lfsmake2 flac
   lfsmake2 lame
   lfsmake2 sox
+  lfsmake2 soxr
   lfsmake2 libshout
   lfsmake2 xvid
   lfsmake2 libmpeg2
-  lfsmake2 libarchive
-  lfsmake2 cmake
   lfsmake2 gnump3d
   lfsmake2 rsync
   lfsmake2 libtirpc
   lfsmake2 rpcbind
+  lfsmake2 keyutils
   lfsmake2 nfs
   lfsmake2 gnu-netcat
   lfsmake2 ncat
@@ -1408,9 +1485,11 @@ buildipfire() {
   lfsmake2 nagios_nrpe
   lfsmake2 nagios-plugins
   lfsmake2 icinga
+  lfsmake2 observium-agent
   lfsmake2 ebtables
   lfsmake2 directfb
   lfsmake2 faad2
+  lfsmake2 alac
   lfsmake2 ffmpeg
   lfsmake2 vdr
   lfsmake2 vdr_streamdev
@@ -1492,6 +1571,12 @@ buildipfire() {
   lfsmake2 python3-six
   lfsmake2 python3-dateutil
   lfsmake2 python3-jmespath
+  lfsmake2 python3-colorama
+  lfsmake2 python3-docutils
+  lfsmake2 python3-yaml
+  lfsmake2 python3-s3transfer
+  lfsmake2 python3-rsa
+  lfsmake2 python3-pyasn1
   lfsmake2 python3-botocore
   lfsmake2 aws-cli
   lfsmake2 transmission
@@ -1547,6 +1632,7 @@ buildipfire() {
   lfsmake2 lua
   lfsmake2 dnsdist
   lfsmake2 bird
+  lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
   lfsmake2 rtpproxy
@@ -1563,6 +1649,8 @@ buildipfire() {
   lfsmake2 mdns-repeater
   lfsmake2 i2c-tools
   lfsmake2 nss-myhostname
+  lfsmake2 dehydrated
+  lfsmake2 shairport-sync
 }
 
 buildinstaller() {
@@ -1751,6 +1839,20 @@ clean)
        rm -f $BASEDIR/ipfire-*
        print_status DONE
        ;;
+docker)
+       # Build the docker image if it does not exist, yet
+       if ! docker images -a | grep -q ^ipfire-builder; then
+               if docker build -t ipfire-builder ${BASEDIR}/tools/docker; then
+                       print_status DONE
+               else
+                       print_status FAIL
+                       exit 1
+               fi
+       fi
+
+       # Run the container and enter a shell
+       docker run -it --privileged -v "${BASEDIR}:/build" -w "/build" ipfire-builder bash -l
+       ;;
 downloadsrc)
        if [ ! -d $BASEDIR/cache ]; then
                mkdir $BASEDIR/cache