From 7ce3a621f2156110f5434e95a46e6aa6aa1fb9a1 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 11 Jul 2017 17:43:07 +0200 Subject: MCP: Obsolete `fuel-patches-*` functionality We no longer require patching submodules in the Fuel@OPNFV submodule, so remove all obsolete code. Change-Id: I872ac7da2cd020b6882f8bc8304c03a8e528313f Signed-off-by: Alexandru Avadanii --- armband-fuel-config.mk | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'armband-fuel-config.mk') diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk index 50db8464..fa829033 100644 --- a/armband-fuel-config.mk +++ b/armband-fuel-config.mk @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2016 Enea AB and others. +# Copyright (c) 2016,2017 Enea AB and others. # Alexandru.Avadanii@enea.com # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -13,34 +13,11 @@ A_PATCH_DIR := ${ARMBAND_BASE}/patches A_OPNFV_TAG = armband-opnfv A_PATCHES = $(shell find ${A_PATCH_DIR} -name '*.patch') F_BUILD_DIR := ${A_FUEL_BASE}/build -F_REPOS_DIR := ${F_BUILD_DIR}/f_repos -F_PATCH_DIR := ${F_REPOS_DIR}/patch -F_SUB_DIR := ${F_REPOS_DIR}/sub # To enable remote tracking, set the following var to any non-empty string. # Leaving this var empty will bind each git submodule to its saved commit. ARMBAND_TRACK_REMOTES ?= yes -# Armband plugins, supported archs & specific info -export PLUGINS := f_yardstick-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild f_ovs-nsh-dpdk-pluginbuild f_tacker-pluginbuild -export UBUNTU_ARCH := amd64 arm64 -export PRODNO := OPNFV_A_FUEL -export MIRROR_MOS_UBUNTU := linux.enea.com -export EXTRA_RPM_REPOS := armband,http://linux.enea.com/mos-repos/centos/mos10.0-centos7/armband/x86_64,10 - -# Armband git submodules for Fuel/OPNFV components -export FUEL_PLUGIN_ODL_REPO := ${ARMBAND_BASE}/upstream/fuel-plugin-opendaylight -export FUEL_PLUGIN_ODL_BRANCH := opnfv-armband -export FUEL_PLUGIN_ODL_CHANGE := ${A_OPNFV_TAG} - -export OVS_NSH_DPDK_REPO := ${ARMBAND_BASE}/upstream/fuel-plugin-ovs -export OVS_NSH_DPDK_BRANCH := opnfv-armband -export OVS_NSH_DPDK_CHANGE := ${A_OPNFV_TAG} - -export VSPERF_REPO := ${ARMBAND_BASE}/upstream/vswitchperf -export VSPERF_BRANCH := opnfv-armband -export VSPERF_CHANGE := ${A_OPNFV_TAG} - # for the patches applying purposes (empty git config in docker build container) -export GIT_COMMITTER_NAME?=Fuel OPNFV -export GIT_COMMITTER_EMAIL?=fuel@opnfv.org +export GIT_COMMITTER_NAME?=OPNFV Armband +export GIT_COMMITTER_EMAIL?=armband@enea.com -- cgit 1.2.3-korg