X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=87125c0ded8c3c26afd1e9b42aa95e4a9f9f4da5;hp=4860df58cce30e5b2a3ba740d334b2b69069b79b;hb=fb6446d2920bf763b9fa83062157aa103a3d24a7;hpb=77b9a869ae25f3facff9f064164cabf99323f829

diff --git a/make.sh b/make.sh
index 4860df58cc..87125c0ded 100755
--- a/make.sh
+++ b/make.sh
@@ -70,8 +70,8 @@ resize_terminal() {
 	NAME_WIDTH=$(( COLUMNS - OPTIONS_WIDTH - TIME_WIDTH - STATUS_WIDTH ))
 	LINE_WIDTH=$(( COLUMNS - STATUS_WIDTH ))
 
-	TIME_COL=$(( COLUMNS - TIME_WIDTH - STATUS_WIDTH ))
-	STATUS_COL=$(( COLUMNS - STATUS_WIDTH ))
+	TIME_COL=$(( NAME_WIDTH + OPTIONS_WIDTH ))
+	STATUS_COL=$(( TIME_COL + TIME_WIDTH ))
 }
 
 # Initially setup terminal
@@ -322,12 +322,7 @@ print_package() {
 	fi
 
 	printf "%-$(( ${NAME_WIDTH} - 1 ))s " "${string}"
-
-	if [ -n "${options}" ]; then
-		printf "[ %-$(( ${OPTIONS_WIDTH} - 4 ))s ]" "${options}"
-	else
-		printf "%${OPTIONS_WIDTH}s" ""
-	fi
+	printf "%$(( ${OPTIONS_WIDTH} - 1 ))s " "${options}"
 }
 
 print_runtime() {
@@ -438,19 +433,6 @@ prepareenv() {
 	# Set LFS Directory
 	LFS=$BASEDIR/build
 
-	# Check ${TOOLS_DIR} symlink
-	if [ -h "${TOOLS_DIR}" ]; then
-	  rm -f "${TOOLS_DIR}"
-	fi
-
-	if [ ! -e "${TOOLS_DIR}" ]; then
-	   ln -s "${BASEDIR}/build${TOOLS_DIR}" "${TOOLS_DIR}"
-	fi
-
-	if [ ! -h "${TOOLS_DIR}" ]; then
-	  exiterror "Could not create ${TOOLS_DIR} symbolic link"
-	fi
-
 	# Setup environment
 	set +h
 	LC_ALL=POSIX
@@ -573,6 +555,7 @@ lfsmakecommoncheck() {
 	if grep "^SUP_ARCH" ${BASEDIR}/lfs/${1} >/dev/null; then
 		# Check if package supports ${BUILD_ARCH} or all architectures.
 		if ! grep -E "^SUP_ARCH.*${BUILD_ARCH}|^SUP_ARCH.*all" ${BASEDIR}/lfs/${1} >/dev/null; then
+			print_runtime 0
 			print_status SKIP
 			return 1
 		fi
@@ -914,6 +897,19 @@ buildtoolchain() {
 		exiterror "Could not find GCC. You will need a working build enviroment in order to build the toolchain."
 	fi
 
+	# Check ${TOOLS_DIR} symlink
+	if [ -h "${TOOLS_DIR}" ]; then
+		rm -f "${TOOLS_DIR}"
+	fi
+
+	if [ ! -e "${TOOLS_DIR}" ]; then
+		ln -s "${BASEDIR}/build${TOOLS_DIR}" "${TOOLS_DIR}"
+	fi
+
+	if [ ! -h "${TOOLS_DIR}" ]; then
+		exiterror "Could not create ${TOOLS_DIR} symbolic link"
+	fi
+
 	LOGFILE="$BASEDIR/log/_build.toolchain.log"
 	export LOGFILE
 
@@ -1342,7 +1338,6 @@ buildipfire() {
   lfsmake2 etherwake
   lfsmake2 bwm-ng
   lfsmake2 sysstat
-  lfsmake2 vsftpd
   lfsmake2 strongswan
   lfsmake2 rng-tools
   lfsmake2 lsof
@@ -1436,7 +1431,6 @@ buildipfire() {
   lfsmake2 usb_modeswitch
   lfsmake2 usb_modeswitch_data
   lfsmake2 zerofree
-  lfsmake2 pound
   lfsmake2 minicom
   lfsmake2 ddrescue
   lfsmake2 miniupnpd
@@ -1493,7 +1487,6 @@ buildipfire() {
   lfsmake2 iptraf-ng
   lfsmake2 iotop
   lfsmake2 stunnel
-  lfsmake2 sslscan
   lfsmake2 owncloud
   lfsmake2 bacula
   lfsmake2 batctl