From patchwork Tue Feb 11 14:28:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2774 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48H4sW2Mvrz3xyZ for ; Tue, 11 Feb 2020 14:29:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48H4sR0Q16z12v; Tue, 11 Feb 2020 14:29:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48H4sQ00cbz2yyt; Tue, 11 Feb 2020 14:29:14 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48H4sM3xRMz2ymb for ; Tue, 11 Feb 2020 14:29:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48H4sM2WVkzwN; Tue, 11 Feb 2020 14:29:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581431351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9nipm84YiodFfOJC4dif2NqGfHQr7XwF0bF+IYlOa+M=; b=oG609P/mG+cLuAL7VvhQBbFC1/HiaotuzI+4JOZt1TBYgL06/3pilvuIRBddqwiBHQGtvS Me9mh2/v4gOokrSFai6im2vpq+FME+aDhW9xDnmsWM/n2IfGYKCqwoS3PnimB0yxyCI3Uh IkfxzYWdlPMujjSP08mZjfThjjBVLVUpurPgEhijxg92Cd9lEcmetkc9Anmq1P4uqoHwjq WvM8NfSNP7whwJ1DJ5IfZDXlDK/Y+8fkmN6x+s7Sry5/V2YR812gUiWxfCpKw+e4DLh1Pp DzIL/bOnySZFWFbWR7GR/3xreN1g//0ao6ZqmpeMTXPF9Lw4Vuv+ezIypxEZWA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581431351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9nipm84YiodFfOJC4dif2NqGfHQr7XwF0bF+IYlOa+M=; b=T+FOS/q1PbKNUOblABMyvua29OCg05Z/lrx7r2uRgX4SK5VMQdDZYyOz+NUFp5/1nFnegt 7ObXY5mn+LFGxpBA== 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> References: <20200211142853.8561-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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}" \