From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 8/8] make.sh: Configure Pakfire to load packages from the correct tree Date: Tue, 11 Feb 2020 14:28:53 +0000 Message-ID: <20200211142853.8561-9-michael.tremer@ipfire.org> In-Reply-To: <20200211142853.8561-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5256648301741281311==" List-Id: --===============5256648301741281311== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 --- lfs/configroot | 1 + make.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/lfs/configroot b/lfs/configroot index 6092f889b..2c9dbe0e3 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 d46282b8e..277ac8633 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}" \ -- 2.20.1 --===============5256648301741281311==--