diff options
| -rw-r--r-- | Makefile | 68 | ||||
| -rw-r--r-- | README.md | 29 | ||||
| -rw-r--r-- | armband-fuel-config.mk | 29 |
3 files changed, 11 insertions, 115 deletions
@@ -1,6 +1,5 @@ ############################################################################## -# Copyright (c) 2016 Cavium -# Copyright (c) 2016 Enea AB and others. +# 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 @@ -49,7 +48,6 @@ submodules-init: .submodules-init # Clean any changes made to submodules, checkout Armband root commit .PHONY: submodules-clean submodules-clean: .submodules-init - @test ! -d ${F_REPOS_DIR} || $(MAKE) fuel-patches-clean @git submodule -q foreach ' \ git am -q --abort 2>/dev/null; \ git checkout -q -f ${A_OPNFV_TAG}-root 2>/dev/null; \ @@ -97,68 +95,6 @@ patches-import: .submodules-init .submodules-patched fi \ done && \ git tag ${A_OPNFV_TAG}' - # Staging Fuel@OPNFV patches - @ls -d ${F_SUB_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 $@ -# Pass down debug/clean/deepclean/build to Fuel@OPNFV -.PHONY: clean debug -clean: .submodules-init -debug: fuel-patches-import -clean debug: - $(MAKE) -e --no-print-directory -C ${F_BUILD_DIR} $@ - -.PHONY: deepclean -deepclean: clean - $(MAKE) -e --no-print-directory -C ${F_BUILD_DIR} deepclean - @git submodule deinit -f . - @rm -f .submodules* - -.PHONY: build -build: patches-import - $(MAKE) -e --no-print-directory -C ${F_BUILD_DIR} all - -.PHONY: release -release: export LC_ALL=en_US.UTF-8 -release: build - -############################################################################## -# 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_REPOS_DIR} patches-import - -# Export Fuel@OPNFV patches, including Armband patches -.PHONY: fuel-patches-export -fuel-patches-export: .submodules-patched - $(MAKE) -e -C ${F_REPOS_DIR} patches-export - @ls -d ${F_PATCH_DIR}/* 2>/dev/null | while read p_sub_path; do \ - SUB_NAME=`basename $$p_sub_path`; \ - if [ -d $$p_sub_path/armband ]; then \ - echo "`tput setaf 6`* Pulling $$SUB_NAME patches.`tput sgr0`"; \ - cp -R $$p_sub_path/armband/* ${A_PATCH_DIR}/$$SUB_NAME && \ - rm -rf $$p_sub_path/armband; \ - fi \ - done - -.PHONY: fuel-patches-clean -fuel-patches-clean: - $(MAKE) -e -C ${F_REPOS_DIR} clean +# TODO: Bring back clean/debug/build after Fuel@OPNFV implements them for MCP @@ -1,7 +1,11 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2017 Enea AB and others + Armband Fuel@OPNFV ================== -This repository holds build scripts for Fuel 10.0 OPNFV installer +This repository holds build scripts for MCP Fuel OPNFV installer for AArch64 machines. Workflow @@ -28,7 +32,7 @@ The standard workflow should look as follows: NOTE: If you want to re-export patches, make sure to move the tag `${A_OPNFV_TAG}` to the latest commit that should be included. -5. Build with: +5. (not implemented yet for MCP) Build with: $ make build 6. Re-create patches via: @@ -48,24 +52,3 @@ and point it to `upstream/*` directory, i.e.: $ git submodule -b stable/mitaka add --name fuel-web \ https://github.com/openstack/fuel-web.git upstream/fuel-web - -Fuel@OPNFV submodule patch development --------------------------------------- -Fuel-submodules (fuel-astute, ... , fuel-ui) patches also reside in Armband, -like previously described patches that are applied to Armband submodules, -but they are not directly applied to any submodule in Armband. -Instead, they are copied (staged) to Fuel@OPNFV submodule, which will -automatically pick them up and apply them to its own submodules -(fuel-astute, ... , fuel-ui) during ISO build. - -The following helpers are available for working with patches for -Fuel-submodules (fuel-astute, ... , fuel-ui): - -1. Clean Fuel-submodules (fuel-astute, ... , fuel-ui) patches - $ make fuel-patches-clean - -2. Import Fuel-submodules staged patches - $ make fuel-patches-import - -3. Export Fuel-submodules patches - $ make fuel-patches-export 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 |