ddns: Import latest upstream patches for ddns-013

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index ba393bd656a764c168b6eca21ca71ff01c0e1a60..ce582273607b3ecef8b09e1da92aad9b0265922f 100755 (executable)
--- 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 <info@ipfire.org>.                   #
+# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -27,7 +27,6 @@ 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="142"                                                     # Core Level (Filename)
-PAKFIRE_CORE="141"                                             # Core Level (PAKFIRE)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level
@@ -509,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:0:8}$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
@@ -540,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}" \
@@ -1269,7 +1285,6 @@ buildipfire() {
   lfsmake2 fuse
   lfsmake2 ntfs-3g
   lfsmake2 ethtool
-  lfsmake2 ez-ipupdate
   lfsmake2 fcron
   lfsmake2 perl-GD
   lfsmake2 GD-Graph
@@ -1343,7 +1358,6 @@ buildipfire() {
   lfsmake2 cairo
   lfsmake2 pango
   lfsmake2 rrdtool
-  lfsmake2 setserial
   lfsmake2 setup
   lfsmake2 libdnet
   lfsmake2 rust
@@ -1456,7 +1470,6 @@ buildipfire() {
   lfsmake2 icinga
   lfsmake2 observium-agent
   lfsmake2 ebtables
-  lfsmake2 directfb
   lfsmake2 faad2
   lfsmake2 alac
   lfsmake2 ffmpeg
@@ -1466,8 +1479,6 @@ buildipfire() {
   lfsmake2 vdr_dvbapi
   lfsmake2 vdr_eepg
   lfsmake2 w_scan
-  lfsmake2 icecast
-  lfsmake2 icegenerator
   lfsmake2 mpd
   lfsmake2 libmpdclient
   lfsmake2 mpc
@@ -1495,7 +1506,6 @@ buildipfire() {
   lfsmake2 iperf3
   lfsmake2 7zip
   lfsmake2 lynis
-  lfsmake2 streamripper
   lfsmake2 sshfs
   lfsmake2 taglib
   lfsmake2 sslh
@@ -1525,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
@@ -1567,7 +1576,6 @@ buildipfire() {
   lfsmake2 stress
   lfsmake2 libstatgrab
   lfsmake2 sarg
-  lfsmake2 check_mk_agent
   lfsmake2 nginx
   lfsmake2 sendEmail
   lfsmake2 sysbench
@@ -1575,8 +1583,6 @@ buildipfire() {
   lfsmake2 ltrace
   lfsmake2 ipfire-netboot
   lfsmake2 lcdproc
-  lfsmake2 bitstream
-  lfsmake2 multicat
   lfsmake2 keepalived
   lfsmake2 ipvsadm
   lfsmake2 perl-Carp-Clan
@@ -1586,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
@@ -1600,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