core117: Ship latest updates of syslogging

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

diff --git a/make.sh b/make.sh
index 7128a408886b7a8a7a3cb8421bd13d6cbc7caeb7..5f619d30b392b383eef0f545638de632390f8d14 100755 (executable)
--- 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() {
@@ -573,6 +568,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
@@ -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
@@ -1593,19 +1586,6 @@ buildpackages() {
   stdumount
   rm -rf $BASEDIR/build/tmp/*
 
-  # Generating total list of files
-  echo -n "Generating files list from logs" | tee -a $LOGFILE
-  rm -f $BASEDIR/log/FILES
-  for i in `ls -1tr $BASEDIR/log/[^_]*`; do
-       if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
-               echo "##" >>$BASEDIR/log/FILES
-               echo "## `basename $i`" >>$BASEDIR/log/FILES
-               echo "##" >>$BASEDIR/log/FILES
-               cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES
-       fi
-  done
-  print_status DONE
-
   cd $PWD
 }