make.sh remove extra PAKFIRE_CORE version for nightly builds

this is useless because the new nightly also copies the core updaters
to the unstable and testing pakfire trees.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/stage2 b/lfs/stage2
index 4b8f0bc811171cf684618d8754c335de1311db92..355aeef54efbd920980324345a789d1f07438d34 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -147,6 +147,6 @@ endif
 
        # Pakfire
        -mkdir -pv /opt/pakfire/db/core
-       echo "$(PAKFIRE_CORE)" > /opt/pakfire/db/core/mine
+       echo "$(CORE)" > /opt/pakfire/db/core/mine
 
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 98a5cf8303f2df4f705463897ff9f0f9118513cc..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
@@ -557,7 +556,6 @@ enterchroot() {
                PS1="${PS1}" \
                PATH="${PATH}" \
                SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
-               PAKFIRE_CORE="${PAKFIRE_CORE}" \
                PAKFIRE_TREE="${PAKFIRE_TREE}" \
                NAME="${NAME}" \
                SNAME="${SNAME}" \