[docs] Use RTD links for OPNFV Fuel docs refs

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index 35a3f08..841b6b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 ##############################################################################
-# Copyright (c) 2016 Cavium
-# Copyright (c) 2016 Enea AB and others.
+# Copyright (c) 2016,2017 Cavium, Enea AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -31,7 +30,14 @@ export REVSTATE
 
 include armband-fuel-config.mk
 
-all: release
+all: upgrade
+
+# Ignore release tag and upgrade Armband to latest change on <branch>/HEAD
+.PHONY: upgrade
+upgrade:
+       @git fetch -u origin ${A_BRANCH}:${A_BRANCH}
+       @git checkout ${A_BRANCH}
+       @$(MAKE) -e submodules-clean patches-import
 
 # Fetch & update git submodules, checkout remote HEAD
 .PHONY: submodules-init
@@ -43,13 +49,11 @@ submodules-init: .submodules-init
        else \
                git submodule update --init 2>/dev/null; \
        fi
-       @ln -sf ${A_FUEL_BASE}/ci/clean_cache.sh ${ARMBAND_BASE}/ci/clean_cache.sh
        @touch $@
 
 # Clean any changes made to submodules, checkout Armband root commit
 .PHONY: submodules-clean
-submodules-clean: .submodules-init
-       @test ! -d ${F_REPOS_DIR} || $(MAKE) fuel-patches-clean
+submodules-clean:
        @git submodule -q foreach ' \
                git am -q --abort 2>/dev/null; \
                git checkout -q -f ${A_OPNFV_TAG}-root 2>/dev/null; \
@@ -57,13 +61,15 @@ submodules-clean: .submodules-init
                git tag | grep ${A_OPNFV_TAG} | xargs git tag -d > /dev/null 2>&1; \
                git reset -q --hard HEAD; \
                git clean -xdff'
-       @rm -f .submodules-patched
+       @rm -f .submodules-*
+       @$(MAKE) -e submodules-init
 
 # Generate patches from submodules
 .PHONY: patches-export
 patches-export: .submodules-init
        @git submodule -q foreach ' \
                SUB_DIR=${A_PATCH_DIR}/$$name; \
+               rm -rf $$SUB_DIR/*; \
                git tag | awk "!/root/ && /${A_OPNFV_TAG}-fuel/" | while read A_TAG; do \
                        SUB_FEATURE=`dirname $${A_TAG#${A_OPNFV_TAG}-fuel/}`; \
                        echo "`tput setaf 2`== exporting $$name ($$A_TAG)`tput sgr0`"; \
@@ -98,7 +104,7 @@ patches-import: .submodules-init .submodules-patched
                done && \
                git tag ${A_OPNFV_TAG}'
        # Staging Fuel@OPNFV patches
-       @ls -d ${F_SUB_DIR}/* 2>/dev/null | while read p_sub_path; do \
+       @ls -d ${F_PATCH_DIR}/* 2>/dev/null | while read p_sub_path; do \
                SUB_NAME=`basename $$p_sub_path`; \
                find ${A_PATCH_DIR}/$$SUB_NAME -name '*.patch' 2>/dev/null -exec sh -c '\
                        A_PATCH={}; R_PATCH=$${A_PATCH#${A_PATCH_DIR}/}; \
@@ -116,49 +122,23 @@ patches-import: .submodules-init .submodules-patched
        done
        @touch $@
 
-# Pass down debug/clean/deepclean/build to Fuel@OPNFV
-.PHONY: clean debug
-clean: .submodules-init
-debug: fuel-patches-import
-clean debug:
-       $(MAKE) -e --no-print-directory -C ${F_BUILD_DIR} $@
-
-.PHONY: deepclean
-deepclean: clean
-       $(MAKE) -e --no-print-directory -C ${F_BUILD_DIR} deepclean
-       @git submodule deinit -f .
-       @rm -f .submodules*
-
-.PHONY: build
-build: patches-import
-       $(MAKE) -e --no-print-directory -C ${F_BUILD_DIR} all
-
-.PHONY: release
-release: export LC_ALL=en_US.UTF-8
-release: build
-
 ##############################################################################
 # Fuel@OPNFV patch operations - to be used only during development
 ##############################################################################
-
 # Apply all Fuel@OPNFV patches, including Armband patches
 .PHONY: fuel-patches-import
 fuel-patches-import: .submodules-patched fuel-patches-clean
-       $(MAKE) -e -C ${F_REPOS_DIR} patches-import
-
-# Export Fuel@OPNFV patches, including Armband patches
-.PHONY: fuel-patches-export
-fuel-patches-export: .submodules-patched
-       $(MAKE) -e -C ${F_REPOS_DIR} patches-export
-       @ls -d ${F_PATCH_DIR}/* 2>/dev/null | while read p_sub_path; do \
-               SUB_NAME=`basename $$p_sub_path`; \
-               if [ -d $$p_sub_path/armband ]; then \
-                       echo "`tput setaf 6`* Pulling $$SUB_NAME patches.`tput sgr0`"; \
-                       cp -R $$p_sub_path/armband/* ${A_PATCH_DIR}/$$SUB_NAME && \
-                               rm -rf $$p_sub_path/armband; \
-               fi \
-       done
+       $(MAKE) -e -C ${F_PATCH_DIR} patches-import
 
 .PHONY: fuel-patches-clean
 fuel-patches-clean:
-       $(MAKE) -e -C ${F_REPOS_DIR} clean
+       $(MAKE) -e -C ${F_PATCH_DIR} clean
+
+# Add copyright header to patch files if not already present
+.PHONY: patches-copyright
+patches-copyright:
+       @grep -e "Copyright (c)" -L ${A_PATCHES} | while read p_file; do \
+               ptmp=`mktemp` && \
+               cat armband-patch-copyright.template $$p_file > $$ptmp && \
+               mv $$ptmp $$p_file; \
+       done