This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 57c04aa49db6b93dee562477ce9fec5141c787a6 (commit) from 6174b7b1c72cd5141e04ac2621eef90d86987a91 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 57c04aa49db6b93dee562477ce9fec5141c787a6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 16 22:23:50 2018 +0000
Revert "make.sh: Build in ramdisk"
This reverts commit 6174b7b1c72cd5141e04ac2621eef90d86987a91.
This had absolutely no effect on build time or rather made it slower. So this is being reverted to save ourselves the RAM.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: make.sh | 68 ----------------------------------------------------------------- 1 file changed, 68 deletions(-)
Difference in files: diff --git a/make.sh b/make.sh index fb529b669..fd626a999 100755 --- a/make.sh +++ b/make.sh @@ -290,9 +290,6 @@ 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() { @@ -426,68 +423,6 @@ 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 @@ -537,9 +472,6 @@ 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
hooks/post-receive -- IPFire 2.x development tree