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 6092f889b1810a3e5330aa4112e6e17c8ae8630e..2c9dbe0e382f34f6354a56b12a6b14682407c497 100644 (file)
--- 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 d46282b8e17787acd4d18aa2242fbaaa476997d6..277ac8633ee380f6e5b1ae1da280f90db74faf65 100755 (executable)
--- 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}" \