X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=ce582273607b3ecef8b09e1da92aad9b0265922f;hp=0a1f9819bc7339969a321bcd6f2f180f50672c07;hb=08cf4d21540c4fe185db1f17ae365f7ab6adae27;hpb=1df47cc9eec46ac2deaee8a1314555bc08026368 diff --git a/make.sh b/make.sh index 0a1f9819bc..ce58227360 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # 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 . # +# Copyright (C) 2007-2020 IPFire Team . # # # ############################################################################ # @@ -25,20 +25,21 @@ 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="137" # Core Level (Filename) -PAKFIRE_CORE="136" # 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=20190814 +# 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 ############################################################################### # @@ -174,6 +175,7 @@ configure_build() { CROSSTARGET="${build_arch}-cross-linux-gnueabi" BUILD_PLATFORM="arm" CFLAGS_ARCH="-march=armv5te -mfloat-abi=soft -fomit-frame-pointer" + RUSTFLAGS="-Ccodegen-units=1" ;; *) @@ -462,7 +464,7 @@ prepareenv() { # 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 @@ -506,19 +508,36 @@ prepareenv() { 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 @@ -537,7 +556,7 @@ enterchroot() { PS1="${PS1}" \ PATH="${PATH}" \ SYSTEM_RELEASE="${SYSTEM_RELEASE}" \ - PAKFIRE_CORE="${PAKFIRE_CORE}" \ + PAKFIRE_TREE="${PAKFIRE_TREE}" \ NAME="${NAME}" \ SNAME="${SNAME}" \ VERSION="${VERSION}" \ @@ -547,6 +566,7 @@ enterchroot() { CONFIG_ROOT="${CONFIG_ROOT}" \ CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \ CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \ + RUSTFLAGS="${RUSTFLAGS}" \ BUILDTARGET="${BUILDTARGET}" \ CROSSTARGET="${CROSSTARGET}" \ BUILD_ARCH="${BUILD_ARCH}" \ @@ -554,6 +574,7 @@ enterchroot() { 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}" \ @@ -894,9 +915,14 @@ update_contributors() { local contributors="$(contributors | paste -sd , - | sed -e "s/,/&\\\\n/g")" # Edit contributors into credits.cgi - awk -i inplace \ - "//{ p=1; print; printf \"${contributors}\n\"}//{ p=0 } !p" \ - "${BASEDIR}/html/cgi-bin/credits.cgi" + local tmp="$(mktemp)" + + awk "//{ p=1; print; printf \"${contributors}\n\"}//{ 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 @@ -1132,9 +1158,6 @@ buildipfire() { lfsmake2 lvm2 lfsmake2 multipath-tools lfsmake2 freetype - lfsmake2 grub - lfsmake2 efivar - lfsmake2 efibootmgr lfsmake2 libmnl lfsmake2 libnfnetlink lfsmake2 libnetfilter_queue @@ -1176,15 +1199,6 @@ buildipfire() { ;; 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" @@ -1222,6 +1236,9 @@ buildipfire() { lfsmake2 libffi lfsmake2 python lfsmake2 python3 + lfsmake2 grub + lfsmake2 efivar + lfsmake2 efibootmgr lfsmake2 ca-certificates lfsmake2 fireinfo lfsmake2 libnet @@ -1268,7 +1285,6 @@ buildipfire() { lfsmake2 fuse lfsmake2 ntfs-3g lfsmake2 ethtool - lfsmake2 ez-ipupdate lfsmake2 fcron lfsmake2 perl-GD lfsmake2 GD-Graph @@ -1331,6 +1347,7 @@ buildipfire() { lfsmake2 python-ipaddress lfsmake2 glib lfsmake2 GeoIP + lfsmake2 geoip-database lfsmake2 ntp lfsmake2 openssh lfsmake2 fontconfig @@ -1341,9 +1358,9 @@ buildipfire() { lfsmake2 cairo lfsmake2 pango lfsmake2 rrdtool - lfsmake2 setserial lfsmake2 setup lfsmake2 libdnet + lfsmake2 rust lfsmake2 jansson lfsmake2 yaml lfsmake2 libhtp @@ -1453,7 +1470,6 @@ buildipfire() { lfsmake2 icinga lfsmake2 observium-agent lfsmake2 ebtables - lfsmake2 directfb lfsmake2 faad2 lfsmake2 alac lfsmake2 ffmpeg @@ -1463,8 +1479,6 @@ buildipfire() { lfsmake2 vdr_dvbapi lfsmake2 vdr_eepg lfsmake2 w_scan - lfsmake2 icecast - lfsmake2 icegenerator lfsmake2 mpd lfsmake2 libmpdclient lfsmake2 mpc @@ -1492,7 +1506,6 @@ buildipfire() { lfsmake2 iperf3 lfsmake2 7zip lfsmake2 lynis - lfsmake2 streamripper lfsmake2 sshfs lfsmake2 taglib lfsmake2 sslh @@ -1522,7 +1535,6 @@ buildipfire() { lfsmake2 parted lfsmake2 swig lfsmake2 u-boot - lfsmake2 u-boot-kirkwood lfsmake2 u-boot-friendlyarm lfsmake2 python-typing lfsmake2 python-m2crypto @@ -1564,7 +1576,6 @@ buildipfire() { lfsmake2 stress lfsmake2 libstatgrab lfsmake2 sarg - lfsmake2 check_mk_agent lfsmake2 nginx lfsmake2 sendEmail lfsmake2 sysbench @@ -1572,8 +1583,6 @@ buildipfire() { lfsmake2 ltrace lfsmake2 ipfire-netboot lfsmake2 lcdproc - lfsmake2 bitstream - lfsmake2 multicat lfsmake2 keepalived lfsmake2 ipvsadm lfsmake2 perl-Carp-Clan @@ -1583,13 +1592,11 @@ buildipfire() { 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 @@ -1597,15 +1604,14 @@ buildipfire() { 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 @@ -1629,6 +1635,9 @@ buildipfire() { lfsmake2 firmware-update lfsmake2 tshark lfsmake2 geoip-generator + lfsmake2 speedtest-cli + lfsmake2 rfkill + lfsmake2 amazon-ssm-agent } buildinstaller() {