X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=a7e8068587434ce2fb27022a37c6b35540e22a79;hp=d8b7856cb76e24f1e72de0f2b6c26a9bf34ce146;hb=35ce207ff7f94921ddffb23501c28d7095d59a04;hpb=0f2186725ef5cd62d1482b4482e20a6295ebf2ad

diff --git a/make.sh b/make.sh
index d8b7856cb7..a7e8068587 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.21"							# Version number
-CORE="124"							# Core Level (Filename)
+CORE="125"							# Core Level (Filename)
 PAKFIRE_CORE="124"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
@@ -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=20181024
 
 ###############################################################################
 #
@@ -109,10 +109,7 @@ fi
 # This is the directory where make.sh is in
 export BASEDIR=$(echo $FULLPATH | sed "s/\/$BASENAME//g")
 
-LOGFILE=$BASEDIR/log/_build.preparation.log
-export LOGFILE
 DIR_CHK=$BASEDIR/cache/check
-mkdir $BASEDIR/log/ 2>/dev/null
 
 system_processors() {
 	getconf _NPROCESSORS_ONLN 2>/dev/null || echo "1"
@@ -193,6 +190,7 @@ configure_build() {
 
 	BUILD_ARCH="${build_arch}"
 	TOOLS_DIR="/tools_${BUILD_ARCH}"
+	LOG_DIR="log_${BUILD_ARCH}"
 
 	# Enables hardening
 	HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong"
@@ -285,7 +283,7 @@ stdumount() {
 	umount $BASEDIR/build/usr/src/html		2>/dev/null;
 	umount $BASEDIR/build/usr/src/langs	2>/dev/null;
 	umount $BASEDIR/build/usr/src/lfs		2>/dev/null;
-	umount $BASEDIR/build/usr/src/log		2>/dev/null;
+	umount $BASEDIR/build/usr/src/${LOG_DIR}	2>/dev/null;
 	umount $BASEDIR/build/usr/src/src		2>/dev/null;
 }
 
@@ -421,6 +419,9 @@ exiterror() {
 }
 
 prepareenv() {
+	# Create log directory if it doesn't exist, yet
+	mkdir -p "${BASEDIR}/${LOG_DIR}"
+
 	# Are we running the right shell?
 	if [ -z "${BASH}" ]; then
 		exiterror "BASH environment variable is not set.  You're probably running the wrong shell."
@@ -474,7 +475,7 @@ prepareenv() {
 	mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null
 	mkdir -p $BASEDIR/build/{dev/{shm,pts},proc,sys}
 	mkdir -p $BASEDIR/{cache,ccache} 2>/dev/null
-	mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache}
+	mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,${LOG_DIR},src,ccache}
 
 	mknod -m 600 $BASEDIR/build/dev/console c 5 1 2>/dev/null
 	mknod -m 666 $BASEDIR/build/dev/null c 1 3 2>/dev/null
@@ -492,7 +493,7 @@ prepareenv() {
 	mount --bind $BASEDIR/html   $BASEDIR/build/usr/src/html
 	mount --bind $BASEDIR/langs  $BASEDIR/build/usr/src/langs
 	mount --bind $BASEDIR/lfs    $BASEDIR/build/usr/src/lfs
-	mount --bind $BASEDIR/log    $BASEDIR/build/usr/src/log
+	mount --bind $BASEDIR/${LOG_DIR} $BASEDIR/build/usr/src/${LOG_DIR}
 	mount --bind $BASEDIR/src    $BASEDIR/build/usr/src/src
 
 	# Run LFS static binary creation scripts one by one
@@ -539,6 +540,7 @@ enterchroot() {
 		CORE="${CORE}" \
 		SLOGAN="${SLOGAN}" \
 		TOOLS_DIR="${TOOLS_DIR}" \
+		LOG_DIR="${LOG_DIR}" \
 		CONFIG_ROOT="${CONFIG_ROOT}" \
 		CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
 		CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
@@ -963,7 +965,7 @@ buildtoolchain() {
 		exiterror "Could not create ${TOOLS_DIR} symbolic link"
 	fi
 
-	LOGFILE="$BASEDIR/log/_build.toolchain.log"
+	LOGFILE="$BASEDIR/${LOG_DIR}/_build.toolchain.log"
 	export LOGFILE
 
 	lfsmake1 stage1
@@ -1008,7 +1010,7 @@ buildtoolchain() {
 }
 
 buildbase() {
-	LOGFILE="$BASEDIR/log/_build.base.log"
+	LOGFILE="$BASEDIR/${LOG_DIR}/_build.base.log"
 	export LOGFILE
 	lfsmake2 stage2
 	lfsmake2 linux			KCFG="-headers"
@@ -1039,6 +1041,7 @@ buildbase() {
 	lfsmake2 readline
 	lfsmake2 readline-compat
 	lfsmake2 bzip2
+	lfsmake2 xz
 	lfsmake2 pcre
 	lfsmake2 pcre-compat
 	lfsmake2 bash
@@ -1073,16 +1076,17 @@ buildbase() {
 	lfsmake2 util-linux
 	lfsmake2 udev
 	lfsmake2 vim
-	lfsmake2 xz
-	lfsmake2 paxctl
 }
 
 buildipfire() {
-  LOGFILE="$BASEDIR/log/_build.ipfire.log"
+  LOGFILE="$BASEDIR/${LOG_DIR}/_build.ipfire.log"
   export LOGFILE
   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
@@ -1101,6 +1105,7 @@ buildipfire() {
   lfsmake2 cpio
   lfsmake2 mdadm
   lfsmake2 dracut
+  lfsmake2 libaio
   lfsmake2 lvm2
   lfsmake2 multipath-tools
   lfsmake2 freetype
@@ -1169,9 +1174,6 @@ 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
@@ -1378,6 +1380,7 @@ buildipfire() {
   lfsmake2 rsync
   lfsmake2 libtirpc
   lfsmake2 rpcbind
+  lfsmake2 keyutils
   lfsmake2 nfs
   lfsmake2 gnu-netcat
   lfsmake2 ncat
@@ -1575,7 +1578,7 @@ buildipfire() {
 
 buildinstaller() {
   # Run installer scripts one by one
-  LOGFILE="$BASEDIR/log/_build.installer.log"
+  LOGFILE="$BASEDIR/${LOG_DIR}/_build.installer.log"
   export LOGFILE
   lfsmake2 memtest
   lfsmake2 installer
@@ -1584,7 +1587,7 @@ buildinstaller() {
 }
 
 buildpackages() {
-  LOGFILE="$BASEDIR/log/_build.packages.log"
+  LOGFILE="$BASEDIR/${LOG_DIR}/_build.packages.log"
   export LOGFILE
   echo "... see detailed log in _build.*.log files" >> $LOGFILE
 
@@ -1592,8 +1595,8 @@ buildpackages() {
   # Generating list of packages used
   print_line "Generating packages list from logs"
   rm -f $BASEDIR/doc/packages-list
-  for i in `ls -1tr $BASEDIR/log/[^_]*`; do
-	if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
+  for i in `ls -1tr $BASEDIR/${LOG_DIR}/[^_]*`; do
+	if [ "$i" != "$BASEDIR/${LOG_DIR}/FILES" -a -n $i ]; then
 		echo "* `basename $i`" >>$BASEDIR/doc/packages-list
 	fi
   done
@@ -1752,7 +1755,7 @@ clean)
 	rm -rf $BASEDIR/build
 	rm -rf $BASEDIR/cdrom
 	rm -rf $BASEDIR/packages
-	rm -rf $BASEDIR/log
+	rm -rf $BASEDIR/${LOG_DIR}
 	if [ -h "${TOOLS_DIR}" ]; then
 		rm -f "${TOOLS_DIR}"
 	fi
@@ -1763,7 +1766,7 @@ downloadsrc)
 	if [ ! -d $BASEDIR/cache ]; then
 		mkdir $BASEDIR/cache
 	fi
-	mkdir -p $BASEDIR/log
+	mkdir -p $BASEDIR/${LOG_DIR}
 	echo -e "${BOLD}Preload all source files${NORMAL}" | tee -a $LOGFILE
 	FINISHED=0
 	cd $BASEDIR/lfs
@@ -1822,7 +1825,7 @@ toolchain)
 	buildtoolchain
 	echo "`date -u '+%b %e %T'`: Create toolchain image for ${BUILD_ARCH}" | tee -a $LOGFILE
 	test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
-	cd $BASEDIR && tar -cf- --exclude='log/_build.*.log' build/${TOOLS_DIR} build/bin/sh log | xz ${XZ_OPT} \
+	cd $BASEDIR && tar -cf- --exclude='${LOG_DIR}/_build.*.log' build/${TOOLS_DIR} build/bin/sh ${LOG_DIR} | xz ${XZ_OPT} \
 		> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz
 	md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \
 		> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5