# 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-2019 IPFire Team <info@ipfire.org>. #
+# Copyright (C) 2007-2020 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.23" # Version number
-CORE="135" # Core Level (Filename)
-PAKFIRE_CORE="135" # Core Level (PAKFIRE)
-GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
+VERSION="2.25" # Version number
+CORE="142" # Core Level (Filename)
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
NICE=10 # Nice level
MAX_RETRIES=1 # prefetch/check loop
BUILD_IMAGES=1 # Flash and Xen Downloader
KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
-GIT_TAG=$(git tag | tail -1) # Git Tag
-GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=20190427
+# Information from Git
+GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch
+GIT_TAG="$(git tag | tail -1)" # Git Tag
+GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit
+
+TOOLCHAINVER=20200108
###############################################################################
#
CROSSTARGET="${build_arch}-cross-linux-gnueabi"
BUILD_PLATFORM="arm"
CFLAGS_ARCH="-march=armv5te -mfloat-abi=soft -fomit-frame-pointer"
+ RUSTFLAGS="-Ccodegen-units=1"
;;
*)
# Setup environment
set +h
LC_ALL=POSIX
- export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM
+ export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS
unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
# Make some extra directories
if [ "${ENABLE_RAMDISK}" = "on" ]; then
mkdir -p $BASEDIR/build/usr/src
- mount -t tmpfs tmpfs -o size=4G,mode=1777 $BASEDIR/build/usr/src
+ mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src
fi
mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache}
rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
# Prepare string for /etc/system-release.
- SYSTEM_RELEASE="${NAME} ${VERSION} (${BUILD_ARCH})"
- if [ "$(git status -s | wc -l)" == "0" ]; then
- GIT_STATUS=""
- else
- GIT_STATUS="-dirty"
+ local system_release="${NAME} ${VERSION} (${BUILD_ARCH})"
+
+ case "${GIT_BRANCH}" in
+ core*|beta?|rc?)
+ system_release="${system_release} - ${GIT_BRANCH}"
+ ;;
+ *)
+ system_release="${system_release} - Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
+ ;;
+ esac
+
+ # Append -dirty tag for local changes
+ if [ "$(git status -s | wc -l)" != "0" ]; then
+ system_release="${system_release}-dirty"
fi
- case "$GIT_BRANCH" in
- core*|beta?|rc?)
- SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
- ;;
- *)
- SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
- ;;
+
+ # Export variable
+ SYSTEM_RELEASE="${system_release}"
+
+ # Decide on PAKFIRE_TREE
+ case "${GIT_BRANCH}" in
+ core*)
+ PAKFIRE_TREE="stable"
+ ;;
+ master)
+ PAKFIRE_TREE="testing"
+ ;;
+ *)
+ PAKFIRE_TREE="unstable"
+ ;;
esac
# Setup ccache cache size
PS1="${PS1}" \
PATH="${PATH}" \
SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
- PAKFIRE_CORE="${PAKFIRE_CORE}" \
+ PAKFIRE_TREE="${PAKFIRE_TREE}" \
NAME="${NAME}" \
SNAME="${SNAME}" \
VERSION="${VERSION}" \
CONFIG_ROOT="${CONFIG_ROOT}" \
CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
+ RUSTFLAGS="${RUSTFLAGS}" \
BUILDTARGET="${BUILDTARGET}" \
CROSSTARGET="${CROSSTARGET}" \
BUILD_ARCH="${BUILD_ARCH}" \
CCACHE_DIR=/usr/src/ccache \
CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
+ GOCACHE="/usr/src/ccache/go" \
KVER="${KVER}" \
XZ_OPT="${XZ_OPT}" \
DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \
local contributors="$(contributors | paste -sd , - | sed -e "s/,/&\\\\n/g")"
# Edit contributors into credits.cgi
- awk -i inplace \
- "/<!-- CONTRIBUTORS -->/{ p=1; print; printf \"${contributors}\n\"}/<!-- END -->/{ p=0 } !p" \
- "${BASEDIR}/html/cgi-bin/credits.cgi"
+ local tmp="$(mktemp)"
+
+ awk "/<!-- CONTRIBUTORS -->/{ p=1; print; printf \"${contributors}\n\"}/<!-- END -->/{ p=0 } !p" \
+ < "${BASEDIR}/html/cgi-bin/credits.cgi" > "${tmp}"
+
+ # Copy back modified content
+ cat "${tmp}" > "${BASEDIR}/html/cgi-bin/credits.cgi"
+ unlink "${tmp}"
print_status DONE
return 0
lfsmake2 lvm2
lfsmake2 multipath-tools
lfsmake2 freetype
- lfsmake2 grub
- lfsmake2 efivar
- lfsmake2 efibootmgr
lfsmake2 libmnl
lfsmake2 libnfnetlink
lfsmake2 libnetfilter_queue
;;
armv5tel)
- # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
- lfsmake2 linux KCFG="-kirkwood"
-# lfsmake2 backports KCFG="-kirkwood"
-# lfsmake2 e1000e KCFG="-kirkwood"
-# lfsmake2 igb KCFG="-kirkwood"
-# lfsmake2 ixgbe KCFG="-kirkwood"
- lfsmake2 xtables-addons KCFG="-kirkwood"
- lfsmake2 linux-initrd KCFG="-kirkwood"
-
# arm multi platform (Panda, Wandboard ...) kernel build
lfsmake2 linux KCFG="-multi"
# lfsmake2 backports KCFG="-multi"
lfsmake2 libffi
lfsmake2 python
lfsmake2 python3
+ lfsmake2 grub
+ lfsmake2 efivar
+ lfsmake2 efibootmgr
lfsmake2 ca-certificates
lfsmake2 fireinfo
lfsmake2 libnet
lfsmake2 beep
lfsmake2 libarchive
lfsmake2 cmake
+ lfsmake2 libssh
lfsmake2 cdrkit
lfsmake2 dosfstools
lfsmake2 reiserfsprogs
lfsmake2 fuse
lfsmake2 ntfs-3g
lfsmake2 ethtool
- lfsmake2 ez-ipupdate
lfsmake2 fcron
lfsmake2 perl-GD
lfsmake2 GD-Graph
lfsmake2 misc-progs
lfsmake2 nano
lfsmake2 URI
+ lfsmake2 perl-CGI
+ lfsmake2 perl-Switch
lfsmake2 HTML-Tagset
lfsmake2 HTML-Parser
lfsmake2 HTML-Template
lfsmake2 python-ipaddress
lfsmake2 glib
lfsmake2 GeoIP
+ lfsmake2 geoip-database
lfsmake2 ntp
lfsmake2 openssh
lfsmake2 fontconfig
lfsmake2 cairo
lfsmake2 pango
lfsmake2 rrdtool
- lfsmake2 setserial
lfsmake2 setup
lfsmake2 libdnet
+ lfsmake2 rust
lfsmake2 jansson
lfsmake2 yaml
lfsmake2 libhtp
lfsmake2 fetchmail
lfsmake2 cyrus-imapd
lfsmake2 clamav
+ lfsmake2 perl-NetAddr-IP
lfsmake2 spamassassin
+ lfsmake2 perl-Net-LibIDN
lfsmake2 amavisd
lfsmake2 dma
lfsmake2 alsa
lfsmake2 icinga
lfsmake2 observium-agent
lfsmake2 ebtables
- lfsmake2 directfb
lfsmake2 faad2
lfsmake2 alac
lfsmake2 ffmpeg
lfsmake2 vdr_dvbapi
lfsmake2 vdr_eepg
lfsmake2 w_scan
- lfsmake2 icecast
- lfsmake2 icegenerator
lfsmake2 mpd
lfsmake2 libmpdclient
lfsmake2 mpc
lfsmake2 iperf3
lfsmake2 7zip
lfsmake2 lynis
- lfsmake2 streamripper
lfsmake2 sshfs
lfsmake2 taglib
lfsmake2 sslh
lfsmake2 parted
lfsmake2 swig
lfsmake2 u-boot
- lfsmake2 u-boot-kirkwood
lfsmake2 u-boot-friendlyarm
lfsmake2 python-typing
lfsmake2 python-m2crypto
lfsmake2 stress
lfsmake2 libstatgrab
lfsmake2 sarg
- lfsmake2 check_mk_agent
lfsmake2 nginx
lfsmake2 sendEmail
lfsmake2 sysbench
lfsmake2 ltrace
lfsmake2 ipfire-netboot
lfsmake2 lcdproc
- lfsmake2 bitstream
- lfsmake2 multicat
lfsmake2 keepalived
lfsmake2 ipvsadm
lfsmake2 perl-Carp-Clan
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 pigz
lfsmake2 tmux
lfsmake2 perl-Text-CSV_XS
+ lfsmake2 lua
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 flashrom
lfsmake2 firmware-update
lfsmake2 tshark
+ lfsmake2 geoip-generator
+ lfsmake2 speedtest-cli
+ lfsmake2 rfkill
+ lfsmake2 amazon-ssm-agent
}
buildinstaller() {
projects / people / pmueller / ipfire-2.x.git / blobdiff