u/fuel: Bump & rebase for galera formula pinning

[armband.git] / Makefile

diff --git a/Makefile b/Makefile
index 5c8504b..e7cd2c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,6 @@ 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
@@ -95,6 +94,42 @@ patches-import: .submodules-init .submodules-patched
                        fi \
                done && \
                git tag ${A_OPNFV_TAG}'
+       # Staging Fuel@OPNFV patches
+       @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}/}; \
+                       F_PATCH=${F_PATCH_DIR}/$${0}/armband/$${R_PATCH#$${0}/}; \
+                       if [ -f $$F_PATCH ]; then \
+                               echo "`tput setaf 3`* WARN: $$R_PATCH upstream.`tput sgr0`"; \
+                       else \
+                               if [ -h $$A_PATCH ]; then \
+                                       echo "`tput setaf 3`* PHONY: $$R_PATCH`tput sgr0`"; \
+                               else \
+                                       echo "`tput setaf 6`* Staging $$R_PATCH`tput sgr0`"; \
+                                       mkdir -p `dirname $$F_PATCH` && cp $$A_PATCH $$F_PATCH; \
+                               fi; \
+                       fi' "$$SUB_NAME" \; || true ; \
+       done
        @touch $@
 
-# TODO: Bring back clean/debug/build after Fuel@OPNFV implements them for MCP
+##############################################################################
+# 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_PATCH_DIR} patches-import
+
+.PHONY: fuel-patches-clean
+fuel-patches-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