# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org>. #
+# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org>. #
# #
############################################################################
#
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
# If you update the version don't forget to update backupiso and add it to core update
-VERSION="2.25" # Version number
-CORE="158" # Core Level (Filename)
+VERSION="2.27" # Version number
+CORE="162" # Core Level (Filename)
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
MAX_RETRIES=1 # prefetch/check loop
GIT_TAG="$(git tag | tail -1)" # Git Tag
GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit
-TOOLCHAINVER=20200924
+TOOLCHAINVER=20210701
+
+# use multicore and max compression
+ZSTD_OPT="-T0 --ultra -22"
###############################################################################
#
CFLAGS_ARCH="-march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
;;
- armv5tel)
+ armv6l)
BUILDTARGET="${build_arch}-unknown-linux-gnueabi"
CROSSTARGET="${build_arch}-cross-linux-gnueabi"
BUILD_PLATFORM="arm"
- CFLAGS_ARCH="-march=armv5te -mfloat-abi=soft -fomit-frame-pointer"
- RUSTFLAGS="-Ccodegen-units=1"
+ CFLAGS_ARCH="-march=armv6zk+fp -mfpu=vfp -mfloat-abi=softfp -fomit-frame-pointer"
+ #RUSTFLAGS="-Ccodegen-units=1"
;;
riscv64)
# 128MB of memory. Therefore we find out how
# many processes fit into memory.
local mem_max=$(( ${SYSTEM_MEMORY} / 128 ))
- local cpu_max=$(( ${SYSTEM_PROCESSORS} + 1 ))
+ local cpu_max=$(( ${SYSTEM_PROCESSORS} ))
local parallelism
if [ ${mem_max} -lt ${cpu_max} ]; then
echo "aarch64"
;;
- armv7*|armv6*|armv5*)
- echo "armv5tel"
+ armv7*|armv6*)
+ echo "armv6l"
;;
riscv64)
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/${BUILD_ARCH}} 2>/dev/null
+ mkdir -p $BASEDIR/{cache,ccache/${BUILD_ARCH}/${TOOLCHAINVER}} 2>/dev/null
if [ "${ENABLE_RAMDISK}" = "on" ]; then
mkdir -p $BASEDIR/build/usr/src
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/${BUILD_ARCH} $BASEDIR/build/usr/src/ccache
+ mount --bind $BASEDIR/ccache/${BUILD_ARCH}/${TOOLCHAINVER} $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
# Run LFS static binary creation scripts one by one
export CCACHE_DIR=$BASEDIR/ccache
export CCACHE_TEMPDIR="/tmp"
- export CCACHE_COMPRESS=1
export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER} ${BUILD_ARCH}"
# Remove pre-install list of installed files in case user erase some files before rebuild
BUILD_PLATFORM="${BUILD_PLATFORM}" \
CCACHE_DIR=/usr/src/ccache \
CCACHE_TEMPDIR="${CCACHE_TEMPDIR}" \
- CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
GOCACHE="/usr/src/ccache/go" \
KVER="${KVER}" \
cd $BASEDIR/lfs && env -i \
PATH="${TOOLS_DIR}/ccache/bin:${TOOLS_DIR}/bin:$PATH" \
- CCACHE_DIR="${CCACHE_DIR}" \
+ CCACHE_DIR="${CCACHE_DIR}"/${BUILD_ARCH}/${TOOLCHAINVER} \
CCACHE_TEMPDIR="${CCACHE_TEMPDIR}" \
- CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" \
# These are working.
;;
- armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l|armv5tel:aarch64)
+ armv6l:armv6l|armv6l:armv7l|armv6l:aarch64)
# These are working.
;;
- armv5tel:*)
+ armv6l:*)
error=true
;;
esac
export LOGFILE
lfsmake1 stage1
- lfsmake1 ccache PASS=1
lfsmake1 binutils PASS=1
lfsmake1 gcc PASS=1
lfsmake1 linux KCFG="-headers"
lfsmake1 glibc
lfsmake1 libxcrypt
lfsmake1 gcc PASS=L
+ lfsmake1 zlib
+ lfsmake1 zstd
lfsmake1 binutils PASS=2
lfsmake1 gcc PASS=2
- lfsmake1 zlib
- lfsmake1 ccache PASS=2
+ lfsmake1 ccache
lfsmake1 tcl
lfsmake1 expect
lfsmake1 dejagnu
lfsmake2 gperf
lfsmake2 gzip
lfsmake2 hostname
- lfsmake2 iproute2
- lfsmake2 jwhois
+ lfsmake2 whois
lfsmake2 kbd
lfsmake2 less
lfsmake2 pkg-config
lfsmake2 libnetfilter_cthelper
lfsmake2 libnetfilter_cttimeout
lfsmake2 iptables
+ lfsmake2 iproute2
lfsmake2 screen
lfsmake2 elfutils
- case "${BUILD_ARCH}" in
- x86_64|aarch64)
- lfsmake2 linux KCFG=""
- lfsmake2 xtables-addons KCFG=""
- lfsmake2 linux-initrd KCFG=""
- ;;
- i586)
- # x86 kernel build
- lfsmake2 linux KCFG=""
- lfsmake2 xtables-addons KCFG=""
- lfsmake2 linux-initrd KCFG=""
- ;;
-
- armv5tel)
- # arm multi platform (Panda, Wandboard ...) kernel build
- lfsmake2 linux KCFG="-multi"
- lfsmake2 xtables-addons KCFG="-multi"
- lfsmake2 linux-initrd KCFG="-multi"
- ;;
- esac
- lfsmake2 xtables-addons USPACE="1"
+ # Kernelbuild ... current we have no platform that need
+ # multi kernel builds so KCFG is empty
+ lfsmake2 linux KCFG=""
+ lfsmake2 rtl8189es KCFG=""
+ lfsmake2 rtl8812au KCFG=""
+ lfsmake2 rtl8822bu KCFG=""
+ lfsmake2 xradio KCFG=""
+ lfsmake2 xtables-addons KCFG=""
+ lfsmake2 linux-initrd KCFG=""
+
+ lfsmake2 xtables-addons USPACE="1"
lfsmake2 libgpg-error
lfsmake2 libgcrypt
lfsmake2 libassuan
lfsmake2 aprutil
lfsmake2 unbound
lfsmake2 gnutls
+ lfsmake2 libuv
lfsmake2 bind
lfsmake2 dhcp
lfsmake2 dhcpcd
lfsmake2 tcl
lfsmake2 sqlite
lfsmake2 libffi
- lfsmake2 python
lfsmake2 python3
lfsmake2 gdb
lfsmake2 grub
lfsmake2 efivar
lfsmake2 efibootmgr
+ lfsmake2 libtasn1
+ lfsmake2 p11-kit
lfsmake2 ca-certificates
lfsmake2 fireinfo
lfsmake2 libnet
lfsmake2 libinih
lfsmake2 cdrkit
lfsmake2 dosfstools
+ lfsmake2 exfatprogs
lfsmake2 reiserfsprogs
lfsmake2 xfsprogs
lfsmake2 sysfsutils
lfsmake2 ntfs-3g
lfsmake2 ethtool
lfsmake2 fcron
+ lfsmake2 ExtUtils-PkgConfig
lfsmake2 perl-GD
lfsmake2 GD-Graph
lfsmake2 GD-TextUtil
lfsmake2 whatmask
lfsmake2 libtirpc
lfsmake2 conntrack-tools
- lfsmake2 libupnp
- lfsmake2 ipaddr
lfsmake2 iputils
lfsmake2 l7-protocols
lfsmake2 hwdata
lfsmake2 XML-Parser
lfsmake2 Crypt-PasswdMD5
lfsmake2 Net-Telnet
- lfsmake2 python-setuptools
+ lfsmake2 python3-setuptools
lfsmake2 python3-inotify
lfsmake2 python3-docutils
lfsmake2 python3-daemon
lfsmake2 br2684ctl
lfsmake2 pcmciautils
lfsmake2 lm_sensors
+ lfsmake2 libstatgrab
lfsmake2 liboping
lfsmake2 collectd
lfsmake2 elinks
lfsmake2 igmpproxy
- lfsmake2 fbset
lfsmake2 opus
- lfsmake2 python-pyparsing
+ lfsmake2 python3-pyparsing
lfsmake2 spice-protocol
lfsmake2 spice
- lfsmake2 sdl
+ lfsmake2 sdl2
lfsmake2 libusbredir
lfsmake2 libseccomp
lfsmake2 qemu
lfsmake2 zerofree
lfsmake2 minicom
lfsmake2 ddrescue
- lfsmake2 client175
lfsmake2 powertop
lfsmake2 parted
lfsmake2 swig
+ lfsmake2 dtc
lfsmake2 u-boot
lfsmake2 u-boot-friendlyarm
- lfsmake2 python-typing
- lfsmake2 python-m2crypto
lfsmake2 wireless-regdb
- lfsmake2 crda
lfsmake2 libsolv
lfsmake2 ddns
lfsmake2 python3-setuptools-scm
+ lfsmake2 python3-six
lfsmake2 python3-dateutil
lfsmake2 python3-jmespath
lfsmake2 python3-colorama
lfsmake2 python3-msgpack
lfsmake2 aws-cli
lfsmake2 transmission
- lfsmake2 dpfhack
- lfsmake2 lcd4linux
lfsmake2 mtr
lfsmake2 minidlna
lfsmake2 acpid
lfsmake2 telnet
lfsmake2 xinetd
lfsmake2 stress
- lfsmake2 libstatgrab
lfsmake2 sarg
lfsmake2 nginx
- lfsmake2 sendEmail
lfsmake2 sysbench
lfsmake2 strace
lfsmake2 ltrace
lfsmake2 ipset
lfsmake2 dnsdist
lfsmake2 bird
+ lfsmake2 libyang
lfsmake2 frr
lfsmake2 dmidecode
lfsmake2 mcelog
lfsmake2 socat
lfsmake2 libcdada
lfsmake2 pmacct
+ lfsmake2 squid-asnbl
}
buildinstaller() {
cd $BASEDIR
- # remove not useable iso on armv5tel (needed to build flash images)
- [ "${BUILD_ARCH}" = "armv5tel" ] && rm -rf *.iso
+ # remove not useable iso on armv6l (needed to build flash images)
+ [ "${BUILD_ARCH}" = "armv6l" ] && rm -rf *.iso
for i in $(ls *.bz2 *.img.xz *.iso 2>/dev/null); do
md5sum $i > $i.md5
# Clear screen
${INTERACTIVE} && clear
- PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz 2> /dev/null | head -n 1`
+ PACKAGE="$BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.zst"
#only restore on a clean disk
if [ ! -e "${BASEDIR}/build${TOOLS_DIR}/.toolchain-successful" ]; then
if [ ! -n "$PACKAGE" ]; then
prepareenv
buildtoolchain
else
- PACKAGENAME=${PACKAGE%.tar.xz}
+ PACKAGENAME=${PACKAGE%.tar.zst}
print_build_stage "Packaged toolchain compilation"
if [ `md5sum $PACKAGE | awk '{print $1}'` == `cat $PACKAGENAME.md5 | awk '{print $1}'` ]; then
- tar axf $PACKAGE
+ zstd -d < "${PACKAGE}" | tar x
prepareenv
else
exiterror "$PACKAGENAME md5 did not match, check downloaded package"
buildtoolchain
echo "`date -u '+%b %e %T'`: Create toolchain image for ${BUILD_ARCH}" | tee -a $LOGFILE
test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
- cd $BASEDIR && tar -cf- --exclude='log/_build.*.log' build/${TOOLS_DIR} build/bin/sh log | xz ${XZ_OPT} \
- > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz
- md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \
+ cd $BASEDIR && tar -cf- --exclude='log/_build.*.log' build/${TOOLS_DIR} build/bin/sh log \
+ | zstd ${ZSTD_OPT} > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.zst
+ md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.zst \
> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5
stdumount
;;
gettoolchain)
# arbitrary name to be updated in case of new toolchain package upload
PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}
- if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.xz ]; then
+ if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.zst ]; then
URL_TOOLCHAIN=`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}" | tee -a $LOGFILE
cd $BASEDIR/cache/toolchains
- wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.xz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
+ wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.zst $URL_TOOLCHAIN/$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
else
- if [ "`md5sum $PACKAGE.tar.xz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
+ if [ "`md5sum $PACKAGE.tar.zst | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
else
exiterror "$PACKAGE.md5 did not match, check downloaded package"
fi
;;
uploadsrc)
- PWD=`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
- URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
- REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+ URL_SOURCE="$(awk '/^URL_SOURCE/ { print $3 }' lfs/Config)"
+
+ rsync \
+ --recursive \
+ --update \
+ --ignore-existing \
+ --progress \
+ --human-readable \
+ --exclude="toolchains/" \
+ "${BASEDIR}/cache/" \
+ "${IPFIRE_USER}@${URL_SOURCE}"
- for file in ${BASEDIR}/cache/*; do
- [ -d "${file}" ] && continue
- grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue
- NEW_FILES="$NEW_FILES $file"
- done
- [ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE}
- cd $BASEDIR
- cd $PWD
exit 0
;;
lang)
shift
exec "${BASEDIR}/tools/find-dependencies" "${BASEDIR}/build" "$@"
;;
+check-manualpages)
+ echo "Checking the manual pages for broken links..."
+
+ chmod 755 $BASEDIR/tools/check_manualpages.pl
+ if $BASEDIR/tools/check_manualpages.pl; then
+ print_status DONE
+ else
+ print_status FAIL
+ fi
+ ;;
*)
- echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies}"
+ echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies|check-manualpages}"
cat doc/make.sh-usage
;;
esac
projects / people / stevee / ipfire-2.x.git / blobdiff