From 830a000faa01fc81259cf1d9abae42ef38871bd5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 9 May 2018 13:16:43 +0200 Subject: [PATCH] Remove "experimental" env-vars Experimental features are no longer a build-time option, and can be enabled at runtime. Signed-off-by: Sebastiaan van Stijn Upstream-commit: 050b421f4c435c90dc63bb094789b0513689e80c Component: packaging --- components/packaging/deb/Makefile | 1 - components/packaging/rpm/Makefile | 2 -- 2 files changed, 3 deletions(-) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 4265f7d293..2ba451c169 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -5,7 +5,6 @@ CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev DEB_VERSION=$(shell ./gen-deb-ver $(ENGINE_DIR) "$(VERSION)") -DOCKER_EXPERIMENTAL:=0 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown EPOCH?= diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index 5534eadd34..6b06fdf715 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -3,7 +3,6 @@ ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev -DOCKER_EXPERIMENTAL=0 GEN_RPM_VER=$(shell ./gen-rpm-ver $(ENGINE_DIR) $(VERSION)) CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown RPMBUILD=docker run --privileged --rm -i\ @@ -18,7 +17,6 @@ RPMBUILD_FLAGS=-ba\ --define '_release $(word 2,$(GEN_RPM_VER))' \ --define '_version $(word 1,$(GEN_RPM_VER))' \ --define '_origversion $(VERSION)' \ - --define '_experimental $(DOCKER_EXPERIMENTAL)' \ SPECS/docker-ce.spec .PHONY: help