From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 11 Feb 2020 14:28:53 +0000 (+0000)
Subject: make.sh: Configure Pakfire to load packages from the correct tree
X-Git-Tag: v2.25-core142~85
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=040160c7ce19dcc34d97a74d371e9dbd3f0983e5

make.sh: Configure Pakfire to load packages from the correct tree

This will configure Pakfire that people who install a nightly
build will also get the packages for this build, etc.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/configroot b/lfs/configroot
index 6092f889b1..2c9dbe0e38 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -133,6 +133,7 @@ $(TARGET) :
 	echo  "POLICY=MODE2"		>> $(CONFIG_ROOT)/firewall/settings
 	echo  "POLICY1=MODE2"		>> $(CONFIG_ROOT)/firewall/settings
 	echo  "USE_ISP_NAMESERVERS=on"  >> $(CONFIG_ROOT)/dns/settings
+	echo  "TREE=$(PAKFIRE_TREE)"    >> $(CONFIG_ROOT)/pakfire/settings
 
 	# Install snort to suricata converter.
 	cp $(DIR_SRC)/config/suricata/convert-snort	/usr/sbin/convert-snort
diff --git a/make.sh b/make.sh
index d46282b8e1..277ac8633e 100755
--- a/make.sh
+++ b/make.sh
@@ -528,6 +528,19 @@ prepareenv() {
 	# 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
 	enterchroot ccache --max-size="${CCACHE_CACHE_SIZE}" >/dev/null
 }
@@ -545,6 +558,7 @@ enterchroot() {
 		PATH="${PATH}" \
 		SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
 		PAKFIRE_CORE="${PAKFIRE_CORE}" \
+		PAKFIRE_TREE="${PAKFIRE_TREE}" \
 		NAME="${NAME}" \
 		SNAME="${SNAME}" \
 		VERSION="${VERSION}" \