Merge "Copy OPNFV docs dir as documentation base."

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index e58fe0d..f077823 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,8 @@ patches-import:
                fi'
 clean-docker:
        docker stop FUEL_CENTOS_8.0 || true
-       docker rm $(docker ps -a -q) || true
-       docker rmi -f $(docker images -q) || true
+       docker rm $(shell docker ps -a -q) || true
+       docker rmi -f $(shell docker images -q) || true
 
 clean-build:
        sudo rm -rf /tmp/fuel-main
@@ -48,6 +48,10 @@ clean-build:
 release: export LC_ALL=en_US.UTF-8
 release: submodules-clean clean-docker clean-build submodules-init patches-import build
 
+ifneq ($(REVSTATE),)
+    EXTRA_PARAMS="REVSTATE=$(REVSTATE)"
+endif
+
 build:
        cd ${root}/upstream/fuel/build && \
                time make \
@@ -76,8 +80,8 @@ build:
                        PRODUCT_NAME=mos \
                        CENTOS_MAJOR=7 \
                        EXTRA_RPM_REPOS="armband,http://linux.enea.com/mos-repos/centos/mos8.0-centos7-fuel/armband/x86_64,10" \
-                       MIRROR_UBUNTU_URL=http://archive.ubuntu.com/ubuntu/ \
                        LATEST_MIRROR_ID_URL=http://linux.enea.com/ \
                        JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_arm64.deb \
+                       $(EXTRA_PARAMS) \
                        iso 2>&1 | tee ${root}/build.log