blob: bd1ef6d54217c3d2eb908de9ffacded4ae82767b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
##############################################################################
# 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
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# NOTE: Armband patching consists of:
# - clone upstream repositories to git submodules, tracking remotes;
# - tag each submodule (before patching) with "${A_OPNFV_TAG}-root";
# - apply Armband patches for each submodule;
# - tag each submodule (after patching) with "${OPNFV_TAG}";
# - stage Fuel submodule patches by copying them to Fuel f_repos/patch dir;
# - pass updated repository info to Fuel@OPNFV build system
# (e.g. FUEL_PLUGIN_ODL_CHANGE="${OPNFV_TAG}") via armband-fuel-config.mk;
# NOTE: Long-term goals (Armband repo should merge with Fuel@OPNFV):
# - all build related changes should affect Fuel@OPNFV, NOT Armband;
# - Armband make/build system should only handle patching non-Fuel submodules,
# and then invoke Fuel@OPNFV's patch & build system;
# - Fuel@OPNFV is made aware of an Armband type build by passing
# the "ARMBAND_BASE" env var;
SHELL = /bin/sh
export ARMBAND_BASE := $(shell pwd)
export OPNFV_GIT_SHA := $(shell git rev-parse HEAD)
export REVSTATE
include armband-fuel-config.mk
all: upgrade
# Ignore release tag and upgrade Armband to latest change on <branch>/HEAD
.PHONY: upgrade
upgrade:
@git fetch 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
submodules-init: .submodules-init
.submodules-init:
@if [ -n "${ARMBAND_TRACK_REMOTES}" ]; then \
git submodule update --init --remote 2>/dev/null; \
else \
git submodule update --init 2>/dev/null; \
fi
@touch $@
# Clean any changes made to submodules, checkout Armband root commit
.PHONY: submodules-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; \
git branch -q -D opnfv-armband 2>/dev/null; \
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-*
@$(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`"; \
mkdir -p $$SUB_DIR/$${SUB_FEATURE} && \
git format-patch --no-signature --ignore-space-at-eol \
-o $$SUB_DIR/$$SUB_FEATURE -N $$A_TAG-root..$$A_TAG; \
sed -i -e "1{/From: /!d}" -e "s/[[:space:]]*$$//" \
$$SUB_DIR/$$SUB_FEATURE/*.patch; \
done'
# Apply patches from patches/* to respective submodules
.PHONY: patches-import
patches-import: .submodules-init .submodules-patched
.submodules-patched: ${A_PATCHES}
@$(MAKE) submodules-clean
@git submodule -q foreach ' \
SUB_DIR=${A_PATCH_DIR}/$$name; mkdir -p $$SUB_DIR && \
git tag ${A_OPNFV_TAG}-root && \
git checkout -q -b opnfv-armband && \
find $$SUB_DIR -type d | sort | while read p_dir; do \
SUB_PATCHES=$$(ls $$p_dir/*.patch 2>/dev/null); \
if [ -n "$$SUB_PATCHES" ]; then \
SUB_FEATURE=$${p_dir#$$SUB_DIR} \
SUB_TAG=${A_OPNFV_TAG}-fuel$$SUB_FEATURE/patch; \
echo "`tput setaf 2`== patching $$name ($$SUB_TAG)`tput sgr0`";\
git tag $$SUB_TAG-root && \
git am -3 --whitespace=nowarn --patch-format=mbox \
--committer-date-is-author-date $$SUB_PATCHES && \
git tag $$SUB_TAG || exit 1; \
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
# 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
|
