make.sh: Build in ramdisk

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

diff --git a/make.sh b/make.sh
index 7e6975299926a64554c3caa81ef0f0ae8d7d792a..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="125"                                                     # Core Level (Filename)
-PAKFIRE_CORE="125"                                             # 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
@@ -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
@@ -1177,6 +1248,7 @@ buildipfire() {
   lfsmake2 libassuan
   lfsmake2 nettle
   lfsmake2 json-c
+  lfsmake2 libconfig
   lfsmake2 libevent
   lfsmake2 libevent2
   lfsmake2 expat
@@ -1372,6 +1444,7 @@ buildipfire() {
   lfsmake2 flac
   lfsmake2 lame
   lfsmake2 sox
+  lfsmake2 soxr
   lfsmake2 libshout
   lfsmake2 xvid
   lfsmake2 libmpeg2
@@ -1416,6 +1489,7 @@ buildipfire() {
   lfsmake2 ebtables
   lfsmake2 directfb
   lfsmake2 faad2
+  lfsmake2 alac
   lfsmake2 ffmpeg
   lfsmake2 vdr
   lfsmake2 vdr_streamdev
@@ -1576,6 +1650,7 @@ buildipfire() {
   lfsmake2 i2c-tools
   lfsmake2 nss-myhostname
   lfsmake2 dehydrated
+  lfsmake2 shairport-sync
 }
 
 buildinstaller() {
@@ -1764,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