mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-15 21:43:00 +02:00
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>
This commit is contained in:
committed by
Arne Fitzenreiter
parent
f48643e5b3
commit
040160c7ce
@@ -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
|
||||
|
||||
14
make.sh
14
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}" \
|
||||
|
||||
Reference in New Issue
Block a user