From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] attempt to make make.sh more shellcheck compliant Date: Fri, 12 Apr 2019 15:51:00 +0100 Message-ID: <4AE772C7-BAA2-4A28-8D4F-359DDC081A12@ipfire.org> In-Reply-To: <8c7db6a3-2719-6315-234e-9e3a7b0f02d3@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7370233400423199533==" List-Id: --===============7370233400423199533== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, NACK. I get your intention with this, but I do not think that the result is usable. It is a simple as that nobody ends a line with a ; in shell. I do not want to= edit the script that way in the future. This is not how people write shell. There might be some unquoted variables in this, but I really cannot find them= in this patch. I think there is a much bigger value in manually auditing code and understand= what it does and if it does it in the right way. A lexical analysis does not= improve quality. What you are doing here is making this compatible with other shells which wil= l never be called because the first line says #!/bin/bash. At the end of the = day, this script does not even need to be portable because it won=E2=80=99t r= un on any other platforms apart from Linux. -Michael > On 11 Apr 2019, at 17:13, Peter M=C3=BCller wr= ote: >=20 > make.sh was initially written a long time ago, and has been > heavily patched since then. Over time, code qualiy decreased. >=20 > This attempts to make make.sh more shellcheck compliant by > consequently adding semicolons at the end of each line, replacing > legacy `...` by $(...) and quoting variables, if necessary. >=20 > Note it is a large patch, as splitting this up into smaller > chunks - e.g. "and here come lines 500-1000" - and does not > solve all code smells reported by shellcheck. This needs to > achieved by upcoming patches, but it is an improvement to my > point of view... :-) >=20 > Signed-off-by: Peter M=C3=BCller > --- > make.sh | 2266 ++++++++++++++++++++++++++++++++----------------------------= --- > 1 file changed, 1134 insertions(+), 1132 deletions(-) >=20 > diff --git a/make.sh b/make.sh > index d015dd95a..f9712a8fb 100755 > --- a/make.sh > +++ b/make.sh > @@ -22,22 +22,22 @@ > ############################################################################ > # >=20 > -NAME=3D"IPFire" # Software name > -SNAME=3D"ipfire" # Short name > -VERSION=3D"2.23" # Version number > -CORE=3D"131" # Core Level (Filename) > -PAKFIRE_CORE=3D"130" # Core Level (PAKFIRE) > -GIT_BRANCH=3D`git rev-parse --abbrev-ref HEAD` # Git Branch > -SLOGAN=3D"www.ipfire.org" # Software slogan > -CONFIG_ROOT=3D/var/ipfire # Configuration rootdir > -NICE=3D10 # Nice level > -MAX_RETRIES=3D1 # prefetch/check loop > -BUILD_IMAGES=3D1 # Flash and Xen Downloader > -KVER=3D`grep --max-count=3D1 VER lfs/linux | awk '{ print $3 }'` > -GIT_TAG=3D$(git tag | tail -1) # Git Tag > -GIT_LASTCOMMIT=3D$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last co= mmit > - > -TOOLCHAINVER=3D20181030 > +NAME=3D"IPFire"; # Software name > +SNAME=3D"ipfire"; # Short name > +VERSION=3D"2.23"; # Version number > +CORE=3D"131"; # Core Level (Filename) > +PAKFIRE_CORE=3D"130"; # Core Level (PAKFIRE) > +GIT_BRANCH=3D$(git rev-parse --abbrev-ref HEAD); # Git Branch > +SLOGAN=3D"www.ipfire.org"; # Software slogan > +CONFIG_ROOT=3D/var/ipfire; # Configuration rootdir > +NICE=3D10; # Nice level > +MAX_RETRIES=3D1; # prefetch/check loop > +BUILD_IMAGES=3D1; # Flash and Xen Downloader > +KVER=3D$(grep --max-count=3D1 VER lfs/linux | awk '{ print $3 }'); > +GIT_TAG=3D$(git tag | tail -1); # Git Tag > +GIT_LASTCOMMIT=3D$(git log | head -n1 | cut -d" " -f2 |head -c8); # Last c= ommit > + > +TOOLCHAINVER=3D20181030; # Toolchain version to be used >=20 > ###########################################################################= #### > # > @@ -47,478 +47,479 @@ TOOLCHAINVER=3D20181030 >=20 > # Remember if the shell is interactive or not > if [ -t 0 ] && [ -t 1 ]; then > - INTERACTIVE=3Dtrue > + INTERACTIVE=3Dtrue; > else > - INTERACTIVE=3Dfalse > + INTERACTIVE=3Dfalse; > fi >=20 > # Sets or adjusts pretty formatting variables > resize_terminal() { > ## Screen Dimentions > # Find current screen size > - COLUMNS=3D$(tput cols) > + COLUMNS=3D$(tput cols); >=20 > # When using remote connections, such as a serial port, stty size returns 0 > if ! ${INTERACTIVE} || [ "${COLUMNS}" =3D "0" ]; then > - COLUMNS=3D80 > + COLUMNS=3D80; > fi >=20 > # Measurements for positioning result messages > - OPTIONS_WIDTH=3D20 > - TIME_WIDTH=3D12 > - STATUS_WIDTH=3D8 > - NAME_WIDTH=3D$(( COLUMNS - OPTIONS_WIDTH - TIME_WIDTH - STATUS_WIDTH )) > - LINE_WIDTH=3D$(( COLUMNS - STATUS_WIDTH )) > - > - TIME_COL=3D$(( NAME_WIDTH + OPTIONS_WIDTH )) > - STATUS_COL=3D$(( TIME_COL + TIME_WIDTH )) > + OPTIONS_WIDTH=3D20; > + TIME_WIDTH=3D12; > + STATUS_WIDTH=3D8; > + NAME_WIDTH=3D$(( COLUMNS - OPTIONS_WIDTH - TIME_WIDTH - STATUS_WIDTH )); > + LINE_WIDTH=3D$(( COLUMNS - STATUS_WIDTH )); > + > + TIME_COL=3D$(( NAME_WIDTH + OPTIONS_WIDTH )); > + STATUS_COL=3D$(( TIME_COL + TIME_WIDTH )); > } >=20 > # Initially setup terminal > -resize_terminal > +resize_terminal; >=20 > # Call resize_terminal when terminal is being resized > -trap "resize_terminal" WINCH > +trap "resize_terminal" WINCH; >=20 > # Define color for messages > -BOLD=3D"\\033[1;39m" > -DONE=3D"\\033[1;32m" > -SKIP=3D"\\033[1;34m" > -WARN=3D"\\033[1;35m" > -FAIL=3D"\\033[1;31m" > -NORMAL=3D"\\033[0;39m" > +BOLD=3D"\\033[1;39m"; > +DONE=3D"\\033[1;32m"; > +SKIP=3D"\\033[1;34m"; > +WARN=3D"\\033[1;35m"; > +FAIL=3D"\\033[1;31m"; > +NORMAL=3D"\\033[0;39m"; >=20 > # New architecture variables > -HOST_ARCH=3D"$(uname -m)" > +HOST_ARCH=3D"$(uname -m)"; >=20 > -PWD=3D$(pwd) > -BASENAME=3D$(basename $0) > +PWD=3D$(pwd); > +BASENAME=3D$(basename "$0"); >=20 > # Debian specific settings > if [ ! -e /etc/debian_version ]; then > - FULLPATH=3D`which $0` > + FULLPATH=3D$(which "$0"); > else > if [ -x /usr/bin/realpath ]; then > - FULLPATH=3D`/usr/bin/realpath $0` > + FULLPATH=3D$(/usr/bin/realpath "$0"); > else > - echo "ERROR: Need to do apt-get install realpath" > - exit 1 > + echo "ERROR: Need to do apt-get install realpath"; > + exit 1; > fi > fi >=20 > # This is the directory where make.sh is in > -export BASEDIR=3D$(echo $FULLPATH | sed "s/\/$BASENAME//g") > +export BASEDIR=3D$(echo "$FULLPATH" | sed "s/\/$BASENAME//g"); >=20 > -LOGFILE=3D$BASEDIR/log/_build.preparation.log > -export LOGFILE > -DIR_CHK=3D$BASEDIR/cache/check > -mkdir $BASEDIR/log/ 2>/dev/null > +LOGFILE=3D$BASEDIR/log/_build.preparation.log; > +export LOGFILE; > +DIR_CHK=3D"$BASEDIR/cache/check"; > +mkdir "$BASEDIR/log/" 2> /dev/null; >=20 > system_processors() { > - getconf _NPROCESSORS_ONLN 2>/dev/null || echo "1" > + getconf _NPROCESSORS_ONLN 2> /dev/null || echo "1"; > } >=20 > system_memory() { > - local key val unit > + local key val unit; >=20 > while read -r key val unit; do > case "${key}" in > MemTotal:*) > # Convert to MB > - echo "$(( ${val} / 1024 ))" > - break > + echo "$(( ${val} / 1024 ))"; > + break; > ;; > esac > done < /proc/meminfo > } >=20 > configure_build() { > - local build_arch=3D"${1}" > + local build_arch=3D"${1}"; >=20 > if [ "${build_arch}" =3D "default" ]; then > - build_arch=3D"$(configure_build_guess)" > + build_arch=3D"$(configure_build_guess)"; > fi >=20 > case "${build_arch}" in > x86_64) > - BUILDTARGET=3D"${build_arch}-unknown-linux-gnu" > - CROSSTARGET=3D"${build_arch}-cross-linux-gnu" > - BUILD_PLATFORM=3D"x86" > - CFLAGS_ARCH=3D"-m64 -mindirect-branch=3Dthunk -mfunction-return=3Dthunk= -mtune=3Dgeneric" > + BUILDTARGET=3D"${build_arch}-unknown-linux-gnu"; > + CROSSTARGET=3D"${build_arch}-cross-linux-gnu"; > + BUILD_PLATFORM=3D"x86"; > + CFLAGS_ARCH=3D"-m64 -mindirect-branch=3Dthunk -mfunction-return=3Dthunk= -mtune=3Dgeneric"; > ;; >=20 > i586) > - BUILDTARGET=3D"${build_arch}-pc-linux-gnu" > - CROSSTARGET=3D"${build_arch}-cross-linux-gnu" > - BUILD_PLATFORM=3D"x86" > - CFLAGS_ARCH=3D"-march=3Di586 -mindirect-branch=3Dthunk -mfunction-retur= n=3Dthunk -mtune=3Dgeneric -fomit-frame-pointer" > + BUILDTARGET=3D"${build_arch}-pc-linux-gnu"; > + CROSSTARGET=3D"${build_arch}-cross-linux-gnu"; > + BUILD_PLATFORM=3D"x86"; > + CFLAGS_ARCH=3D"-march=3Di586 -mindirect-branch=3Dthunk -mfunction-retur= n=3Dthunk -mtune=3Dgeneric -fomit-frame-pointer"; > ;; >=20 > aarch64) > - BUILDTARGET=3D"${build_arch}-unknown-linux-gnu" > - CROSSTARGET=3D"${build_arch}-cross-linux-gnu" > - BUILD_PLATFORM=3D"arm" > - CFLAGS_ARCH=3D"" > + BUILDTARGET=3D"${build_arch}-unknown-linux-gnu"; > + CROSSTARGET=3D"${build_arch}-cross-linux-gnu"; > + BUILD_PLATFORM=3D"arm"; > + CFLAGS_ARCH=3D""; > ;; >=20 > armv7hl) > - BUILDTARGET=3D"${build_arch}-unknown-linux-gnueabi" > - CROSSTARGET=3D"${build_arch}-cross-linux-gnueabi" > - BUILD_PLATFORM=3D"arm" > - CFLAGS_ARCH=3D"-march=3Darmv7-a -mfpu=3Dvfpv3-d16 -mfloat-abi=3Dhard" > + BUILDTARGET=3D"${build_arch}-unknown-linux-gnueabi"; > + CROSSTARGET=3D"${build_arch}-cross-linux-gnueabi"; > + BUILD_PLATFORM=3D"arm"; > + CFLAGS_ARCH=3D"-march=3Darmv7-a -mfpu=3Dvfpv3-d16 -mfloat-abi=3Dhard"; > ;; >=20 > armv5tel) > - BUILDTARGET=3D"${build_arch}-unknown-linux-gnueabi" > - CROSSTARGET=3D"${build_arch}-cross-linux-gnueabi" > - BUILD_PLATFORM=3D"arm" > - CFLAGS_ARCH=3D"-march=3Darmv5te -mfloat-abi=3Dsoft -fomit-frame-pointer" > + BUILDTARGET=3D"${build_arch}-unknown-linux-gnueabi"; > + CROSSTARGET=3D"${build_arch}-cross-linux-gnueabi"; > + BUILD_PLATFORM=3D"arm"; > + CFLAGS_ARCH=3D"-march=3Darmv5te -mfloat-abi=3Dsoft -fomit-frame-pointer= "; > ;; >=20 > *) > - exiterror "Cannot build for architure ${build_arch}" > + exiterror "Cannot build for architure ${build_arch}"; > ;; > esac >=20 > # Check if the QEMU helper is available if needed. > if qemu_is_required "${build_arch}"; then > - local qemu_build_helper=3D"$(qemu_find_build_helper_name "${build_arch}"= )" > + local qemu_build_helper=3D"$(qemu_find_build_helper_name "${build_arch}"= )"; >=20 > if [ -n "${qemu_build_helper}" ]; then > - QEMU_TARGET_HELPER=3D"${qemu_build_helper}" > + QEMU_TARGET_HELPER=3D"${qemu_build_helper}"; > else > - exiterror "Could not find a binfmt_misc helper entry for ${build_arch}" > + exiterror "Could not find a binfmt_misc helper entry for ${build_arch}"; > fi > fi >=20 > - BUILD_ARCH=3D"${build_arch}" > - TOOLS_DIR=3D"/tools_${BUILD_ARCH}" > + BUILD_ARCH=3D"${build_arch}"; > + TOOLS_DIR=3D"/tools_${BUILD_ARCH}"; >=20 > # Enables hardening > - HARDENING_CFLAGS=3D"-Wp,-D_FORTIFY_SOURCE=3D2 -Wp,-D_GLIBCXX_ASSERTIONS -= fstack-protector-strong" > + HARDENING_CFLAGS=3D"-Wp,-D_FORTIFY_SOURCE=3D2 -Wp,-D_GLIBCXX_ASSERTIONS -= fstack-protector-strong"; >=20 > - CFLAGS=3D"-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}" > - CXXFLAGS=3D"${CFLAGS}" > + CFLAGS=3D"-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"; > + CXXFLAGS=3D"${CFLAGS}"; >=20 > # Determine parallelism > # We assume that each process consumes about > # 128MB of memory. Therefore we find out how > # many processes fit into memory. > - local mem_max=3D$(( ${SYSTEM_MEMORY} / 128 )) > - local cpu_max=3D$(( ${SYSTEM_PROCESSORS} + 1 )) > + local mem_max=3D$(( ${SYSTEM_MEMORY} / 128 )); > + local cpu_max=3D$(( ${SYSTEM_PROCESSORS} + 1 )); >=20 > - local parallelism > + local parallelism; > if [ ${mem_max} -lt ${cpu_max} ]; then > - parallelism=3D${mem_max} > + parallelism=3D${mem_max}; > else > - parallelism=3D${cpu_max} > + parallelism=3D${cpu_max}; > fi >=20 > # Use this as default PARALLELISM > - DEFAULT_PARALLELISM=3D"${parallelism}" > + DEFAULT_PARALLELISM=3D"${parallelism}"; >=20 > # Compression parameters > # We use mode 8 for reasonable memory usage when decompressing > # but with overall good compression > - XZ_OPT=3D"-8" > + XZ_OPT=3D"-8"; >=20 > # We try to use as many cores as possible > - XZ_OPT=3D"${XZ_OPT} -T0" > + XZ_OPT=3D"${XZ_OPT} -T0"; >=20 > # We need to limit memory because XZ uses too much when running > # in parallel and it isn't very smart in limiting itself. > # We allow XZ to use up to 70% of all system memory. > - local xz_memory=3D$(( SYSTEM_MEMORY * 7 / 10 )) > + local xz_memory=3D$(( SYSTEM_MEMORY * 7 / 10 )); >=20 > # XZ memory cannot be larger than 2GB on 32 bit systems > case "${build_arch}" in > i*86|armv*) > if [ ${xz_memory} -gt 2048 ]; then > - xz_memory=3D2048 > + xz_memory=3D2048; > fi > ;; > esac >=20 > - XZ_OPT=3D"${XZ_OPT} --memory=3D${xz_memory}MiB" > + XZ_OPT=3D"${XZ_OPT} --memory=3D${xz_memory}MiB"; > } >=20 > configure_build_guess() { > case "${HOST_ARCH}" in > x86_64) > - echo "x86_64" > + echo "x86_64"; > ;; > i?86) > - echo "i586" > + echo "i586"; > ;; >=20 > aarch64) > - echo "aarch64" > + echo "aarch64"; > ;; >=20 > armv7*|armv6*|armv5*) > - echo "armv5tel" > + echo "armv5tel"; > ;; >=20 > *) > - exiterror "Cannot guess build architecture" > + exiterror "Cannot guess build architecture"; > ;; > esac > } >=20 > stdumount() { > - umount $BASEDIR/build/sys 2>/dev/null; > - umount $BASEDIR/build/dev/shm 2>/dev/null; > - umount $BASEDIR/build/dev/pts 2>/dev/null; > - umount $BASEDIR/build/dev 2>/dev/null; > - umount $BASEDIR/build/proc 2>/dev/null; > - umount $BASEDIR/build/install/mnt 2>/dev/null; > - umount $BASEDIR/build/usr/src/cache 2>/dev/null; > - umount $BASEDIR/build/usr/src/ccache 2>/dev/null; > - umount $BASEDIR/build/usr/src/config 2>/dev/null; > - umount $BASEDIR/build/usr/src/doc 2>/dev/null; > - 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/src 2>/dev/null; > + umount "$BASEDIR/build/sys" 2> /dev/null; > + umount "$BASEDIR/build/dev/shm" 2> /dev/null; > + umount "$BASEDIR/build/dev/pts" 2> /dev/null; > + umount "$BASEDIR/build/dev" 2> /dev/null; > + umount "$BASEDIR/build/proc" 2> /dev/null; > + umount "$BASEDIR/build/install/mnt" 2> /dev/null; > + umount "$BASEDIR/build/usr/src/cache" 2> /dev/null; > + umount "$BASEDIR/build/usr/src/ccache" 2> /dev/null; > + umount "$BASEDIR/build/usr/src/config" 2> /dev/null; > + umount "$BASEDIR/build/usr/src/doc" 2> /dev/null; > + 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/src" 2> /dev/null; > } >=20 > now() { > - date -u "+%s" > + date -u "+%s"; > } >=20 > format_runtime() { > - local seconds=3D${1} > + local seconds=3D${1}; >=20 > - if [ ${seconds} -ge 3600 ]; then > + if [ "${seconds}" -ge 3600 ]; then > printf "%d:%02d:%02d\n" \ > "$(( seconds / 3600 ))" \ > "$(( seconds % 3600 / 60 ))" \ > - "$(( seconds % 3600 % 60 ))" > - elif [ ${seconds} -ge 60 ]; then > + "$(( seconds % 3600 % 60 ))"; > + elif [ "${seconds}" -ge 60 ]; then > printf "%d:%02d\n" \ > "$(( seconds / 60 ))" \ > - "$(( seconds % 60 ))" > + "$(( seconds % 60 ))"; > else > - printf "%d\n" "${seconds}" > + printf "%d\n" "${seconds}"; > fi > } >=20 > print_line() { > - local line=3D"$@" > + local line=3D"$@"; >=20 > - printf "%-${LINE_WIDTH}s" "${line}" > + printf "%-${LINE_WIDTH}s" "${line}"; > } >=20 > _print_line() { > - local status=3D"${1}" > - shift > + local status=3D"${1}"; > + shift; >=20 > if ${INTERACTIVE}; then > - printf "${!status}" > + printf "${!status}"; > fi >=20 > - print_line "$@" > + print_line "$@"; >=20 > if ${INTERACTIVE}; then > - printf "${NORMAL}" > + printf "${NORMAL}"; > fi > } >=20 > print_headline() { > - _print_line BOLD "$@" > + _print_line BOLD "$@"; > } >=20 > print_error() { > - _print_line FAIL "$@" > + _print_line FAIL "$@"; > } >=20 > print_package() { > - local name=3D"${1}" > - shift > + local name=3D"${1}"; > + shift; >=20 > - local version=3D"$(grep -E "^VER |^VER=3D|^VER " $BASEDIR/lfs/${name} | a= wk '{ print $3 }')" > - local options=3D"$@" > + local version=3D"$(grep -E "^VER |^VER=3D|^VER " $BASEDIR/lfs/${name} | a= wk '{ print $3 }')"; > + local options=3D"$@"; >=20 > - local string=3D"${name}" > + local string=3D"${name}"; > if [ -n "${version}" ] && [ "${version}" !=3D "ipfire" ]; then > - string=3D"${string} (${version})" > + string=3D"${string} (${version})"; > fi >=20 > - printf "%-$(( ${NAME_WIDTH} - 1 ))s " "${string}" > - printf "%$(( ${OPTIONS_WIDTH} - 1 ))s " "${options}" > + printf "%-$(( ${NAME_WIDTH} - 1 ))s " "${string}"; > + printf "%$(( ${OPTIONS_WIDTH} - 1 ))s " "${options}"; > } >=20 > print_runtime() { > - local runtime=3D$(format_runtime $@) > + local runtime=3D$(format_runtime $@); >=20 > if ${INTERACTIVE}; then > - printf "\\033[${TIME_COL}G[ ${BOLD}%$(( ${TIME_WIDTH} - 4 ))s${NORMAL} ]= " "${runtime}" > + printf "\\033[${TIME_COL}G[ ${BOLD}%$(( ${TIME_WIDTH} - 4 ))s${NORMAL} ]= " "${runtime}"; > else > - printf "[ %$(( ${TIME_WIDTH} - 4 ))s ]" "${runtime}" > + printf "[ %$(( ${TIME_WIDTH} - 4 ))s ]" "${runtime}"; > fi > } >=20 > print_status() { > - local status=3D"${1}" > + local status=3D"${1}"; >=20 > - local color=3D"${!status}" > + local color=3D"${!status}"; >=20 > if ${INTERACTIVE}; then > - printf "\\033[${STATUS_COL}G[${color-${BOLD}} %-$(( ${STATUS_WIDTH} - 4 = ))s ${NORMAL}]\n" "${status}" > + printf "\\033[${STATUS_COL}G[${color-${BOLD}} %-$(( ${STATUS_WIDTH} - 4 = ))s ${NORMAL}]\n" "${status}"; > else > - printf "[ %-$(( ${STATUS_WIDTH} - 4 ))s ]\n" "${status}" > + printf "[ %-$(( ${STATUS_WIDTH} - 4 ))s ]\n" "${status}"; > fi > } >=20 > print_build_stage() { > - print_headline "$@" > + print_headline "$@"; >=20 > # end line > - printf "\n" > + printf "\n"; > } >=20 > print_build_summary() { > - local runtime=3D$(format_runtime $@) > + local runtime=3D$(format_runtime $@); >=20 > - print_line "*** Build finished in ${runtime}" > - print_status DONE > + print_line "*** Build finished in ${runtime}"; > + print_status DONE; > } >=20 > exiterror() { > - stdumount > - for i in `seq 0 7`; do > + stdumount; > + for i in $(seq 0 7); do > if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); then > - losetup -d /dev/loop${i} 2>/dev/null > - fi; > + losetup -d /dev/loop${i} 2>/dev/null; > + fi > done >=20 > # Dump logfile > if [ -n "${LOGFILE}" ] && [ -e "${LOGFILE}" ]; then > echo # empty line >=20 > - local line > + local line; > while read -r line; do > - echo " ${line}" > + echo " ${line}"; > done <<< "$(tail -n30 ${LOGFILE})" > fi >=20 > echo # empty line >=20 > - local line > + local line; > for line in "ERROR: $@" " Check ${LOGFILE} for errors if applicable"; do > - print_error "${line}" > - print_status FAIL > + print_error "${line}"; > + print_status FAIL; > done >=20 > - exit 1 > + exit 1; > } >=20 > prepareenv() { > # Are we running the right shell? > if [ -z "${BASH}" ]; then > - exiterror "BASH environment variable is not set. You're probably runnin= g the wrong shell." > + exiterror "BASH environment variable is not set. You're probably runnin= g the wrong shell."; > fi >=20 > if [ -z "${BASH_VERSION}" ]; then > - exiterror "Not running BASH shell." > + exiterror "Not running BASH shell."; > fi >=20 > # Trap on emergency exit > - trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGKILL SIGST= OP SIGQUIT > + trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGKILL SIGST= OP SIGQUIT; >=20 > # Resetting our nice level > if ! renice ${NICE} $$ >/dev/null; then > - exiterror "Failed to set nice level to ${NICE}" > + exiterror "Failed to set nice level to ${NICE}"; > fi >=20 > # Checking if running as root user > - if [ $(id -u) -ne 0 ]; then > - exiterror "root privileges required for building" > + if [ "$(id -u)" -ne 0 ]; then > + exiterror "root privileges required for building"; > fi >=20 > # Checking for necessary temporary space > - print_line "Checking for necessary space on disk $BASE_DEV" > - BASE_DEV=3D`df -P -k $BASEDIR | tail -n 1 | awk '{ print $1 }'` > - BASE_ASPACE=3D`df -P -k $BASEDIR | tail -n 1 | awk '{ print $4 }'` > + print_line "Checking for necessary space on disk $BASE_DEV"; > + BASE_DEV=3D`df -P -k $BASEDIR | tail -n 1 | awk '{ print $1 }'`; > + BASE_ASPACE=3D`df -P -k $BASEDIR | tail -n 1 | awk '{ print $4 }'`; > if (( 2048000 > $BASE_ASPACE )); then > - BASE_USPACE=3D`du -skx $BASEDIR | awk '{print $1}'` > + BASE_USPACE=3D`du -skx $BASEDIR | awk '{print $1}'`; > if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then > - print_status FAIL > - exiterror "Not enough temporary space available, need at least 2GB on = $BASE_DEV" > + print_status FAIL; > + exiterror "Not enough temporary space available, need at least 2GB on = $BASE_DEV"; > fi > else > - print_status DONE > + print_status DONE; > fi >=20 > # Set umask > - umask 022 > + umask 022; >=20 > # Set LFS Directory > - LFS=3D$BASEDIR/build > + LFS=3D$BASEDIR/build; >=20 > # Setup environment > - set +h > - LC_ALL=3DPOSIX > - export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM > - unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD > + set +h; > + LC_ALL=3DPOSIX; > + export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM; > + unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD; >=20 > # Make some extra directories > - mkdir -p "${BASEDIR}/build${TOOLS_DIR}" 2>/dev/null > - 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${TOOLS_DIR}" 2> /dev/null; > + 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}; >=20 > - 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 > + 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; >=20 > # Make all sources and proc available under lfs build > - mount --bind /dev $BASEDIR/build/dev > - mount --bind /dev/pts $BASEDIR/build/dev/pts > - mount --bind /dev/shm $BASEDIR/build/dev/shm > - mount --bind /proc $BASEDIR/build/proc > - mount --bind /sys $BASEDIR/build/sys > - mount --bind $BASEDIR/cache $BASEDIR/build/usr/src/cache > - mount --bind $BASEDIR/ccache $BASEDIR/build/usr/src/ccache > - mount --bind $BASEDIR/config $BASEDIR/build/usr/src/config > - mount --bind $BASEDIR/doc $BASEDIR/build/usr/src/doc > - 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/src $BASEDIR/build/usr/src/src > + mount --bind /dev $BASEDIR/build/dev; > + mount --bind /dev/pts $BASEDIR/build/dev/pts; > + mount --bind /dev/shm $BASEDIR/build/dev/shm; > + mount --bind /proc $BASEDIR/build/proc; > + mount --bind /sys $BASEDIR/build/sys; > + mount --bind $BASEDIR/cache $BASEDIR/build/usr/src/cache; > + mount --bind $BASEDIR/ccache $BASEDIR/build/usr/src/ccache; > + mount --bind $BASEDIR/config $BASEDIR/build/usr/src/config; > + mount --bind $BASEDIR/doc $BASEDIR/build/usr/src/doc; > + 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/src $BASEDIR/build/usr/src/src; >=20 > # Run LFS static binary creation scripts one by one > - export CCACHE_DIR=3D$BASEDIR/ccache > - export CCACHE_COMPRESS=3D1 > - export CCACHE_COMPILERCHECK=3D"string:toolchain-${TOOLCHAINVER} ${BUILD_A= RCH}" > + export CCACHE_DIR=3D$BASEDIR/ccache; > + export CCACHE_COMPRESS=3D1; > + export CCACHE_COMPILERCHECK=3D"string:toolchain-${TOOLCHAINVER} ${BUILD_A= RCH}"; >=20 > # Remove pre-install list of installed files in case user erase some files= before rebuild > - rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null > + rm -f $BASEDIR/build/usr/src/lsalr 2> /dev/null; >=20 > # Prepare string for /etc/system-release. > - SYSTEM_RELEASE=3D"${NAME} ${VERSION} (${BUILD_ARCH})" > + SYSTEM_RELEASE=3D"${NAME} ${VERSION} (${BUILD_ARCH})"; > if [ "$(git status -s | wc -l)" =3D=3D "0" ]; then > - GIT_STATUS=3D"" > + GIT_STATUS=3D""; > else > - GIT_STATUS=3D"-dirty" > + GIT_STATUS=3D"-dirty"; > fi > + > case "$GIT_BRANCH" in > core*|beta?|rc?) > - SYSTEM_RELEASE=3D"${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS" > + SYSTEM_RELEASE=3D"${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"; > ;; > *) > - SYSTEM_RELEASE=3D"${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GI= T_LASTCOMMIT$GIT_STATUS" > + SYSTEM_RELEASE=3D"${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GI= T_LASTCOMMIT$GIT_STATUS"; > ;; > esac > } >=20 > enterchroot() { > # Install QEMU helper, if needed > - qemu_install_helper > + qemu_install_helper; >=20 > - local PATH=3D"${TOOLS_DIR}/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:${TOO= LS_DIR}/bin" > + local PATH=3D"${TOOLS_DIR}/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:${TOO= LS_DIR}/bin"; >=20 > PATH=3D"${PATH}" chroot ${LFS} env -i \ > HOME=3D"/root" \ > @@ -550,75 +551,75 @@ enterchroot() { > SYSTEM_MEMORY=3D"${SYSTEM_MEMORY}" \ > $(fake_environ) \ > $(qemu_environ) \ > - "$@" > + "$@"; > } >=20 > entershell() { > if [ ! -e $BASEDIR/build/usr/src/lfs/ ]; then > - exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/" > + exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/"; > fi >=20 > - echo "Entering to a shell inside LFS chroot, go out with exit" > - local PS1=3D"ipfire build chroot (${BUILD_ARCH}) \u:\w\$ " > + echo "Entering to a shell inside LFS chroot, go out with exit"; > + local PS1=3D"ipfire build chroot (${BUILD_ARCH}) \u:\w\$ "; >=20 > if enterchroot bash -i; then > - stdumount > + stdumount; > else > - print_status FAIL > - exiterror "chroot error" > + print_status FAIL; > + exiterror "chroot error"; > fi > } >=20 > lfsmakecommoncheck() { > # Script present? > if [ ! -f $BASEDIR/lfs/$1 ]; then > - exiterror "No such file or directory: $BASEDIR/$1" > + exiterror "No such file or directory: $BASEDIR/$1"; > fi >=20 > # Print package name and version > - print_package $@ > + print_package $@; >=20 > # Check if this package is supported by our architecture. > # If no SUP_ARCH is found, we assume the package can be built for all. > - if grep "^SUP_ARCH" ${BASEDIR}/lfs/${1} >/dev/null; then > + 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 > + 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 > fi >=20 > # Script slipped? > - local i > + local i; > for i in $SKIP_PACKAGE_LIST > do > if [ "$i" =3D=3D "$1" ]; then > - print_status SKIP > + print_status SKIP; > return 1; > fi > done >=20 > - echo -ne "`date -u '+%b %e %T'`: Building $* " >> $LOGFILE > + echo -ne "`date -u '+%b %e %T'`: Building $* " >> $LOGFILE; >=20 > cd $BASEDIR/lfs && make -s -f $* LFS_BASEDIR=3D$BASEDIR BUILD_ARCH=3D"${BU= ILD_ARCH}" \ > - MESSAGE=3D"$1\t " download >> $LOGFILE 2>&1 > + MESSAGE=3D"$1\t " download >> $LOGFILE 2>&1; > if [ $? -ne 0 ]; then > - exiterror "Download error in $1" > + exiterror "Download error in $1"; > fi >=20 > cd $BASEDIR/lfs && make -s -f $* LFS_BASEDIR=3D$BASEDIR BUILD_ARCH=3D"${BU= ILD_ARCH}" \ > - MESSAGE=3D"$1\t md5sum" md5 >> $LOGFILE 2>&1 > + MESSAGE=3D"$1\t md5sum" md5 >> $LOGFILE 2>&1; > if [ $? -ne 0 ]; then > - exiterror "md5sum error in $1, check file in cache or signature" > + exiterror "md5sum error in $1, check file in cache or signature"; > fi >=20 > - return 0 # pass all! > + return 0; # pass all! > } >=20 > lfsmake1() { > - lfsmakecommoncheck $* > - [ $? =3D=3D 1 ] && return 0 > + lfsmakecommoncheck $*; > + [ $? =3D=3D 1 ] && return 0; >=20 > cd $BASEDIR/lfs && env -i \ > PATH=3D"${TOOLS_DIR}/ccache/bin:${TOOLS_DIR}/bin:$PATH" \ > @@ -643,18 +644,18 @@ lfsmake1() { > install >> $LOGFILE 2>&1 & >=20 > if ! wait_until_finished $!; then > - print_status FAIL > - exiterror "Building $*" > + print_status FAIL; > + exiterror "Building $*"; > fi >=20 > - print_status DONE > + print_status DONE; > } >=20 > lfsmake2() { > - lfsmakecommoncheck $* > - [ $? =3D=3D 1 ] && return 0 > + lfsmakecommoncheck $*; > + [ $? =3D=3D 1 ] && return 0; >=20 > - local PS1=3D'\u:\w$ ' > + local PS1=3D'\u:\w$ '; >=20 > enterchroot \ > ${EXTRA_PATH}bash -x -c "cd /usr/src/lfs && \ > @@ -663,113 +664,113 @@ lfsmake2() { > >> ${LOGFILE} 2>&1 & >=20 > if ! wait_until_finished $!; then > - print_status FAIL > - exiterror "Building $*" > + print_status FAIL; > + exiterror "Building $*"; > fi >=20 > - print_status DONE > + print_status DONE; > } >=20 > ipfiredist() { > - lfsmakecommoncheck $* > - [ $? =3D=3D 1 ] && return 0 > + lfsmakecommoncheck $*; > + [ $? =3D=3D 1 ] && return 0; >=20 > - local PS1=3D'\u:\w$ ' > + local PS1=3D'\u:\w$ '; >=20 > enterchroot \ > bash -x -c "cd /usr/src/lfs && make -f $* LFS_BASEDIR=3D/usr/src dist" \ > >> ${LOGFILE} 2>&1 & >=20 > if ! wait_until_finished $!; then > - print_status FAIL > - exiterror "Packaging $*" > + print_status FAIL; > + exiterror "Packaging $*"; > fi >=20 > - print_status DONE > + print_status DONE; > } >=20 > wait_until_finished() { > - local pid=3D${1} > + local pid=3D${1}; >=20 > - local start_time=3D$(now) > + local start_time=3D$(now); >=20 > # Show progress > if ${INTERACTIVE}; then > # Wait a little just in case the process > # has finished very quickly. > - sleep 0.1 > + sleep 0.1; >=20 > - local runtime > + local runtime; > while kill -0 ${pid} 2>/dev/null; do > - print_runtime $(( $(now) - ${start_time} )) > + print_runtime $(( $(now) - ${start_time} )); >=20 > # Wait a little > - sleep 1 > + sleep 1; > done > fi >=20 > # Returns the exit code of the child process > - wait ${pid} > - local ret=3D$? > + wait ${pid}; > + local ret=3D$?; >=20 > if ! ${INTERACTIVE}; then > - print_runtime $(( $(now) - ${start_time} )) > + print_runtime $(( $(now) - ${start_time} )); > fi >=20 > - return ${ret} > + return ${ret}; > } >=20 > fake_environ() { > - [ -e "${BASEDIR}/build${TOOLS_DIR}/lib/libpakfire_preload.so" ] || return > + [ -e "${BASEDIR}/build${TOOLS_DIR}/lib/libpakfire_preload.so" ] || return; >=20 > - local env=3D"LD_PRELOAD=3D${TOOLS_DIR}/lib/libpakfire_preload.so" > + local env=3D"LD_PRELOAD=3D${TOOLS_DIR}/lib/libpakfire_preload.so"; >=20 > # Fake kernel version, because some of the packages do not compile > # with kernel 3.0 and later. > - env=3D"${env} UTS_RELEASE=3D${KVER}" > + env=3D"${env} UTS_RELEASE=3D${KVER}"; >=20 > # Fake machine version. > - env=3D"${env} UTS_MACHINE=3D${BUILD_ARCH}" > + env=3D"${env} UTS_MACHINE=3D${BUILD_ARCH}"; >=20 > - echo "${env}" > + echo "${env}"; > } >=20 > qemu_environ() { > - local env > + local env; >=20 > # Don't add anything if qemu is not used. > if ! qemu_is_required; then > - return > + return; > fi >=20 > # Set default qemu options > case "${BUILD_ARCH}" in > arm*) > - QEMU_CPU=3D"${QEMU_CPU:-cortex-a9}" > + QEMU_CPU=3D"${QEMU_CPU:-cortex-a9}"; >=20 > - env=3D"${env} QEMU_CPU=3D${QEMU_CPU}" > + env=3D"${env} QEMU_CPU=3D${QEMU_CPU}"; > ;; > esac >=20 > # Enable QEMU strace > - #env=3D"${env} QEMU_STRACE=3D1" > + #env=3D"${env} QEMU_STRACE=3D1"; >=20 > - echo "${env}" > + echo "${env}"; > } >=20 > qemu_is_required() { > - local build_arch=3D"${1}" > + local build_arch=3D"${1}"; >=20 > if [ -z "${build_arch}" ]; then > - build_arch=3D"${BUILD_ARCH}" > + build_arch=3D"${BUILD_ARCH}"; > fi >=20 > case "${HOST_ARCH},${build_arch}" in > x86_64,arm*|i?86,arm*|i?86,x86_64) > - return 0 > + return 0; > ;; > *) > - return 1 > + return 1; > ;; > esac > } > @@ -777,143 +778,143 @@ qemu_is_required() { > qemu_install_helper() { > # Do nothing, if qemu is not required > if ! qemu_is_required; then > - return 0 > + return 0; > fi >=20 > if [ ! -e /proc/sys/fs/binfmt_misc/status ]; then > - exiterror "binfmt_misc not mounted. QEMU_TARGET_HELPER not useable." > + exiterror "binfmt_misc not mounted. QEMU_TARGET_HELPER not useable."; > fi >=20 > if [ ! $(cat /proc/sys/fs/binfmt_misc/status) =3D 'enabled' ]; then > - exiterror "binfmt_misc not enabled. QEMU_TARGET_HELPER not useable." > + exiterror "binfmt_misc not enabled. QEMU_TARGET_HELPER not useable."; > fi >=20 >=20 > if [ -z "${QEMU_TARGET_HELPER}" ]; then > - exiterror "QEMU_TARGET_HELPER not set" > + exiterror "QEMU_TARGET_HELPER not set"; > fi >=20 > # Check if the helper is already installed. > if [ -x "${LFS}${QEMU_TARGET_HELPER}" ]; then > - return 0 > + return 0; > fi >=20 > # Try to find a suitable binary that we can install > # to the build environment. > - local file > + local file; > for file in "${QEMU_TARGET_HELPER}" "${QEMU_TARGET_HELPER}-static"; do > # file must exist and be executable. > - [ -x "${file}" ] || continue > + [ -x "${file}" ] || continue; >=20 > # Must be static. > - file_is_static "${file}" || continue > + file_is_static "${file}" || continue; >=20 > - local dirname=3D"${LFS}$(dirname "${file}")" > - mkdir -p "${dirname}" > + local dirname=3D"${LFS}$(dirname "${file}")"; > + mkdir -p "${dirname}"; >=20 > - install -m 755 "${file}" "${LFS}${QEMU_TARGET_HELPER}" > - return 0 > + install -m 755 "${file}" "${LFS}${QEMU_TARGET_HELPER}"; > + return 0; > done >=20 > - exiterror "Could not find a statically-linked QEMU emulator: ${QEMU_TARGE= T_HELPER}" > + exiterror "Could not find a statically-linked QEMU emulator: ${QEMU_TARGE= T_HELPER}"; > } >=20 > qemu_find_build_helper_name() { > - local build_arch=3D"${1}" > + local build_arch=3D"${1}"; >=20 > - local magic > + local magic; > case "${build_arch}" in > arm*) > - magic=3D"7f454c4601010100000000000000000002002800" > + magic=3D"7f454c4601010100000000000000000002002800"; > ;; > x86_64) > - magic=3D"7f454c4602010100000000000000000002003e00" > + magic=3D"7f454c4602010100000000000000000002003e00"; > ;; > esac >=20 > - [ -z "${magic}" ] && return 1 > + [ -z "${magic}" ] && return 1; >=20 > - local file > + local file; > for file in /proc/sys/fs/binfmt_misc/*; do > # skip write only register entry > - [ $(basename "${file}") =3D "register" ] && continue > + [ $(basename "${file}") =3D "register" ] && continue; > # Search for the file with the correct magic value. > - grep -qE "^magic ${magic}$" "${file}" || continue > + grep -qE "^magic ${magic}$" "${file}" || continue; >=20 > - local interpreter=3D"$(grep "^interpreter" "${file}" | awk '{ print $2 }= ')" > + local interpreter=3D"$(grep "^interpreter" "${file}" | awk '{ print $2 }= ')"; >=20 > - [ -n "${interpreter}" ] || continue > - [ "${interpreter:0:1}" =3D "/" ] || continue > - [ -x "${interpreter}" ] || continue > + [ -n "${interpreter}" ] || continue; > + [ "${interpreter:0:1}" =3D "/" ] || continue; > + [ -x "${interpreter}" ] || continue; >=20 > - echo "${interpreter}" > - return 0 > + echo "${interpreter}"; > + return 0; > done >=20 > - return 1 > + return 1; > } >=20 > file_is_static() { > - local file=3D"${1}" > + local file=3D"${1}"; >=20 > - file ${file} 2>/dev/null | grep -q "statically linked" > + file ${file} 2> /dev/null | grep -q "statically linked"; > } >=20 > update_language_list() { > - local path=3D"${1}" > + local path=3D"${1}"; >=20 > - local lang > + local lang; > for lang in ${path}/*.po; do > - lang=3D"$(basename "${lang}")" > - echo "${lang%*.po}" > - done | sort -u > "${path}/LINGUAS" > + lang=3D"$(basename "${lang}")"; > + echo "${lang%*.po}"; > + done | sort -u > "${path}/LINGUAS"; > } >=20 > contributors() { > - local commits name > + local commits name; >=20 > git shortlog --summary --numbered | while read -r commits name; do > - echo "${name}" > - done | grep -vE -e "^(alpha197|morlix|root|ummeegge)$" -e "via Developmen= t$" -e "@" -e "#$" > + echo "${name}"; > + done | grep -vE -e "^(alpha197|morlix|root|ummeegge)$" -e "via Developmen= t$" -e "@" -e "#$"; > } >=20 > update_contributors() { > - echo -n "Updating list of contributors" > + echo -n "Updating list of contributors"; >=20 > - local contributors=3D"$(contributors | paste -sd , - | sed -e "s/,/&\\\\n= /g")" > + local contributors=3D"$(contributors | paste -sd , - | sed -e "s/,/&\\\\n= /g")"; >=20 > # Edit contributors into credits.cgi > awk -i inplace \ > "//{ p=3D1; print; printf \"${contributors}\n\"}//{ p=3D0 } !p" \ > - "${BASEDIR}/html/cgi-bin/credits.cgi" > + "${BASEDIR}/html/cgi-bin/credits.cgi"; >=20 > - print_status DONE > - return 0 > + print_status DONE; > + return 0; > } >=20 > # Load configuration file > if [ -f .config ]; then > - . .config > + . .config; > fi >=20 > # TARGET_ARCH is BUILD_ARCH now > if [ -n "${TARGET_ARCH}" ]; then > - BUILD_ARCH=3D"${TARGET_ARCH}" > - unset TARGET_ARCH > + BUILD_ARCH=3D"${TARGET_ARCH}"; > + unset TARGET_ARCH; > fi >=20 > # Get some information about the host system > -SYSTEM_PROCESSORS=3D"$(system_processors)" > -SYSTEM_MEMORY=3D"$(system_memory)" > +SYSTEM_PROCESSORS=3D"$(system_processors)"; > +SYSTEM_MEMORY=3D"$(system_memory)"; >=20 > if [ -n "${BUILD_ARCH}" ]; then > - configure_build "${BUILD_ARCH}" > + configure_build "${BUILD_ARCH}"; > else > - configure_build "default" > + configure_build "default"; > fi >=20 > buildtoolchain() { > - local error=3Dfalse > + local error=3Dfalse; > case "${BUILD_ARCH}:${HOST_ARCH}" in > # x86_64 > x86_64:x86_64) > @@ -925,7 +926,7 @@ buildtoolchain() { > # These are working. > ;; > i586:*) > - error=3Dtrue > + error=3Dtrue, > ;; >=20 > # ARM > @@ -937,1011 +938,1012 @@ buildtoolchain() { > # These are working. > ;; > armv5tel:*) > - error=3Dtrue > + error=3Dtrue; > ;; > esac >=20 > ${error} && \ > - exiterror "Cannot build ${BUILD_ARCH} toolchain on $(uname -m). Please u= se the download if any." > + exiterror "Cannot build ${BUILD_ARCH} toolchain on $(uname -m). Please u= se the download if any."; >=20 > - local gcc=3D$(type -p gcc) > + local gcc=3D$(type -p gcc); > if [ -z "${gcc}" ]; then > - exiterror "Could not find GCC. You will need a working build enviroment = in order to build the toolchain." > + exiterror "Could not find GCC. You will need a working build enviroment = in order to build the toolchain."; > fi >=20 > # Check ${TOOLS_DIR} symlink > if [ -h "${TOOLS_DIR}" ]; then > - rm -f "${TOOLS_DIR}" > + rm -f "${TOOLS_DIR}"; > fi >=20 > if [ ! -e "${TOOLS_DIR}" ]; then > - ln -s "${BASEDIR}/build${TOOLS_DIR}" "${TOOLS_DIR}" > + ln -s "${BASEDIR}/build${TOOLS_DIR}" "${TOOLS_DIR}"; > fi >=20 > if [ ! -h "${TOOLS_DIR}" ]; then > - exiterror "Could not create ${TOOLS_DIR} symbolic link" > + exiterror "Could not create ${TOOLS_DIR} symbolic link"; > fi >=20 > - LOGFILE=3D"$BASEDIR/log/_build.toolchain.log" > - export LOGFILE > - > - lfsmake1 stage1 > - lfsmake1 ccache PASS=3D1 > - lfsmake1 binutils PASS=3D1 > - lfsmake1 gcc PASS=3D1 > - lfsmake1 linux KCFG=3D"-headers" > - lfsmake1 glibc > - lfsmake1 gcc PASS=3DL > - lfsmake1 binutils PASS=3D2 > - lfsmake1 gcc PASS=3D2 > - lfsmake1 zlib > - lfsmake1 ccache PASS=3D2 > - lfsmake1 tcl > - lfsmake1 expect > - lfsmake1 dejagnu > - lfsmake1 pkg-config > - lfsmake1 ncurses > - lfsmake1 bash > - lfsmake1 bzip2 > - lfsmake1 automake > - lfsmake1 coreutils > - lfsmake1 diffutils > - lfsmake1 findutils > - lfsmake1 gawk > - lfsmake1 gettext > - lfsmake1 grep > - lfsmake1 gzip > - lfsmake1 m4 > - lfsmake1 make > - lfsmake1 patch > - lfsmake1 perl > - lfsmake1 sed > - lfsmake1 tar > - lfsmake1 texinfo > - lfsmake1 xz > - lfsmake1 bison > - lfsmake1 flex > - lfsmake1 fake-environ > - lfsmake1 strip > - lfsmake1 cleanup-toolchain > + LOGFILE=3D"$BASEDIR/log/_build.toolchain.log"; > + export LOGFILE; > + > + lfsmake1 stage1; > + lfsmake1 ccache PASS=3D1; > + lfsmake1 binutils PASS=3D1; > + lfsmake1 gcc PASS=3D1; > + lfsmake1 linux KCFG=3D"-headers"; > + lfsmake1 glibc; > + lfsmake1 gcc PASS=3DL; > + lfsmake1 binutils PASS=3D2; > + lfsmake1 gcc PASS=3D2; > + lfsmake1 zlib; > + lfsmake1 ccache PASS=3D2; > + lfsmake1 tcl; > + lfsmake1 expect; > + lfsmake1 dejagnu; > + lfsmake1 pkg-config; > + lfsmake1 ncurses; > + lfsmake1 bash; > + lfsmake1 bzip2; > + lfsmake1 automake; > + lfsmake1 coreutils; > + lfsmake1 diffutils; > + lfsmake1 findutils; > + lfsmake1 gawk; > + lfsmake1 gettext; > + lfsmake1 grep; > + lfsmake1 gzip; > + lfsmake1 m4; > + lfsmake1 make; > + lfsmake1 patch; > + lfsmake1 perl; > + lfsmake1 sed; > + lfsmake1 tar; > + lfsmake1 texinfo; > + lfsmake1 xz; > + lfsmake1 bison; > + lfsmake1 flex; > + lfsmake1 fake-environ; > + lfsmake1 strip; > + lfsmake1 cleanup-toolchain; > } >=20 > buildbase() { > - LOGFILE=3D"$BASEDIR/log/_build.base.log" > - export LOGFILE > - lfsmake2 stage2 > - lfsmake2 linux KCFG=3D"-headers" > - lfsmake2 man-pages > - lfsmake2 glibc > - lfsmake2 tzdata > - lfsmake2 cleanup-toolchain > - lfsmake2 zlib > - lfsmake2 binutils > - lfsmake2 gmp > - lfsmake2 gmp-compat > - lfsmake2 mpfr > - lfsmake2 libmpc > - lfsmake2 file > - lfsmake2 gcc > - lfsmake2 sed > - lfsmake2 autoconf > - lfsmake2 automake > - lfsmake2 berkeley > - lfsmake2 coreutils > - lfsmake2 iana-etc > - lfsmake2 m4 > - lfsmake2 bison > - lfsmake2 ncurses > - lfsmake2 procps > - lfsmake2 libtool > - lfsmake2 perl > - lfsmake2 readline > - lfsmake2 readline-compat > - lfsmake2 bzip2 > - lfsmake2 xz > - lfsmake2 pcre > - lfsmake2 pcre-compat > - lfsmake2 bash > - lfsmake2 diffutils > - lfsmake2 e2fsprogs > - lfsmake2 ed > - lfsmake2 findutils > - lfsmake2 flex > - lfsmake2 gawk > - lfsmake2 gettext > - lfsmake2 grep > - lfsmake2 groff > - lfsmake2 gperf > - lfsmake2 gzip > - lfsmake2 hostname > - lfsmake2 iproute2 > - lfsmake2 jwhois > - lfsmake2 kbd > - lfsmake2 less > - lfsmake2 pkg-config > - lfsmake2 make > - lfsmake2 man > - lfsmake2 kmod > - lfsmake2 net-tools > - lfsmake2 patch > - lfsmake2 psmisc > - lfsmake2 shadow > - lfsmake2 sysklogd > - lfsmake2 sysvinit > - lfsmake2 tar > - lfsmake2 texinfo > - lfsmake2 util-linux > - lfsmake2 udev > - lfsmake2 vim > + LOGFILE=3D"$BASEDIR/log/_build.base.log"; > + export LOGFILE; > + lfsmake2 stage2; > + lfsmake2 linux KCFG=3D"-headers"; > + lfsmake2 man-pages; > + lfsmake2 glibc; > + lfsmake2 tzdata; > + lfsmake2 cleanup-toolchain; > + lfsmake2 zlib; > + lfsmake2 binutils; > + lfsmake2 gmp; > + lfsmake2 gmp-compat; > + lfsmake2 mpfr; > + lfsmake2 libmpc; > + lfsmake2 file; > + lfsmake2 gcc; > + lfsmake2 sed; > + lfsmake2 autoconf; > + lfsmake2 automake; > + lfsmake2 berkeley; > + lfsmake2 coreutils; > + lfsmake2 iana-etc; > + lfsmake2 m4; > + lfsmake2 bison; > + lfsmake2 ncurses; > + lfsmake2 procps; > + lfsmake2 libtool; > + lfsmake2 perl; > + lfsmake2 readline; > + lfsmake2 readline-compat; > + lfsmake2 bzip2; > + lfsmake2 xz; > + lfsmake2 pcre; > + lfsmake2 pcre-compat; > + lfsmake2 bash; > + lfsmake2 diffutils; > + lfsmake2 e2fsprogs; > + lfsmake2 ed; > + lfsmake2 findutils; > + lfsmake2 flex; > + lfsmake2 gawk; > + lfsmake2 gettext; > + lfsmake2 grep; > + lfsmake2 groff; > + lfsmake2 gperf; > + lfsmake2 gzip; > + lfsmake2 hostname; > + lfsmake2 iproute2; > + lfsmake2 jwhois; > + lfsmake2 kbd; > + lfsmake2 less; > + lfsmake2 pkg-config; > + lfsmake2 make; > + lfsmake2 man; > + lfsmake2 kmod; > + lfsmake2 net-tools; > + lfsmake2 patch; > + lfsmake2 psmisc; > + lfsmake2 shadow; > + lfsmake2 sysklogd; > + lfsmake2 sysvinit; > + lfsmake2 tar; > + lfsmake2 texinfo; > + lfsmake2 util-linux; > + lfsmake2 udev; > + lfsmake2 vim; > } >=20 > buildipfire() { > - LOGFILE=3D"$BASEDIR/log/_build.ipfire.log" > - export LOGFILE > - lfsmake2 configroot > - lfsmake2 initscripts > - lfsmake2 backup > - lfsmake2 openssl > - [ "${BUILD_ARCH}" =3D "i586" ] && lfsmake2 openssl KCFG=3D'-sse2' > - lfsmake2 popt > - lfsmake2 libedit > - lfsmake2 libusb > - lfsmake2 libusb-compat > - lfsmake2 libpcap > - lfsmake2 ppp > - lfsmake2 pptp > - lfsmake2 unzip > - lfsmake2 which > - lfsmake2 linux-firmware > - lfsmake2 dvb-firmwares > - lfsmake2 xr819-firmware > - lfsmake2 zd1211-firmware > - lfsmake2 rpi-firmware > - lfsmake2 intel-microcode > - lfsmake2 pcengines-apu-firmware > - lfsmake2 bc > - lfsmake2 u-boot MKIMAGE=3D1 > - lfsmake2 cpio > - lfsmake2 mdadm > - lfsmake2 dracut > - lfsmake2 libaio > - lfsmake2 lvm2 > - lfsmake2 multipath-tools > - lfsmake2 freetype > - lfsmake2 grub > - lfsmake2 efivar > - lfsmake2 efibootmgr > - lfsmake2 libmnl > - lfsmake2 libnfnetlink > - lfsmake2 libnetfilter_queue > - lfsmake2 libnetfilter_conntrack > - lfsmake2 libnetfilter_cthelper > - lfsmake2 libnetfilter_cttimeout > - lfsmake2 iptables > - lfsmake2 screen > - lfsmake2 elfutils > + LOGFILE=3D"$BASEDIR/log/_build.ipfire.log"; > + export LOGFILE; > + lfsmake2 configroot; > + lfsmake2 initscripts; > + lfsmake2 backup; > + lfsmake2 openssl; > + [ "${BUILD_ARCH}" =3D "i586" ] && lfsmake2 openssl KCFG=3D'-sse2'; > + lfsmake2 popt; > + lfsmake2 libedit; > + lfsmake2 libusb; > + lfsmake2 libusb-compat; > + lfsmake2 libpcap; > + lfsmake2 ppp; > + lfsmake2 pptp; > + lfsmake2 unzip; > + lfsmake2 which; > + lfsmake2 linux-firmware; > + lfsmake2 dvb-firmwares; > + lfsmake2 xr819-firmware; > + lfsmake2 zd1211-firmware; > + lfsmake2 rpi-firmware; > + lfsmake2 intel-microcode; > + lfsmake2 pcengines-apu-firmware; > + lfsmake2 bc; > + lfsmake2 u-boot MKIMAGE=3D1; > + lfsmake2 cpio; > + lfsmake2 mdadm; > + lfsmake2 dracut; > + lfsmake2 libaio; > + lfsmake2 lvm2; > + lfsmake2 multipath-tools; > + lfsmake2 freetype; > + lfsmake2 grub; > + lfsmake2 efivar; > + lfsmake2 efibootmgr; > + lfsmake2 libmnl; > + lfsmake2 libnfnetlink; > + lfsmake2 libnetfilter_queue; > + lfsmake2 libnetfilter_conntrack; > + lfsmake2 libnetfilter_cthelper; > + lfsmake2 libnetfilter_cttimeout; > + lfsmake2 iptables; > + lfsmake2 screen; > + lfsmake2 elfutils; >=20 > case "${BUILD_ARCH}" in > x86_64|aarch64) > - lfsmake2 linux KCFG=3D"" > -# lfsmake2 backports KCFG=3D"" > -# lfsmake2 e1000e KCFG=3D"" > -# lfsmake2 igb KCFG=3D"" > -# lfsmake2 ixgbe KCFG=3D"" > - lfsmake2 xtables-addons KCFG=3D"" > - lfsmake2 linux-initrd KCFG=3D"" > + lfsmake2 linux KCFG=3D""; > +# lfsmake2 backports KCFG=3D""; > +# lfsmake2 e1000e KCFG=3D""; > +# lfsmake2 igb KCFG=3D""; > +# lfsmake2 ixgbe KCFG=3D""; > + lfsmake2 xtables-addons KCFG=3D""; > + lfsmake2 linux-initrd KCFG=3D""; > ;; > i586) > # x86-pae (Native and new XEN) kernel build > - lfsmake2 linux KCFG=3D"-pae" > -# lfsmake2 backports KCFG=3D"-pae" > -# lfsmake2 e1000e KCFG=3D"-pae" > -# lfsmake2 igb KCFG=3D"-pae" > -# lfsmake2 ixgbe KCFG=3D"-pae" > - lfsmake2 xtables-addons KCFG=3D"-pae" > - lfsmake2 linux-initrd KCFG=3D"-pae" > + lfsmake2 linux KCFG=3D"-pae"; > +# lfsmake2 backports KCFG=3D"-pae"; > +# lfsmake2 e1000e KCFG=3D"-pae"; > +# lfsmake2 igb KCFG=3D"-pae"; > +# lfsmake2 ixgbe KCFG=3D"-pae"; > + lfsmake2 xtables-addons KCFG=3D"-pae"; > + lfsmake2 linux-initrd KCFG=3D"-pae"; >=20 > # x86 kernel build > - lfsmake2 linux KCFG=3D"" > -# lfsmake2 backports KCFG=3D"" > -# lfsmake2 e1000e KCFG=3D"" > -# lfsmake2 igb KCFG=3D"" > -# lfsmake2 ixgbe KCFG=3D"" > - lfsmake2 xtables-addons KCFG=3D"" > - lfsmake2 linux-initrd KCFG=3D"" > + lfsmake2 linux KCFG=3D""; > +# lfsmake2 backports KCFG=3D""; > +# lfsmake2 e1000e KCFG=3D""; > +# lfsmake2 igb KCFG=3D""; > +# lfsmake2 ixgbe KCFG=3D""; > + lfsmake2 xtables-addons KCFG=3D""; > + lfsmake2 linux-initrd KCFG=3D""; > ;; >=20 > armv5tel) > # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build > - lfsmake2 linux KCFG=3D"-kirkwood" > -# lfsmake2 backports KCFG=3D"-kirkwood" > -# lfsmake2 e1000e KCFG=3D"-kirkwood" > -# lfsmake2 igb KCFG=3D"-kirkwood" > -# lfsmake2 ixgbe KCFG=3D"-kirkwood" > - lfsmake2 xtables-addons KCFG=3D"-kirkwood" > - lfsmake2 linux-initrd KCFG=3D"-kirkwood" > + lfsmake2 linux KCFG=3D"-kirkwood"; > +# lfsmake2 backports KCFG=3D"-kirkwood"; > +# lfsmake2 e1000e KCFG=3D"-kirkwood"; > +# lfsmake2 igb KCFG=3D"-kirkwood"; > +# lfsmake2 ixgbe KCFG=3D"-kirkwood"; > + lfsmake2 xtables-addons KCFG=3D"-kirkwood"; > + lfsmake2 linux-initrd KCFG=3D"-kirkwood"; >=20 > # arm multi platform (Panda, Wandboard ...) kernel build > - lfsmake2 linux KCFG=3D"-multi" > -# lfsmake2 backports KCFG=3D"-multi" > -# lfsmake2 e1000e KCFG=3D"-multi" > -# lfsmake2 igb KCFG=3D"-multi" > -# lfsmake2 ixgbe KCFG=3D"-multi" > - lfsmake2 xtables-addons KCFG=3D"-multi" > - lfsmake2 linux-initrd KCFG=3D"-multi" > + lfsmake2 linux KCFG=3D"-multi"; > +# lfsmake2 backports KCFG=3D"-multi"; > +# lfsmake2 e1000e KCFG=3D"-multi"; > +# lfsmake2 igb KCFG=3D"-multi"; > +# lfsmake2 ixgbe KCFG=3D"-multi"; > + lfsmake2 xtables-addons KCFG=3D"-multi"; > + lfsmake2 linux-initrd KCFG=3D"-multi"; > ;; > esac > - lfsmake2 xtables-addons USPACE=3D"1" > - lfsmake2 libgpg-error > - lfsmake2 libgcrypt > - lfsmake2 libassuan > - lfsmake2 nettle > - lfsmake2 json-c > - lfsmake2 libconfig > - lfsmake2 libevent > - lfsmake2 libevent2 > - lfsmake2 expat > - lfsmake2 apr > - lfsmake2 aprutil > - lfsmake2 unbound > - lfsmake2 gnutls > - lfsmake2 bind > - lfsmake2 dhcp > - lfsmake2 dhcpcd > - lfsmake2 boost > - lfsmake2 linux-atm > - lfsmake2 gdbm > - lfsmake2 pam > - lfsmake2 curl > - lfsmake2 tcl > - lfsmake2 sqlite > - lfsmake2 libffi > - lfsmake2 python > - lfsmake2 python3 > - lfsmake2 ca-certificates > - lfsmake2 fireinfo > - lfsmake2 libnet > - lfsmake2 libnl > - lfsmake2 libnl-3 > - lfsmake2 libidn > - lfsmake2 nasm > - lfsmake2 libjpeg > - lfsmake2 libjpeg-compat > - lfsmake2 libexif > - lfsmake2 libpng > - lfsmake2 libtiff > - lfsmake2 libart > - lfsmake2 gd > - lfsmake2 slang > - lfsmake2 newt > - lfsmake2 libsmooth > - lfsmake2 attr > - lfsmake2 acl > - lfsmake2 libcap > - lfsmake2 libcap-ng > - lfsmake2 pciutils > - lfsmake2 usbutils > - lfsmake2 libxml2 > - lfsmake2 libxslt > - lfsmake2 BerkeleyDB > - lfsmake2 cyrus-sasl > - lfsmake2 openldap > - lfsmake2 apache2 > - lfsmake2 web-user-interface > - lfsmake2 flag-icons > - lfsmake2 jquery > - lfsmake2 bootstrap > - lfsmake2 arping > - lfsmake2 beep > - lfsmake2 libarchive > - lfsmake2 cmake > - lfsmake2 cdrkit > - lfsmake2 dosfstools > - lfsmake2 reiserfsprogs > - lfsmake2 xfsprogs > - lfsmake2 sysfsutils > - lfsmake2 fuse > - lfsmake2 ntfs-3g > - lfsmake2 ethtool > - lfsmake2 ez-ipupdate > - lfsmake2 fcron > - lfsmake2 perl-GD > - lfsmake2 GD-Graph > - lfsmake2 GD-TextUtil > - lfsmake2 perl-Device-SerialPort > - lfsmake2 perl-Device-Modem > - lfsmake2 perl-Apache-Htpasswd > - lfsmake2 gnupg > - lfsmake2 hdparm > - lfsmake2 sdparm > - lfsmake2 mtools > - lfsmake2 whatmask > - lfsmake2 conntrack-tools > - lfsmake2 libupnp > - lfsmake2 ipaddr > - lfsmake2 iputils > - lfsmake2 l7-protocols > - lfsmake2 hwdata > - lfsmake2 logrotate > - lfsmake2 logwatch > - lfsmake2 misc-progs > - lfsmake2 nano > - lfsmake2 URI > - lfsmake2 HTML-Tagset > - lfsmake2 HTML-Parser > - lfsmake2 HTML-Template > - lfsmake2 Compress-Zlib > - lfsmake2 Digest > - lfsmake2 Digest-SHA1 > - lfsmake2 Digest-HMAC > - lfsmake2 libwww-perl > - lfsmake2 Net-DNS > - lfsmake2 Net-IPv4Addr > - lfsmake2 Net_SSLeay > - lfsmake2 IO-Stringy > - lfsmake2 IO-Socket-SSL > - lfsmake2 Unix-Syslog > - lfsmake2 Mail-Tools > - lfsmake2 MIME-Tools > - lfsmake2 Net-Server > - lfsmake2 Convert-TNEF > - lfsmake2 Convert-UUlib > - lfsmake2 Archive-Tar > - lfsmake2 Archive-Zip > - lfsmake2 Text-Tabs+Wrap > - lfsmake2 Locale-Country > - lfsmake2 XML-Parser > - lfsmake2 Crypt-PasswdMD5 > - lfsmake2 Net-Telnet > - lfsmake2 python-setuptools > - lfsmake2 python-clientform > - lfsmake2 python-mechanize > - lfsmake2 python-feedparser > - lfsmake2 python-rssdler > - lfsmake2 python-inotify > - lfsmake2 python-docutils > - lfsmake2 python-daemon > - lfsmake2 python-ipaddress > - lfsmake2 glib > - lfsmake2 GeoIP > - lfsmake2 ntp > - lfsmake2 openssh > - lfsmake2 fontconfig > - lfsmake2 dejavu-fonts-ttf > - lfsmake2 ubuntu-font-family > - lfsmake2 freefont > - lfsmake2 pixman > - lfsmake2 cairo > - lfsmake2 pango > - lfsmake2 rrdtool > - lfsmake2 setserial > - lfsmake2 setup > - lfsmake2 libdnet > - lfsmake2 yaml > - lfsmake2 libhtp > - lfsmake2 suricata > - lfsmake2 oinkmaster > - lfsmake2 ids-ruleset-sources > - lfsmake2 squid > - lfsmake2 squidguard > - lfsmake2 calamaris > - lfsmake2 tcpdump > - lfsmake2 traceroute > - lfsmake2 vlan > - lfsmake2 wireless > - lfsmake2 pakfire > - lfsmake2 spandsp > - lfsmake2 lz4 > - lfsmake2 lzo > - lfsmake2 openvpn > - lfsmake2 mpage > - lfsmake2 dbus > - lfsmake2 intltool > - lfsmake2 libdaemon > - lfsmake2 avahi > - lfsmake2 cups > - lfsmake2 lcms2 > - lfsmake2 ghostscript > - lfsmake2 qpdf > - lfsmake2 poppler > - lfsmake2 cups-filters > - lfsmake2 epson-inkjet-printer-escpr > - lfsmake2 foomatic > - lfsmake2 hplip > - lfsmake2 cifs-utils > - lfsmake2 krb5 > - lfsmake2 samba > - lfsmake2 sudo > - lfsmake2 mc > - lfsmake2 wget > - lfsmake2 bridge-utils > - lfsmake2 smartmontools > - lfsmake2 htop > - lfsmake2 chkconfig > - lfsmake2 postfix > - lfsmake2 fetchmail > - lfsmake2 cyrus-imapd > - lfsmake2 clamav > - lfsmake2 spamassassin > - lfsmake2 amavisd > - lfsmake2 dma > - lfsmake2 alsa > - lfsmake2 mpfire > - lfsmake2 guardian > - lfsmake2 libid3tag > - lfsmake2 libmad > - lfsmake2 libogg > - lfsmake2 libvorbis > - lfsmake2 libdvbpsi > - lfsmake2 flac > - lfsmake2 lame > - lfsmake2 sox > - lfsmake2 soxr > - lfsmake2 libshout > - lfsmake2 xvid > - lfsmake2 libmpeg2 > - lfsmake2 gnump3d > - lfsmake2 rsync > - lfsmake2 libtirpc > - lfsmake2 rpcbind > - lfsmake2 keyutils > - lfsmake2 nfs > - lfsmake2 gnu-netcat > - lfsmake2 ncat > - lfsmake2 nmap > - lfsmake2 etherwake > - lfsmake2 bwm-ng > - lfsmake2 sysstat > - lfsmake2 strongswan > - lfsmake2 rng-tools > - lfsmake2 lsof > - lfsmake2 br2684ctl > - lfsmake2 pcmciautils > - lfsmake2 lm_sensors > - lfsmake2 liboping > - lfsmake2 collectd > - lfsmake2 elinks > - lfsmake2 igmpproxy > - lfsmake2 fbset > - lfsmake2 opus > - lfsmake2 python-six > - lfsmake2 python-pyparsing > - lfsmake2 spice-protocol > - lfsmake2 spice > - lfsmake2 sdl > - lfsmake2 libusbredir > - lfsmake2 qemu > - lfsmake2 sane > - lfsmake2 netpbm > - lfsmake2 netsnmpd > - lfsmake2 nagios_nrpe > - lfsmake2 nagios-plugins > - lfsmake2 icinga > - lfsmake2 observium-agent > - lfsmake2 ebtables > - lfsmake2 directfb > - lfsmake2 faad2 > - lfsmake2 alac > - lfsmake2 ffmpeg > - lfsmake2 vdr > - lfsmake2 vdr_streamdev > - lfsmake2 vdr_epgsearch > - lfsmake2 vdr_dvbapi > - lfsmake2 vdr_eepg > - lfsmake2 w_scan > - lfsmake2 icecast > - lfsmake2 icegenerator > - lfsmake2 mpd > - lfsmake2 libmpdclient > - lfsmake2 mpc > - lfsmake2 perl-Net-CIDR-Lite > - lfsmake2 perl-Net-SMTP-SSL > - lfsmake2 perl-MIME-Base64 > - lfsmake2 perl-Authen-SASL > - lfsmake2 perl-MIME-Lite > - lfsmake2 perl-Email-Date-Format > - lfsmake2 git > - lfsmake2 squidclamav > - lfsmake2 vnstat > - lfsmake2 iw > - lfsmake2 wpa_supplicant > - lfsmake2 hostapd > - lfsmake2 pycurl > - lfsmake2 urlgrabber > - lfsmake2 syslinux > - lfsmake2 tftpd > - lfsmake2 cpufrequtils > - lfsmake2 bluetooth > - lfsmake2 gutenprint > - lfsmake2 apcupsd > - lfsmake2 iperf > - lfsmake2 iperf3 > - lfsmake2 7zip > - lfsmake2 lynis > - lfsmake2 streamripper > - lfsmake2 sshfs > - lfsmake2 taglib > - lfsmake2 sslh > - lfsmake2 perl-gettext > - lfsmake2 perl-Sort-Naturally > - lfsmake2 vdradmin > - lfsmake2 miau > - lfsmake2 perl-DBI > - lfsmake2 perl-DBD-SQLite > - lfsmake2 perl-File-ReadBackwards > - lfsmake2 openvmtools > - lfsmake2 motion > - lfsmake2 joe > - lfsmake2 monit > - lfsmake2 nut > - lfsmake2 watchdog > - lfsmake2 libpri > - lfsmake2 libsrtp > - lfsmake2 jansson > - lfsmake2 asterisk > - lfsmake2 usb_modeswitch > - lfsmake2 usb_modeswitch_data > - lfsmake2 zerofree > - lfsmake2 minicom > - lfsmake2 ddrescue > - lfsmake2 miniupnpd > - lfsmake2 client175 > - lfsmake2 powertop > - lfsmake2 parted > - lfsmake2 swig > - lfsmake2 u-boot > - lfsmake2 u-boot-kirkwood > - lfsmake2 python-typing > - lfsmake2 python-m2crypto > - lfsmake2 wireless-regdb > - lfsmake2 crda > - lfsmake2 libsolv > - lfsmake2 python-distutils-extra > - lfsmake2 python-lzma > - lfsmake2 python-progressbar > - lfsmake2 python-xattr > - lfsmake2 ddns > - lfsmake2 python3-setuptools > - lfsmake2 python3-setuptools-scm > - lfsmake2 python3-six > - lfsmake2 python3-dateutil > - lfsmake2 python3-jmespath > - lfsmake2 python3-colorama > - lfsmake2 python3-docutils > - lfsmake2 python3-yaml > - lfsmake2 python3-s3transfer > - lfsmake2 python3-rsa > - lfsmake2 python3-pyasn1 > - lfsmake2 python3-botocore > - lfsmake2 python3-llfuse > - lfsmake2 python3-msgpack > - lfsmake2 aws-cli > - lfsmake2 transmission > - lfsmake2 dpfhack > - lfsmake2 lcd4linux > - lfsmake2 mtr > - lfsmake2 minidlna > - lfsmake2 acpid > - lfsmake2 fping > - lfsmake2 telnet > - lfsmake2 xinetd > - lfsmake2 gpgme > - lfsmake2 pygpgme > - lfsmake2 pakfire3 > - lfsmake2 stress > - lfsmake2 libstatgrab > - lfsmake2 sarg > - lfsmake2 check_mk_agent > - lfsmake2 nginx > - lfsmake2 sendEmail > - lfsmake2 sysbench > - lfsmake2 strace > - lfsmake2 ltrace > - lfsmake2 ipfire-netboot > - lfsmake2 lcdproc > - lfsmake2 bitstream > - lfsmake2 multicat > - lfsmake2 keepalived > - lfsmake2 ipvsadm > - lfsmake2 perl-Carp-Clan > - lfsmake2 perl-Date-Calc > - lfsmake2 perl-Date-Manip > - lfsmake2 perl-File-Tail > - lfsmake2 perl-TimeDate > - lfsmake2 swatch > - lfsmake2 tor > - lfsmake2 arm > - lfsmake2 wavemon > - lfsmake2 iptraf-ng > - lfsmake2 iotop > - lfsmake2 stunnel > - lfsmake2 bacula > - lfsmake2 batctl > - lfsmake2 perl-Font-TTF > - lfsmake2 perl-IO-String > - lfsmake2 perl-PDF-API2 > - lfsmake2 squid-accounting > - lfsmake2 pigz > - lfsmake2 tmux > - lfsmake2 perl-Text-CSV_XS > - lfsmake2 haproxy > - lfsmake2 ipset > - lfsmake2 lua > - lfsmake2 dnsdist > - lfsmake2 bird > - lfsmake2 frr > - lfsmake2 dmidecode > - lfsmake2 mcelog > - lfsmake2 rtpproxy > - lfsmake2 util-macros > - lfsmake2 libpciaccess > - lfsmake2 libyajl > - lfsmake2 libvirt > - lfsmake2 freeradius > - lfsmake2 perl-common-sense > - lfsmake2 perl-inotify2 > - lfsmake2 perl-Net-IP > - lfsmake2 wio > - lfsmake2 iftop > - lfsmake2 mdns-repeater > - lfsmake2 i2c-tools > - lfsmake2 nss-myhostname > - lfsmake2 dehydrated > - lfsmake2 shairport-sync > - lfsmake2 borgbackup > - lfsmake2 knot > - lfsmake2 spectre-meltdown-checker > - lfsmake2 zabbix_agentd > - lfsmake2 flashrom > - lfsmake2 firmware-update > + lfsmake2 xtables-addons USPACE=3D"1"; > + lfsmake2 libgpg-error; > + lfsmake2 libgcrypt; > + lfsmake2 libassuan; > + lfsmake2 nettle; > + lfsmake2 json-c; > + lfsmake2 libconfig; > + lfsmake2 libevent; > + lfsmake2 libevent2; > + lfsmake2 expat; > + lfsmake2 apr; > + lfsmake2 aprutil; > + lfsmake2 unbound; > + lfsmake2 gnutls; > + lfsmake2 bind; > + lfsmake2 dhcp; > + lfsmake2 dhcpcd; > + lfsmake2 boost; > + lfsmake2 linux-atm; > + lfsmake2 gdbm; > + lfsmake2 pam; > + lfsmake2 curl; > + lfsmake2 tcl; > + lfsmake2 sqlite; > + lfsmake2 libffi; > + lfsmake2 python; > + lfsmake2 python3; > + lfsmake2 ca-certificates; > + lfsmake2 fireinfo; > + lfsmake2 libnet; > + lfsmake2 libnl; > + lfsmake2 libnl-3; > + lfsmake2 libidn; > + lfsmake2 nasm; > + lfsmake2 libjpeg; > + lfsmake2 libjpeg-compat; > + lfsmake2 libexif; > + lfsmake2 libpng; > + lfsmake2 libtiff; > + lfsmake2 libart; > + lfsmake2 gd; > + lfsmake2 slang; > + lfsmake2 newt; > + lfsmake2 libsmooth; > + lfsmake2 attr; > + lfsmake2 acl; > + lfsmake2 libcap; > + lfsmake2 libcap-ng; > + lfsmake2 pciutils; > + lfsmake2 usbutils; > + lfsmake2 libxml2; > + lfsmake2 libxslt; > + lfsmake2 BerkeleyDB; > + lfsmake2 cyrus-sasl; > + lfsmake2 openldap; > + lfsmake2 apache2; > + lfsmake2 web-user-interface; > + lfsmake2 flag-icons; > + lfsmake2 jquery; > + lfsmake2 bootstrap; > + lfsmake2 arping; > + lfsmake2 beep; > + lfsmake2 libarchive; > + lfsmake2 cmake; > + lfsmake2 cdrkit; > + lfsmake2 dosfstools; > + lfsmake2 reiserfsprogs; > + lfsmake2 xfsprogs; > + lfsmake2 sysfsutils; > + lfsmake2 fuse; > + lfsmake2 ntfs-3g; > + lfsmake2 ethtool; > + lfsmake2 ez-ipupdate; > + lfsmake2 fcron; > + lfsmake2 perl-GD; > + lfsmake2 GD-Graph; > + lfsmake2 GD-TextUtil; > + lfsmake2 perl-Device-SerialPort; > + lfsmake2 perl-Device-Modem; > + lfsmake2 perl-Apache-Htpasswd; > + lfsmake2 gnupg; > + lfsmake2 hdparm; > + lfsmake2 sdparm; > + lfsmake2 mtools; > + lfsmake2 whatmask; > + lfsmake2 conntrack-tools; > + lfsmake2 libupnp; > + lfsmake2 ipaddr; > + lfsmake2 iputils; > + lfsmake2 l7-protocols; > + lfsmake2 hwdata; > + lfsmake2 logrotate; > + lfsmake2 logwatch; > + lfsmake2 misc-progs; > + lfsmake2 nano; > + lfsmake2 URI; > + lfsmake2 HTML-Tagset; > + lfsmake2 HTML-Parser; > + lfsmake2 HTML-Template; > + lfsmake2 Compress-Zlib; > + lfsmake2 Digest; > + lfsmake2 Digest-SHA1; > + lfsmake2 Digest-HMAC; > + lfsmake2 libwww-perl; > + lfsmake2 Net-DNS; > + lfsmake2 Net-IPv4Addr; > + lfsmake2 Net_SSLeay; > + lfsmake2 IO-Stringy; > + lfsmake2 IO-Socket-SSL; > + lfsmake2 Unix-Syslog; > + lfsmake2 Mail-Tools; > + lfsmake2 MIME-Tools; > + lfsmake2 Net-Server; > + lfsmake2 Convert-TNEF; > + lfsmake2 Convert-UUlib; > + lfsmake2 Archive-Tar; > + lfsmake2 Archive-Zip; > + lfsmake2 Text-Tabs+Wrap; > + lfsmake2 Locale-Country; > + lfsmake2 XML-Parser; > + lfsmake2 Crypt-PasswdMD5; > + lfsmake2 Net-Telnet; > + lfsmake2 python-setuptools; > + lfsmake2 python-clientform; > + lfsmake2 python-mechanize; > + lfsmake2 python-feedparser; > + lfsmake2 python-rssdler; > + lfsmake2 python-inotify; > + lfsmake2 python-docutils; > + lfsmake2 python-daemon; > + lfsmake2 python-ipaddress; > + lfsmake2 glib; > + lfsmake2 GeoIP; > + lfsmake2 ntp; > + lfsmake2 openssh; > + lfsmake2 fontconfig; > + lfsmake2 dejavu-fonts-ttf; > + lfsmake2 ubuntu-font-family; > + lfsmake2 freefont; > + lfsmake2 pixman; > + lfsmake2 cairo; > + lfsmake2 pango; > + lfsmake2 rrdtool; > + lfsmake2 setserial; > + lfsmake2 setup; > + lfsmake2 libdnet; > + lfsmake2 yaml; > + lfsmake2 libhtp; > + lfsmake2 suricata; > + lfsmake2 oinkmaster; > + lfsmake2 ids-ruleset-sources; > + lfsmake2 squid; > + lfsmake2 squidguard; > + lfsmake2 calamaris; > + lfsmake2 tcpdump; > + lfsmake2 traceroute; > + lfsmake2 vlan; > + lfsmake2 wireless; > + lfsmake2 pakfire; > + lfsmake2 spandsp; > + lfsmake2 lz4; > + lfsmake2 lzo; > + lfsmake2 openvpn; > + lfsmake2 mpage; > + lfsmake2 dbus; > + lfsmake2 intltool; > + lfsmake2 libdaemon; > + lfsmake2 avahi; > + lfsmake2 cups; > + lfsmake2 lcms2; > + lfsmake2 ghostscript; > + lfsmake2 qpdf; > + lfsmake2 poppler; > + lfsmake2 cups-filters; > + lfsmake2 epson-inkjet-printer-escpr; > + lfsmake2 foomatic; > + lfsmake2 hplip; > + lfsmake2 cifs-utils; > + lfsmake2 krb5; > + lfsmake2 samba; > + lfsmake2 sudo; > + lfsmake2 mc; > + lfsmake2 wget; > + lfsmake2 bridge-utils; > + lfsmake2 smartmontools; > + lfsmake2 htop; > + lfsmake2 chkconfig; > + lfsmake2 postfix; > + lfsmake2 fetchmail; > + lfsmake2 cyrus-imapd; > + lfsmake2 clamav; > + lfsmake2 spamassassin; > + lfsmake2 amavisd; > + lfsmake2 dma; > + lfsmake2 alsa; > + lfsmake2 mpfire; > + lfsmake2 guardian; > + lfsmake2 libid3tag; > + lfsmake2 libmad; > + lfsmake2 libogg; > + lfsmake2 libvorbis; > + lfsmake2 libdvbpsi; > + lfsmake2 flac; > + lfsmake2 lame; > + lfsmake2 sox; > + lfsmake2 soxr; > + lfsmake2 libshout; > + lfsmake2 xvid; > + lfsmake2 libmpeg2; > + lfsmake2 gnump3d; > + lfsmake2 rsync; > + lfsmake2 libtirpc; > + lfsmake2 rpcbind; > + lfsmake2 keyutils; > + lfsmake2 nfs; > + lfsmake2 gnu-netcat; > + lfsmake2 ncat; > + lfsmake2 nmap; > + lfsmake2 etherwake; > + lfsmake2 bwm-ng; > + lfsmake2 sysstat; > + lfsmake2 strongswan; > + lfsmake2 rng-tools; > + lfsmake2 lsof; > + lfsmake2 br2684ctl; > + lfsmake2 pcmciautils; > + lfsmake2 lm_sensors; > + lfsmake2 liboping; > + lfsmake2 collectd; > + lfsmake2 elinks; > + lfsmake2 igmpproxy; > + lfsmake2 fbset; > + lfsmake2 opus; > + lfsmake2 python-six; > + lfsmake2 python-pyparsing; > + lfsmake2 spice-protocol; > + lfsmake2 spice; > + lfsmake2 sdl; > + lfsmake2 libusbredir; > + lfsmake2 qemu; > + lfsmake2 sane; > + lfsmake2 netpbm; > + lfsmake2 netsnmpd; > + lfsmake2 nagios_nrpe; > + lfsmake2 nagios-plugins; > + lfsmake2 icinga; > + lfsmake2 observium-agent; > + lfsmake2 ebtables; > + lfsmake2 directfb; > + lfsmake2 faad2; > + lfsmake2 alac; > + lfsmake2 ffmpeg; > + lfsmake2 vdr; > + lfsmake2 vdr_streamdev; > + lfsmake2 vdr_epgsearch; > + lfsmake2 vdr_dvbapi; > + lfsmake2 vdr_eepg; > + lfsmake2 w_scan; > + lfsmake2 icecast; > + lfsmake2 icegenerator; > + lfsmake2 mpd; > + lfsmake2 libmpdclient; > + lfsmake2 mpc; > + lfsmake2 perl-Net-CIDR-Lite; > + lfsmake2 perl-Net-SMTP-SSL; > + lfsmake2 perl-MIME-Base64; > + lfsmake2 perl-Authen-SASL; > + lfsmake2 perl-MIME-Lite; > + lfsmake2 perl-Email-Date-Format; > + lfsmake2 git; > + lfsmake2 squidclamav; > + lfsmake2 vnstat; > + lfsmake2 iw; > + lfsmake2 wpa_supplicant; > + lfsmake2 hostapd; > + lfsmake2 pycurl; > + lfsmake2 urlgrabber; > + lfsmake2 syslinux; > + lfsmake2 tftpd; > + lfsmake2 cpufrequtils; > + lfsmake2 bluetooth; > + lfsmake2 gutenprint; > + lfsmake2 apcupsd; > + lfsmake2 iperf; > + lfsmake2 iperf3; > + lfsmake2 7zip; > + lfsmake2 lynis; > + lfsmake2 streamripper; > + lfsmake2 sshfs; > + lfsmake2 taglib; > + lfsmake2 sslh; > + lfsmake2 perl-gettext; > + lfsmake2 perl-Sort-Naturally; > + lfsmake2 vdradmin; > + lfsmake2 miau; > + lfsmake2 perl-DBI; > + lfsmake2 perl-DBD-SQLite; > + lfsmake2 perl-File-ReadBackwards; > + lfsmake2 openvmtools; > + lfsmake2 motion; > + lfsmake2 joe; > + lfsmake2 monit; > + lfsmake2 nut; > + lfsmake2 watchdog; > + lfsmake2 libpri; > + lfsmake2 libsrtp; > + lfsmake2 jansson; > + lfsmake2 asterisk; > + lfsmake2 usb_modeswitch; > + lfsmake2 usb_modeswitch_data; > + lfsmake2 zerofree; > + lfsmake2 minicom; > + lfsmake2 ddrescue; > + lfsmake2 miniupnpd; > + lfsmake2 client175; > + lfsmake2 powertop; > + lfsmake2 parted; > + lfsmake2 swig; > + lfsmake2 u-boot; > + lfsmake2 u-boot-kirkwood; > + lfsmake2 python-typing; > + lfsmake2 python-m2crypto; > + lfsmake2 wireless-regdb; > + lfsmake2 crda; > + lfsmake2 libsolv; > + lfsmake2 python-distutils-extra; > + lfsmake2 python-lzma; > + lfsmake2 python-progressbar; > + lfsmake2 python-xattr; > + lfsmake2 ddns; > + lfsmake2 python3-setuptools; > + lfsmake2 python3-setuptools-scm; > + lfsmake2 python3-six; > + lfsmake2 python3-dateutil; > + lfsmake2 python3-jmespath; > + lfsmake2 python3-colorama; > + lfsmake2 python3-docutils; > + lfsmake2 python3-yaml; > + lfsmake2 python3-s3transfer; > + lfsmake2 python3-rsa; > + lfsmake2 python3-pyasn1; > + lfsmake2 python3-botocore; > + lfsmake2 python3-llfuse; > + lfsmake2 python3-msgpack; > + lfsmake2 aws-cli; > + lfsmake2 transmission; > + lfsmake2 dpfhack; > + lfsmake2 lcd4linux; > + lfsmake2 mtr; > + lfsmake2 minidlna; > + lfsmake2 acpid; > + lfsmake2 fping; > + lfsmake2 telnet; > + lfsmake2 xinetd; > + lfsmake2 gpgme; > + lfsmake2 pygpgme; > + lfsmake2 pakfire3; > + lfsmake2 stress; > + lfsmake2 libstatgrab; > + lfsmake2 sarg; > + lfsmake2 check_mk_agent; > + lfsmake2 nginx; > + lfsmake2 sendEmail; > + lfsmake2 sysbench; > + lfsmake2 strace; > + lfsmake2 ltrace; > + lfsmake2 ipfire-netboot; > + lfsmake2 lcdproc; > + lfsmake2 bitstream; > + lfsmake2 multicat; > + lfsmake2 keepalived; > + lfsmake2 ipvsadm; > + lfsmake2 perl-Carp-Clan; > + lfsmake2 perl-Date-Calc; > + lfsmake2 perl-Date-Manip; > + lfsmake2 perl-File-Tail; > + lfsmake2 perl-TimeDate; > + lfsmake2 swatch; > + lfsmake2 tor; > + lfsmake2 arm; > + lfsmake2 wavemon; > + lfsmake2 iptraf-ng; > + lfsmake2 iotop; > + lfsmake2 stunnel; > + lfsmake2 bacula; > + lfsmake2 batctl; > + lfsmake2 perl-Font-TTF; > + lfsmake2 perl-IO-String; > + lfsmake2 perl-PDF-API2; > + lfsmake2 squid-accounting; > + lfsmake2 pigz; > + lfsmake2 tmux; > + lfsmake2 perl-Text-CSV_XS; > + lfsmake2 haproxy; > + lfsmake2 ipset; > + lfsmake2 lua; > + lfsmake2 dnsdist; > + lfsmake2 bird; > + lfsmake2 frr; > + lfsmake2 dmidecode; > + lfsmake2 mcelog; > + lfsmake2 rtpproxy; > + lfsmake2 util-macros; > + lfsmake2 libpciaccess; > + lfsmake2 libyajl; > + lfsmake2 libvirt; > + lfsmake2 freeradius; > + lfsmake2 perl-common-sense; > + lfsmake2 perl-inotify2; > + lfsmake2 perl-Net-IP; > + lfsmake2 wio; > + lfsmake2 iftop; > + lfsmake2 mdns-repeater; > + lfsmake2 i2c-tools; > + lfsmake2 nss-myhostname; > + lfsmake2 dehydrated; > + lfsmake2 shairport-sync; > + lfsmake2 borgbackup; > + lfsmake2 knot; > + lfsmake2 spectre-meltdown-checker; > + lfsmake2 zabbix_agentd; > + lfsmake2 flashrom; > + lfsmake2 firmware-update; > } >=20 > buildinstaller() { > # Run installer scripts one by one > - LOGFILE=3D"$BASEDIR/log/_build.installer.log" > - export LOGFILE > - lfsmake2 memtest > - lfsmake2 installer > + LOGFILE=3D"$BASEDIR/log/_build.installer.log"; > + export LOGFILE; > + lfsmake2 memtest; > + lfsmake2 installer; > # use toolchain bash for chroot to strip > - EXTRA_PATH=3D${TOOLS_DIR}/bin/ lfsmake2 strip > + EXTRA_PATH=3D${TOOLS_DIR}/bin/ lfsmake2 strip; > } >=20 > buildpackages() { > - LOGFILE=3D"$BASEDIR/log/_build.packages.log" > - export LOGFILE > - echo "... see detailed log in _build.*.log files" >> $LOGFILE > + LOGFILE=3D"$BASEDIR/log/_build.packages.log"; > + export LOGFILE; > + echo "... see detailed log in _build.*.log files" >> $LOGFILE; > + >=20 > - =20 > # Generating list of packages used > - print_line "Generating packages list from logs" > - rm -f $BASEDIR/doc/packages-list > + print_line "Generating packages list from logs"; > + rm -f $BASEDIR/doc/packages-list; > for i in `ls -1tr $BASEDIR/log/[^_]*`; do > - if [ "$i" !=3D "$BASEDIR/log/FILES" -a -n $i ]; then > - echo "* `basename $i`" >>$BASEDIR/doc/packages-list > - fi > + if [ "$i" !=3D "$BASEDIR/log/FILES" -a -n $i ]; then > + echo "* `basename $i`" >>$BASEDIR/doc/packages-list; > + fi > done > - echo "=3D=3D List of softwares used to build $NAME Version: $VERSION =3D= =3D" > $BASEDIR/doc/packages-list.txt > + > + echo "=3D=3D List of softwares used to build $NAME Version: $VERSION =3D= =3D" > $BASEDIR/doc/packages-list.txt; > grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|= setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$\|-config$\|_= missing_rootfile$\|install1$\|install2$\|pass1$\|pass2$\|pass3$' \ > - $BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt > - rm -f $BASEDIR/doc/packages-list > + $BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt; > + rm -f $BASEDIR/doc/packages-list; > # packages-list.txt is ready to be displayed for wiki page > - print_status DONE > - =20 > + print_status DONE; > + > # Update changelog > - cd $BASEDIR > - [ -z $GIT_TAG ] || LAST_TAG=3D$GIT_TAG > - [ -z $LAST_TAG ] || EXT=3D"$LAST_TAG..HEAD" > - git log -n 500 --no-merges --pretty=3Dmedium --shortstat $EXT > $BASEDIR= /doc/ChangeLog > + cd $BASEDIR; > + [ -z $GIT_TAG ] || LAST_TAG=3D$GIT_TAG; > + [ -z $LAST_TAG ] || EXT=3D"$LAST_TAG..HEAD"; > + git log -n 500 --no-merges --pretty=3Dmedium --shortstat $EXT > $BASEDIR= /doc/ChangeLog; >=20 > # Create images for install > - lfsmake2 cdrom > + lfsmake2 cdrom; >=20 > # Check if there is a loop device for building in virtual environments > - modprobe loop 2>/dev/null > + modprobe loop 2> /dev/null; > if [ $BUILD_IMAGES =3D=3D 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]= || [ -e "/dev/loop-control" ]); then > - lfsmake2 flash-images > + lfsmake2 flash-images; > fi >=20 > - mv $LFS/install/images/{*.iso,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 > + mv $LFS/install/images/{*.iso,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1; >=20 > - ipfirepackages > + ipfirepackages; >=20 > - lfsmake2 xen-image > - mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 > + lfsmake2 xen-image; > + mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1; >=20 > - cd $BASEDIR > + cd $BASEDIR; >=20 > # remove not useable iso on armv5tel (needed to build flash images) > - [ "${BUILD_ARCH}" =3D "armv5tel" ] && rm -rf *.iso > + [ "${BUILD_ARCH}" =3D "armv5tel" ] && rm -rf *.iso; >=20 > for i in `ls *.bz2 *.img.xz *.iso`; do > - md5sum $i > $i.md5 > + md5sum $i > $i.md5; > done > - cd $PWD > + cd $PWD; >=20 > # Cleanup > - stdumount > - rm -rf $BASEDIR/build/tmp/* > + stdumount; > + rm -rf $BASEDIR/build/tmp/*; >=20 > - cd $PWD > + cd $PWD; > } >=20 > ipfirepackages() { > - lfsmake2 core-updates > + lfsmake2 core-updates; >=20 > - local i > + local i; > for i in $(find $BASEDIR/config/rootfiles/packages{/${BUILD_ARCH},} -maxde= pth 1 -type f); do > - i=3D$(basename ${i}) > + i=3D$(basename ${i}); > if [ -e $BASEDIR/lfs/$i ]; then > - ipfiredist $i > + ipfiredist $i; > else > - echo -n $i > - print_status SKIP > + echo -n $i; > + print_status SKIP; > fi > done > - test -d $BASEDIR/packages || mkdir $BASEDIR/packages > - mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1 > - rm -rf $BASEDIR/build/install/packages/* > + test -d $BASEDIR/packages || mkdir $BASEDIR/packages; > + mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1; > + rm -rf $BASEDIR/build/install/packages/*; > } >=20 > while [ $# -gt 0 ]; do > case "${1}" in > --target=3D*) > - configure_build "${1#--target=3D}" > + configure_build "${1#--target=3D}"; > ;; > -*) > - exiterror "Unknown configuration option: ${1}" > + exiterror "Unknown configuration option: ${1}"; > ;; > *) > # Found a command, so exit options parsing. > - break > + break; > ;; > esac > - shift > + shift; > done >=20 > # See what we're supposed to do > -case "$1" in=20 > +case "$1" in > build) > - START_TIME=3D$(now) > + START_TIME=3D$(now); >=20 > # Clear screen > - ${INTERACTIVE} && clear > + ${INTERACTIVE} && clear; >=20 > - PACKAGE=3D`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$= TOOLCHAINVER-${BUILD_ARCH}.tar.xz 2> /dev/null | head -n 1` > + PACKAGE=3D`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$= TOOLCHAINVER-${BUILD_ARCH}.tar.xz 2> /dev/null | head -n 1`; > #only restore on a clean disk > if [ ! -e "${BASEDIR}/build${TOOLS_DIR}/.toolchain-successful" ]; then > if [ ! -n "$PACKAGE" ]; then > - print_build_stage "Full toolchain compilation" > - prepareenv > - buildtoolchain > + print_build_stage "Full toolchain compilation"; > + prepareenv; > + buildtoolchain; > else > - PACKAGENAME=3D${PACKAGE%.tar.xz} > - print_build_stage "Packaged toolchain compilation" > + PACKAGENAME=3D${PACKAGE%.tar.xz}; > + print_build_stage "Packaged toolchain compilation"; > if [ `md5sum $PACKAGE | awk '{print $1}'` =3D=3D `cat $PACKAGENAME.md5 |= awk '{print $1}'` ]; then > - tar axf $PACKAGE > - prepareenv > + tar axf $PACKAGE; > + prepareenv; > else > - exiterror "$PACKAGENAME md5 did not match, check downloaded package" > + exiterror "$PACKAGENAME md5 did not match, check downloaded package"; > fi > fi > else > - prepareenv > + prepareenv; > fi >=20 > - print_build_stage "Building LFS" > - buildbase > + print_build_stage "Building LFS"; > + buildbase; > + > + print_build_stage "Building IPFire"; > + buildipfire; >=20 > - print_build_stage "Building IPFire" > - buildipfire > + print_build_stage "Building installer"; > + buildinstaller; >=20 > - print_build_stage "Building installer" > - buildinstaller > + print_build_stage "Building packages"; > + buildpackages; >=20 > - print_build_stage "Building packages" > - buildpackages > -=09 > - print_build_stage "Checking Logfiles for new Files" > + print_build_stage "Checking Logfiles for new Files"; >=20 > - cd $BASEDIR > - tools/checknewlog.pl > - tools/checkrootfiles > - cd $PWD > + cd $BASEDIR; > + tools/checknewlog.pl; > + tools/checkrootfiles; > + cd $PWD; >=20 > - print_build_summary $(( $(now) - ${START_TIME} )) > + print_build_summary $(( $(now) - ${START_TIME} )); > ;; > shell) > # enter a shell inside LFS chroot > # may be used to changed kernel settings > - prepareenv > - entershell > + prepareenv; > + entershell; > ;; > clean) > - print_line "Cleaning build directory..." > + print_line "Cleaning build directory..."; >=20 > for i in `mount | grep $BASEDIR | sed 's/^.*loop=3D\(.*\))/\1/'`; do > - $LOSETUP -d $i 2>/dev/null > + $LOSETUP -d $i 2> /dev/null; > done > for i in `mount | grep $BASEDIR | cut -d " " -f 1`; do > - umount $i > + umount $i; > done > - stdumount > + stdumount; > for i in `seq 0 7`; do > - if ( losetup /dev/loop${i} 2>/dev/null | grep -q "/install/images" ); th= en > - umount /dev/loop${i} 2>/dev/null; > - losetup -d /dev/loop${i} 2>/dev/null; > - fi; > + if ( losetup /dev/loop${i} 2> /dev/null | grep -q "/install/images" ); t= hen > + umount /dev/loop${i} 2> /dev/null; > + losetup -d /dev/loop${i} 2> /dev/null; > + fi > done > - rm -rf $BASEDIR/build > - rm -rf $BASEDIR/cdrom > - rm -rf $BASEDIR/packages > - rm -rf $BASEDIR/log > + rm -rf $BASEDIR/build; > + rm -rf $BASEDIR/cdrom; > + rm -rf $BASEDIR/packages; > + rm -rf $BASEDIR/log; > if [ -h "${TOOLS_DIR}" ]; then > - rm -f "${TOOLS_DIR}" > + rm -f "${TOOLS_DIR}"; > fi > - rm -f $BASEDIR/ipfire-* > - print_status DONE > + 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 > + print_status DONE; > else > - print_status FAIL > - exit 1 > + print_status FAIL; > + exit 1; > fi > fi >=20 > # Run the container and enter a shell > - docker run -it --privileged -v "${BASEDIR}:/build" -w "/build" ipfire-bui= lder bash -l > + docker run -it --privileged -v "${BASEDIR}:/build" -w "/build" ipfire-bui= lder bash -l; > ;; > downloadsrc) > if [ ! -d $BASEDIR/cache ]; then > - mkdir $BASEDIR/cache > + mkdir $BASEDIR/cache; > fi > - mkdir -p $BASEDIR/log > - echo -e "${BOLD}Preload all source files${NORMAL}" | tee -a $LOGFILE > - FINISHED=3D0 > - cd $BASEDIR/lfs > + mkdir -p $BASEDIR/log; > + echo -e "${BOLD}Preload all source files${NORMAL}" | tee -a $LOGFILE; > + FINISHED=3D0; > + cd $BASEDIR/lfs; > for c in `seq $MAX_RETRIES`; do > - if (( FINISHED=3D=3D1 )); then=20 > - break > + if (( FINISHED=3D=3D1 )); then > + break; > fi > - FINISHED=3D1 > - cd $BASEDIR/lfs > + FINISHED=3D1; > + cd $BASEDIR/lfs; > for i in *; do > if [ -f "$i" -a "$i" !=3D "Config" ]; then > - lfsmakecommoncheck ${i} || continue > + lfsmakecommoncheck ${i} || continue; >=20 > make -s -f $i LFS_BASEDIR=3D$BASEDIR BUILD_ARCH=3D"${BUILD_ARCH}" \ > - MESSAGE=3D"$i\t ($c/$MAX_RETRIES)" download >> $LOGFILE 2>&1 > + MESSAGE=3D"$i\t ($c/$MAX_RETRIES)" download >> $LOGFILE 2>&1; > if [ $? -ne 0 ]; then > - print_status FAIL > - FINISHED=3D0 > + print_status FAIL; > + FINISHED=3D0; > else > if [ $c -eq 1 ]; then > - print_status DONE > + print_status DONE; > fi > fi > fi > done > done > - echo -e "${BOLD}***Verifying md5sums${NORMAL}" > - ERROR=3D0 > + echo -e "${BOLD}***Verifying md5sums${NORMAL}"; > + ERROR=3D0; > for i in *; do > if [ -f "$i" -a "$i" !=3D "Config" ]; then > - lfsmakecommoncheck ${i} > /dev/null || continue > + lfsmakecommoncheck ${i} > /dev/null || continue; > make -s -f $i LFS_BASEDIR=3D$BASEDIR BUILD_ARCH=3D"${BUILD_ARCH}" \ > - MESSAGE=3D"$i\t " md5 >> $LOGFILE 2>&1 > + MESSAGE=3D"$i\t " md5 >> $LOGFILE 2>&1; > if [ $? -ne 0 ]; then > - echo -ne "MD5 difference in lfs/$i" > - print_status FAIL > - ERROR=3D1 > + echo -ne "MD5 difference in lfs/$i"; > + print_status FAIL; > + ERROR=3D1; > fi > fi > done > if [ $ERROR -eq 0 ]; then > - echo -ne "${BOLD}all files md5sum match${NORMAL}" > - print_status DONE > + echo -ne "${BOLD}all files md5sum match${NORMAL}"; > + print_status DONE; > else > - echo -ne "${BOLD}not all files were correctly download${NORMAL}" > - print_status FAIL > + echo -ne "${BOLD}not all files were correctly download${NORMAL}"; > + print_status FAIL; > fi > - cd - >/dev/null 2>&1 > + cd - > /dev/null 2>&1; > ;; > toolchain) > # Clear screen > - ${INTERACTIVE} && clear > + ${INTERACTIVE} && clear; >=20 > - prepareenv > - print_build_stage "Toolchain compilation (${BUILD_ARCH})" > - 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 > + prepareenv; > + print_build_stage "Toolchain compilation (${BUILD_ARCH})"; > + 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=3D'log/_build.*.log' build/${TOOLS_DIR} = build/bin/sh log | xz ${XZ_OPT} \ > - > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}= .tar.xz > + > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}= .tar.xz; > md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_AR= CH}.tar.xz \ > - > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}= .md5 > - stdumount > + > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}= .md5; > + stdumount; > ;; > gettoolchain) > # arbitrary name to be updated in case of new toolchain package upload > - PACKAGE=3D$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH} > + PACKAGE=3D$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}; > if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.xz ]; then > - URL_TOOLCHAIN=3D`grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }'` > - test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains > - echo "`date -u '+%b %e %T'`: Load toolchain image for ${BUILD_ARCH}" | t= ee -a $LOGFILE > - cd $BASEDIR/cache/toolchains > - wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.xz $URL_TO= OLCHAIN/$PACKAGE.md5 >& /dev/null > + URL_TOOLCHAIN=3D`grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }'`; > + test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains; > + echo "`date -u '+%b %e %T'`: Load toolchain image for ${BUILD_ARCH}" | t= ee -a $LOGFILE; > + cd $BASEDIR/cache/toolchains; > + wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.xz $URL_TO= OLCHAIN/$PACKAGE.md5 >& /dev/null; > if [ $? -ne 0 ]; then > - echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $= {BUILD_ARCH} machine" | tee -a $LOGFILE > + echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $= {BUILD_ARCH} machine" | tee -a $LOGFILE; > else > if [ "`md5sum $PACKAGE.tar.xz | awk '{print $1}'`" =3D "`cat $PACKAGE.md= 5 | awk '{print $1}'`" ]; then > - echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE > + echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE; > else > - exiterror "$PACKAGE.md5 did not match, check downloaded package" > + exiterror "$PACKAGE.md5 did not match, check downloaded package"; > fi > fi > else > - echo "Toolchain is already downloaded. Exiting..." > + echo "Toolchain is already downloaded. Exiting..."; > fi > ;; > uploadsrc) > - PWD=3D`pwd` > - if [ -z $IPFIRE_USER ]; then > - echo -n "You have to setup IPFIRE_USER first. See .config for details." > - print_status FAIL > - exit 1 > + PWD=3D$(pwd); > + if [ -z "$IPFIRE_USER" ]; then > + echo -n "You have to setup IPFIRE_USER first. See .config for details."; > + print_status FAIL; > + exit 1; > fi >=20 > - URL_SOURCE=3D$(grep URL_SOURCE lfs/Config | awk '{ print $3 }') > - REMOTE_FILES=3D$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}) > + URL_SOURCE=3D$(grep URL_SOURCE lfs/Config | awk '{ print $3 }'); > + REMOTE_FILES=3D$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}); >=20 > for file in ${BASEDIR}/cache/*; do > - [ -d "${file}" ] && continue > - grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue > - NEW_FILES=3D"$NEW_FILES $file" > + [ -d "${file}" ] && continue; > + grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue; > + NEW_FILES=3D"$NEW_FILES $file"; > done > - [ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE} > - cd $BASEDIR > - cd $PWD > - exit 0 > + [ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE}; > + cd "$BASEDIR"; > + cd "$PWD"; > + exit 0; > ;; > lang) > - echo -ne "Checking the translations for missing or obsolete strings..." > - chmod 755 $BASEDIR/tools/{check_strings.pl,sort_strings.pl,check_langs.sh} > - $BASEDIR/tools/sort_strings.pl en > - $BASEDIR/tools/sort_strings.pl de > - $BASEDIR/tools/sort_strings.pl fr > - $BASEDIR/tools/sort_strings.pl es > - $BASEDIR/tools/sort_strings.pl pl > - $BASEDIR/tools/sort_strings.pl ru > - $BASEDIR/tools/sort_strings.pl nl > - $BASEDIR/tools/sort_strings.pl tr > - $BASEDIR/tools/sort_strings.pl it > - $BASEDIR/tools/check_strings.pl en > $BASEDIR/doc/language_issues.en > - $BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de > - $BASEDIR/tools/check_strings.pl fr > $BASEDIR/doc/language_issues.fr > - $BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.es > - $BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.pl > - $BASEDIR/tools/check_strings.pl ru > $BASEDIR/doc/language_issues.ru > - $BASEDIR/tools/check_strings.pl nl > $BASEDIR/doc/language_issues.nl > - $BASEDIR/tools/check_strings.pl tr > $BASEDIR/doc/language_issues.tr > - $BASEDIR/tools/check_strings.pl it > $BASEDIR/doc/language_issues.it > - $BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings > - print_status DONE > - > - echo -ne "Updating language lists..." > - update_language_list ${BASEDIR}/src/installer/po > - update_language_list ${BASEDIR}/src/setup/po > - print_status DONE > + echo -ne "Checking the translations for missing or obsolete strings..."; > + chmod 755 "$BASEDIR/tools/{check_strings.pl,sort_strings.pl,check_langs.s= h}"; > + $BASEDIR/tools/sort_strings.pl en; > + $BASEDIR/tools/sort_strings.pl de; > + $BASEDIR/tools/sort_strings.pl fr; > + $BASEDIR/tools/sort_strings.pl es; > + $BASEDIR/tools/sort_strings.pl pl; > + $BASEDIR/tools/sort_strings.pl ru; > + $BASEDIR/tools/sort_strings.pl nl; > + $BASEDIR/tools/sort_strings.pl tr; > + $BASEDIR/tools/sort_strings.pl it; > + $BASEDIR/tools/check_strings.pl en > "$BASEDIR/doc/language_issues.en"; > + $BASEDIR/tools/check_strings.pl de > "$BASEDIR/doc/language_issues.de"; > + $BASEDIR/tools/check_strings.pl fr > "$BASEDIR/doc/language_issues.fr"; > + $BASEDIR/tools/check_strings.pl es > "$BASEDIR/doc/language_issues.es"; > + $BASEDIR/tools/check_strings.pl es > "$BASEDIR/doc/language_issues.pl"; > + $BASEDIR/tools/check_strings.pl ru > "$BASEDIR/doc/language_issues.ru"; > + $BASEDIR/tools/check_strings.pl nl > "$BASEDIR/doc/language_issues.nl"; > + $BASEDIR/tools/check_strings.pl tr > "$BASEDIR/doc/language_issues.tr"; > + $BASEDIR/tools/check_strings.pl it > "$BASEDIR/doc/language_issues.it"; > + $BASEDIR/tools/check_langs.sh > "$BASEDIR/doc/language_missings"; > + print_status DONE; > + > + echo -ne "Updating language lists..."; > + update_language_list "${BASEDIR}/src/installer/po"; > + update_language_list "${BASEDIR}/src/setup/po"; > + print_status DONE; > ;; > update-contributors) > - update_contributors > + update_contributors; > ;; > *) > - echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|syn= c|toolchain|update-contributors}" > - cat doc/make.sh-usage > + echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|syn= c|toolchain|update-contributors}"; > + cat doc/make.sh-usage; > ;; > esac > --=20 > 2.16.4 --===============7370233400423199533==--