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="144" # Core Level (Filename)
+CORE="149" # Core Level (Filename)
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
NICE=10 # Nice level
GIT_TAG="$(git tag | tail -1)" # Git Tag
GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit
-TOOLCHAINVER=20200324
+TOOLCHAINVER=20200814
###############################################################################
#
BUILDTARGET="${build_arch}-unknown-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="x86"
- CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic"
+ CFLAGS_ARCH="-m64 -mtune=generic -fstack-clash-protection -fcf-protection"
;;
i586)
BUILDTARGET="${build_arch}-pc-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="x86"
- CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer"
+ CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer -fcf-protection"
;;
aarch64)
BUILDTARGET="${build_arch}-unknown-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="arm"
- CFLAGS_ARCH=""
+ CFLAGS_ARCH="-fstack-clash-protection"
;;
armv7hl)
if [ "${ENABLE_RAMDISK}" = "on" ]; then
mkdir -p $BASEDIR/build/usr/src
- mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src
+ mount -t tmpfs tmpfs -o size=8G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src
mkdir -p ${BASEDIR}/build/tmp
mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 ${BASEDIR}/build/tmp
fi
case "${HOST_ARCH},${build_arch}" in
- x86_64,arm*|i?86,arm*|i?86,x86_64)
+ x86_64,arm*|x86_64,aarch64|i?86,arm*|i?86,aarch64|i?86,x86_64)
return 0
;;
*)
local magic
case "${build_arch}" in
+ aarch64)
+ magic="7f454c460201010000000000000000000200b700"
+ ;;
arm*)
magic="7f454c4601010100000000000000000002002800"
;;
lfsmake2 autoconf
lfsmake2 automake
lfsmake2 berkeley
+ lfsmake2 berkeley-compat
lfsmake2 coreutils
lfsmake2 iana-etc
lfsmake2 m4
lfsmake2 linux-initrd KCFG=""
;;
i586)
- # x86-pae (Native and new XEN) kernel build
- lfsmake2 linux KCFG="-pae"
-# lfsmake2 backports KCFG="-pae"
-# lfsmake2 e1000e KCFG="-pae"
-# lfsmake2 igb KCFG="-pae"
-# lfsmake2 ixgbe KCFG="-pae"
- lfsmake2 xtables-addons KCFG="-pae"
- lfsmake2 linux-initrd KCFG="-pae"
-
# x86 kernel build
lfsmake2 linux KCFG=""
# lfsmake2 backports KCFG=""
lfsmake2 libnl-3
lfsmake2 libidn
lfsmake2 nasm
+ lfsmake2 libarchive
+ lfsmake2 cmake
lfsmake2 libjpeg
lfsmake2 libjpeg-compat
lfsmake2 libexif
lfsmake2 bootstrap
lfsmake2 arping
lfsmake2 beep
- lfsmake2 libarchive
- lfsmake2 cmake
lfsmake2 libssh
lfsmake2 cdrkit
lfsmake2 dosfstools
lfsmake2 sdparm
lfsmake2 mtools
lfsmake2 whatmask
+ lfsmake2 libtirpc
lfsmake2 conntrack-tools
lfsmake2 libupnp
lfsmake2 ipaddr
lfsmake2 python-daemon
lfsmake2 python-ipaddress
lfsmake2 glib
- lfsmake2 GeoIP
- lfsmake2 geoip-database
lfsmake2 ntp
lfsmake2 openssh
lfsmake2 fontconfig
lfsmake2 spandsp
lfsmake2 lz4
lfsmake2 lzo
+ lfsmake2 zstd
lfsmake2 openvpn
lfsmake2 mpage
lfsmake2 dbus
lfsmake2 cifs-utils
lfsmake2 krb5
lfsmake2 samba
+ lfsmake2 netatalk
lfsmake2 sudo
lfsmake2 mc
lfsmake2 wget
lfsmake2 libmpeg2
lfsmake2 gnump3d
lfsmake2 rsync
- lfsmake2 libtirpc
lfsmake2 rpcbind
lfsmake2 keyutils
+ lfsmake2 rpcsvc-proto
+ lfsmake2 libnfsidmap
lfsmake2 nfs
lfsmake2 gnu-netcat
lfsmake2 ncat
lfsmake2 perl-DBD-SQLite
lfsmake2 perl-File-ReadBackwards
lfsmake2 openvmtools
+ lfsmake2 libmicrohttpd
lfsmake2 motion
lfsmake2 joe
lfsmake2 monit
lfsmake2 flashrom
lfsmake2 firmware-update
lfsmake2 tshark
- lfsmake2 geoip-generator
lfsmake2 speedtest-cli
lfsmake2 rfkill
lfsmake2 amazon-ssm-agent
+ lfsmake2 libloc
}
buildinstaller() {
ipfirepackages
- lfsmake2 xen-image
- mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
-
cd $BASEDIR
# remove not useable iso on armv5tel (needed to build flash images)
[ "${BUILD_ARCH}" = "armv5tel" ] && rm -rf *.iso
- for i in `ls *.bz2 *.img.xz *.iso`; do
+ for i in $(ls *.bz2 *.img.xz *.iso 2>/dev/null); do
md5sum $i > $i.md5
done
cd $PWD
update-contributors)
update_contributors
;;
+find-dependencies)
+ shift
+ exec "${BASEDIR}/tools/find-dependencies" "${BASEDIR}/build" "$@"
+ ;;
*)
- echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors}"
+ echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies}"
cat doc/make.sh-usage
;;
esac
+