From 42f8585ebb8fffad19a89314659ab9129176c3e9 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 1 Oct 2016 13:18:11 +0200 Subject: build: Rework patch mechanism for Fuel submodules While refactoring the patching mechanism, take care of: - Sync submodule handling with Fuel@OPFNV; - build: Investigate/prepare for moving patches to Fuel@OPNFV; - build: Investigate divergent fuel-mirror; - ISO build: cacheid for Fuel comps should not depend on Armband git commit; CHANGE: Rename/shuffle patches while grouping them in "features", preparing for upstreaming them to Fuel@OPNFV and beyond. CHANGE: Allow linking patches for better representing the dependency between one patch and different features. e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch: - part of `multiarch-fuel`, because it extends Fuel; - part of `direct-kernel-boot`, as arch is required for that; - part of `cross-bootstrap`, target image is arch-dependent; NOTE: Patch links are not staged to Fuel@OPNFV, they only serve as markers that a specific patch is part of a feature. CHANGE: Kill all Fuel component submodules, now handled in Fuel@OPNFV: - fuel-agent - fuel-astute - fuel-library - fuel-mirror - fuel-nailgun-agent - fuel-web CHANGE: Move armband-fuel-config.mk to armband git root. FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT part of `cross-bootstrap` feature, but patch context says so ... FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at `make patches-export` by removing spaces at EOL. v2 -> v3: * Phony patch support (links to show a patch belongs to a feature); * Updated README.md v3 -> v7: * Re-export Fuel submodules & plugins patches (update patch context); * Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/); * Ignore submodule changes; * Add armband git repo info to gitinfo_fuel.txt at build time; Implements: ARMBAND-136 Closes-bug: ARMBAND-95 Closes-bug: ARMBAND-93 Closes-bug: ARMBAND-92 Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973 Signed-off-by: Alexandru Avadanii --- ...deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch (limited to 'patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch') diff --git a/patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch b/patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch new file mode 100644 index 00000000..3b3c612a --- /dev/null +++ b/patches/opnfv-fuel/multiarch-efi/0001-FIXME-deploy-EFI-Skip-re-ordering-boot-via-IPMI.patch @@ -0,0 +1,31 @@ +From: Alexandru Avadanii +Date: Fri, 9 Sep 2016 17:55:38 +0200 +Subject: [PATCH] FIXME: deploy: EFI: Skip re-ordering boot via IPMI + +On EFI systems deploys, altering the boot order via IPMI causes +issues on some specific targets. Until we agree on an uniform +solution for EFI systems + IPMI boot order handling, just skip +altering it via IPMI. + +Related-bug: https://jira.opnfv.org/browse/ARMBAND-71 + +Signed-off-by: Alexandru Avadanii +--- + deploy/deploy_env.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/deploy/deploy_env.py b/deploy/deploy_env.py +index 93dc395..1d2dfeb 100644 +--- a/deploy/deploy_env.py ++++ b/deploy/deploy_env.py +@@ -255,7 +255,9 @@ class CloudDeploy(object): + + def set_boot_order_nodes(self): + self.power_off_nodes() +- self.set_boot_order(['pxe', 'disk']) ++ # ARMBAND FIXME: See https://jira.opnfv.org/browse/ARMBAND-71 ++ # Until we choose an uniform design on EFI systems, just disable it ++ # self.set_boot_order(['pxe', 'disk']) + self.power_on_nodes() + + def get_put_deploy_log(self): -- cgit 1.2.3-korg