From 80ba8c45cda5308010ded08b3d070343a92d58b5 Mon Sep 17 00:00:00 2001 From: Florin Dumitrascu Date: Tue, 8 Mar 2016 14:17:01 +0100 Subject: Add fixes and improvements for arm64 deployment [ Florin Dumitrascu ] * arm64 support for OpenDaylight Fuel Plugin [ Stanislaw Kardach ] * Limit ESP to first drive * Remove default+timeout+tr from cobbler profile * Fix puppet syntax errors * Disable usb tablet on aarch64 * Support direct kernel boot for CirrOS TestVM on aarch64 * Remove git version signature not to confuse patches-export * Fix VGA support for CirrOS TestVM * Makefile: Add clean-{docker,build}. [ Alexandru Avadanii ] * Performance: Use gzip instead of xz compression. * Switch mirror proto from https to http. * Update TODO with remaining tasks. * Disable amd64 Liberty fixture (no multi-arch support yet). * m1.micro: Increase RAM size to 128MB for aarch64 images. Signed-off-by: Alexandru Avadanii Signed-off-by: Florin Dumitrascu Signed-off-by: Stanislaw Kardach --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 34bfde7a..294a8861 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,8 @@ submodules-clean: patches-export: @git submodule -q foreach 'mkdir -p ${root}/patches/$$name' @git submodule -q foreach 'git format-patch \ - -o ${root}/patches/$$name -N armband-workbench-root' + -o ${root}/patches/$$name -N armband-workbench-root \ + --no-signature' @find ${root}/patches -name '*.patch' -exec sed -i -e '1d' {} \; # apply patches from patches/* to respective submodules @@ -33,6 +34,18 @@ patches-import: 'for p in $$(ls ${root}/patches/$$name/); do \ git am ${root}/patches/$$name/$$p; \ done' +clean-docker: + docker stop FUEL_CENTOS_8.0 || true + docker rm $(docker ps -a -q) || true + docker rmi -f $(docker images -q) || true + +clean-build: + sudo rm -rf /tmp/fuel-main + git -C ${root}/upstream/fuel reset --hard HEAD + git -C ${root}/upstream/fuel clean -xdff + +release: export LC_ALL=en_US.UTF-8 +release: submodules-clean clean-docker clean-build submodules-init patches-import build build: cd ${root}/upstream/fuel/build && \ @@ -48,12 +61,14 @@ build: FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \ QEMU_REPO=${root}/upstream/fuel-plugin-qemu \ OVSNFV_DPDK_REPO=${root}/upstream/fuel-plugin-ovsnfv \ + ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \ FUELLIB_COMMIT=HEAD \ NAILGUN_COMMIT=HEAD \ FUEL_AGENT_COMMIT=HEAD \ FUEL_MIRROR_COMMIT=HEAD \ QEMU_BRANCH=HEAD \ OVSNFV_DPDK_BRANCH=armband-workbench \ + ODL_BRANCH=armband-workbench \ PRODUCT_VERSION=8.0 \ PRODUCT_NAME=mos \ CENTOS_MAJOR=7 \ -- cgit 1.2.3-korg