This is an optional build arg that overrides the defaults that are set
by COLLECTD_FLAVOR
This should let the user pull from an arbitrary collectd branch (e.g. a
WIP branch or a PR branch from upstream)
Change-Id: I6d0ede2b8b57f28e152e53eddae378ac6c722706
Signed-off-by: Emma Foley <efoley@redhat.com>
FROM centos:8
ARG COLLECTD_FLAVOR=experimental
FROM centos:8
ARG COLLECTD_FLAVOR=experimental
-ARG COLLECTD_PULL_REQUESTS=
+ARG COLLECTD_PULL_REQUESTS
+ARG COLLECTD_CONFIG_CMD_ARGS
+ARG COLLECTD_TAG
ENV DOCKER y
ENV repos_dir /src
ENV DOCKER y
ENV repos_dir /src
include ../package-list.mk
WORK_DIR = collectd
include ../package-list.mk
WORK_DIR = collectd
-TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_TAG).done
+# $COLLECTD_TAG can contain "/", which is being replaced with "-" here
+TAG_DONE_FLAG := $(WORK_DIR)/.$(subst /,-,"$(COLLECTD_TAG)").done
BUILD_CMD = ./build.sh
CONFIG_CMD =
CONFIG_CMD += ./configure
BUILD_CMD = ./build.sh
CONFIG_CMD =
CONFIG_CMD += ./configure
$(TAG_DONE_FLAG): $(WORK_DIR)
@echo "Checking out collectd from tag: $(COLLECTD_TAG)"
$(TAG_DONE_FLAG): $(WORK_DIR)
@echo "Checking out collectd from tag: $(COLLECTD_TAG)"
- $(AT)cd collectd; git checkout $(COLLECTD_TAG)
+ $(AT)cd collectd; git fetch origin $(COLLECTD_TAG); git checkout FETCH_HEAD
ifneq ($(PATCH_FILE),)
$(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
endif
ifneq ($(PATCH_FILE),)
$(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
endif