From 320257e17b3a03915ed781fe955e39e1f5255591 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Mon, 29 Jun 2020 22:11:03 +0100 Subject: Update collectd tags to use main instead of master The branch names have been updated, and main has replaced master, which will no longer be updated. Change-Id: Idfce21554594f15a831c8b7ec769eb85d52068b1 Signed-off-by: Emma Foley --- src/package-list.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/package-list.mk') diff --git a/src/package-list.mk b/src/package-list.mk index 34e404c1..dce32cfb 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -22,8 +22,8 @@ COLLECTD_URL ?= https://github.com/collectd/collectd # there are 3 collectd flavors: # -"stable" - based on stable collectd release -# -"master" - development version, based on master branch -# -"experimental" - it is based on master branch as above and includes +# -"master" - development version, based on main branch +# -"experimental" - it is based on main branch as above and includes # set pull requests with experimental features ifeq ($(COLLECTD_FLAVOR), stable) # using latest stable release @@ -31,12 +31,12 @@ ifeq ($(COLLECTD_FLAVOR), stable) SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs else # 'master' and 'experimental' collectd flavors are both using -# code from master branch - COLLECTD_TAG ?= master +# code from main branch + COLLECTD_TAG ?= main SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-master ifeq ($(COLLECTD_FLAVOR), experimental) # 'experimental' flavor is using additional Pull Requests that -# are put on top of master release +# are put on top of main release COLLECTD_USE_EXPERIMENTAL_PR ?= y endif #end of experimental-branch handling endif -- cgit 1.2.3-korg