Commit 0be3b668 authored by Michał Kępień's avatar Michał Kępień
Browse files

Include vendor in optional installation variables

Some Linux distributions (e.g. Alpine Linux) neither use release
codenames nor include the distribution name in their Docker tags.  Since
variable names like "dnstap_3.11_amd64" would cause confusion, include
distribution names in the names of Makefile variables controlling
conditional installations.
parent 9003b3b5
...@@ -27,16 +27,16 @@ endif ...@@ -27,16 +27,16 @@ endif
softhsm_buster_amd64 := 2 softhsm_buster_amd64 := 2
# Define extras # Define extras
abi_check_buster_amd64 := yes abi_check_debian_buster_amd64 := yes
coccinelle_buster_amd64 := yes coccinelle_debian_buster_amd64 := yes
compiledb_buster_amd64 := yes compiledb_debian_buster_amd64 := yes
cppcheck_buster_amd64 := yes cppcheck_debian_buster_amd64 := yes
dnstap_buster_amd64 := yes dnstap_debian_buster_amd64 := yes
dnstap_centos7_amd64 := yes dnstap_centos_centos7_amd64 := yes
dnstap_sid_amd64 := yes dnstap_debian_sid_amd64 := yes
dnstap_sid_i386 := yes dnstap_debian_sid_i386 := yes
respdiff_buster_amd64 := yes respdiff_debian_buster_amd64 := yes
shellcheck_sid_amd64 := yes shellcheck_debian_sid_amd64 := yes
# Install latest stable version of LLVM/Clang # Install latest stable version of LLVM/Clang
clang_stretch_amd64 := 10 clang_stretch_amd64 := 10
...@@ -74,15 +74,15 @@ $(TARGETS): VENDOR = $(word 1,$(subst -, ,$@)) ...@@ -74,15 +74,15 @@ $(TARGETS): VENDOR = $(word 1,$(subst -, ,$@))
$(TARGETS): VERSION = $(word 2,$(subst -, ,$@)) $(TARGETS): VERSION = $(word 2,$(subst -, ,$@))
$(TARGETS): SOURCE_IMAGE = $(subst arm64,arm64v8/,$(subst amd64,,$(subst i386,i386/,$(ARCH))))$(VENDOR):$(VERSION) $(TARGETS): SOURCE_IMAGE = $(subst arm64,arm64v8/,$(subst amd64,,$(subst i386,i386/,$(ARCH))))$(VENDOR):$(VERSION)
$(TARGETS): CI_REGISTRY_NAME = $(CI_REGISTRY_PREFIX):$@ $(TARGETS): CI_REGISTRY_NAME = $(CI_REGISTRY_PREFIX):$@
$(TARGETS): ABI_CHECK = $(abi_check_$(VERSION)_$(ARCH)) $(TARGETS): ABI_CHECK = $(abi_check_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): CLANG = $(clang_$(VERSION)_$(ARCH)) $(TARGETS): CLANG = $(clang_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): COCCINELLE = $(coccinelle_$(VERSION)_$(ARCH)) $(TARGETS): COCCINELLE = $(coccinelle_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): COMPILEDB = $(compiledb_$(VERSION)_$(ARCH)) $(TARGETS): COMPILEDB = $(compiledb_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): CPPCHECK = $(cppcheck_$(VERSION)_$(ARCH)) $(TARGETS): CPPCHECK = $(cppcheck_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): DNSTAP = $(dnstap_$(VERSION)_$(ARCH)) $(TARGETS): DNSTAP = $(dnstap_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): RESPDIFF = $(respdiff_$(VERSION)_$(ARCH)) $(TARGETS): RESPDIFF = $(respdiff_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): SHELLCHECK = $(shellcheck_$(VERSION)_$(ARCH)) $(TARGETS): SHELLCHECK = $(shellcheck_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): SOFTHSM = $(softhsm_$(VERSION)_$(ARCH)) $(TARGETS): SOFTHSM = $(softhsm_$(VENDOR)_$(VERSION)_$(ARCH))
$(TARGETS): $(TARGETS):
$(info Building $(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME) from $(SOURCE_IMAGE)) $(info Building $(CI_REGISTRY_IMAGE)/$(CI_REGISTRY_NAME) from $(SOURCE_IMAGE))
mkdir -p bind9/$@ mkdir -p bind9/$@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment