[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 06fc566a0aea5c4a5e45c4ddc0233fa008375ff2

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 06fc566a0aea5c4a5e45c4ddc0233fa008375ff2

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 3569 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  06fc566a0aea5c4a5e45c4ddc0233fa008375ff2 (commit)
      from  ff58943d8ec03f72609c9248b56f549f75baf505 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 06fc566a0aea5c4a5e45c4ddc0233fa008375ff2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Feb 15 17:11:42 2020 +0000

    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(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/stage2 | 4 ++--
 make.sh    | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/lfs/stage2 b/lfs/stage2
index 4b8f0bc81..355aeef54 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info(a)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 98a5cf830..ce5822736 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 <info(a)ipfire.org>.                   #
+# Copyright (C) 2007-2020 IPFire Team <info(a)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}" \


hooks/post-receive
--
IPFire 2.x development tree