diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch | 6 | ||||
| m--------- | upstream/fuel | 0 |
3 files changed, 11 insertions, 11 deletions
@@ -79,14 +79,14 @@ patches-export: submodules-init # For repos pinned in Fuel@OPNFV's config.mk, checkout pinned commit first .PHONY: patches-import patches-import: submodules-init - @git -C ${FUEL_BASE} checkout -q master - @git -C ${SUBMOD_DIR}/fuel-agent checkout -q ${FUEL_AGENT_COMMIT} - @git -C ${SUBMOD_DIR}/fuel-astute checkout -q ${ASTUTE_COMMIT} - @git -C ${SUBMOD_DIR}/fuel-library checkout -q ${FUELLIB_COMMIT} - @git -C ${SUBMOD_DIR}/fuel-mirror checkout -q ${FUEL_MIRROR_COMMIT} - @git -C ${SUBMOD_DIR}/fuel-nailgun-agent \ - checkout -q ${FUEL_NAILGUN_AGENT_COMMIT} - @git -C ${SUBMOD_DIR}/fuel-web checkout -q ${NAILGUN_COMMIT} + @cd ${FUEL_BASE} && git checkout -q master + @cd ${SUBMOD_DIR}/fuel-agent && git checkout -q ${FUEL_AGENT_COMMIT} + @cd ${SUBMOD_DIR}/fuel-astute && git checkout -q ${ASTUTE_COMMIT} + @cd ${SUBMOD_DIR}/fuel-library && git checkout -q ${FUELLIB_COMMIT} + @cd ${SUBMOD_DIR}/fuel-mirror && git checkout -q ${FUEL_MIRROR_COMMIT} + @cd ${SUBMOD_DIR}/fuel-nailgun-agent && \ + git checkout -q ${FUEL_NAILGUN_AGENT_COMMIT} + @cd ${SUBMOD_DIR}/fuel-web && git checkout -q ${NAILGUN_COMMIT} @git submodule -q foreach ' \ mkdir -p ${PATCH_DIR}/$$name; \ git tag armband-workbench-root; \ diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch index 31446652..7880fdfe 100644 --- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch +++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch @@ -89,9 +89,9 @@ index 0000000..1e772f0 + export FUELLIB_REPO := ${ARMBAND_BASE}/upstream/fuel-library + export FUELLIB_COMMIT := HEAD + -+ export ODL_REPO := ${ARMBAND_BASE}/upstream/fuel-plugin-opendaylight -+ export ODL_BRANCH := armband-workbench -+ export ODL_CHANGE := HEAD ++ export FUEL_PLUGIN_ODL_REPO := ${ARMBAND_BASE}/upstream/fuel-plugin-opendaylight ++ export FUEL_PLUGIN_ODL_BRANCH := armband-workbench ++ export FUEL_PLUGIN_ODL_CHANGE := HEAD + export OPNFV_QUAGGE_PACKAGING_REPO := https://github.com/alexandruavadanii/opnfv-quagga-packaging + + export OVS_NSH_DPDK_REPO := ${ARMBAND_BASE}/upstream/fuel-plugin-ovs diff --git a/upstream/fuel b/upstream/fuel -Subproject c71b57140fdbadfb4c1f39bf0e2df99403820dd +Subproject 08526c7376ee1b155dfb51f164f46f14f4ec6e5 |