diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-07-29 00:24:04 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-01 20:06:16 +0200 |
| commit | c5bfbf1f4bababbbf885414d0c6bdd9f01cae900 (patch) | |
| tree | 9867236392f739624feaadbc62b49e1d4103a69c /Makefile | |
| parent | e598628cf9603a3484d574ab5cb0c99311e2ddff (diff) | |
p/fuel: Rebase, drop upstream clone
Now that Fuel@OPNFV supports submodule patching again, bring back
`make fuel-patches-import`.
Change-Id: Ic6f9870d94b6d302f1ebcdc21d54a83f62910af9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 29 |
1 files changed, 29 insertions, 0 deletions
@@ -95,6 +95,35 @@ 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 $@ +############################################################################## +# 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 + # TODO: Bring back clean/debug/build after Fuel@OPNFV implements them for MCP |