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 --- .../0001-Erase-EFI-boot-entry-on-EFI-systems.patch | 43 ---------------------- .../0001-Erase-EFI-boot-entry-on-EFI-systems.patch | 43 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 patches/fuel-astute/0001-Erase-EFI-boot-entry-on-EFI-systems.patch create mode 100644 patches/fuel-astute/multiarch-efi/0001-Erase-EFI-boot-entry-on-EFI-systems.patch (limited to 'patches/fuel-astute') diff --git a/patches/fuel-astute/0001-Erase-EFI-boot-entry-on-EFI-systems.patch b/patches/fuel-astute/0001-Erase-EFI-boot-entry-on-EFI-systems.patch deleted file mode 100644 index 905834df..00000000 --- a/patches/fuel-astute/0001-Erase-EFI-boot-entry-on-EFI-systems.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Alexandru Avadanii -Date: Mon, 18 Jul 2016 16:02:20 +0200 -Subject: [PATCH] Erase EFI boot entry on EFI systems. - -On EFI-enabled systemd, grub-install from grub-efi-* package -installs a boot entry named "ubuntu". - -Since this boot entry is saved in board flash memory, erasing -the MBR bootloader code and/or partition signature will not -clear the ubuntu boot entry, leaving it pointing to a loader -on the ESP (EFI System Partition) that will try to load the -kernel/initrd from an erased partition. - -In Fuel 8.0, the whole disk was erased, so the ubuntu EFI boot -entry was skipped due to missing ESP, while for Fuel 9.0 and -above we have to explicitly remove it to keep the system in a -sane state. - -Note: efibootmgr is installed automatically on EFI systems -as a dependency of grub-efi-*. - -Closes: ARMBAND-47 - -Signed-off-by: Alexandru Avadanii ---- - mcagents/erase_node.rb | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/mcagents/erase_node.rb b/mcagents/erase_node.rb -index 3eb98e8..3bac36f 100644 ---- a/mcagents/erase_node.rb -+++ b/mcagents/erase_node.rb -@@ -112,6 +112,10 @@ module MCollective - File.open('/proc/sys/kernel/panic','w') {|file| file.write("10\n")} - - begin -+ # clear out EFI boot entry on EFI-enabled systems -+ system("(which efibootmgr > /dev/null 2>&1 && efibootmgr | "\ -+ "grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | "\ -+ "xargs -I{} efibootmgr --delete-bootnum --bootnum {}) || true") - get_devices(type='all').each do |dev| - debug_msg("erasing bootstrap code area in MBR of #{dev[:name]}") - # clear out the boot code in MBR diff --git a/patches/fuel-astute/multiarch-efi/0001-Erase-EFI-boot-entry-on-EFI-systems.patch b/patches/fuel-astute/multiarch-efi/0001-Erase-EFI-boot-entry-on-EFI-systems.patch new file mode 100644 index 00000000..fa8a83a7 --- /dev/null +++ b/patches/fuel-astute/multiarch-efi/0001-Erase-EFI-boot-entry-on-EFI-systems.patch @@ -0,0 +1,43 @@ +From: Alexandru Avadanii +Date: Mon, 18 Jul 2016 16:02:20 +0200 +Subject: [PATCH] Erase EFI boot entry on EFI systems. + +On EFI-enabled systemd, grub-install from grub-efi-* package +installs a boot entry named "ubuntu". + +Since this boot entry is saved in board flash memory, erasing +the MBR bootloader code and/or partition signature will not +clear the ubuntu boot entry, leaving it pointing to a loader +on the ESP (EFI System Partition) that will try to load the +kernel/initrd from an erased partition. + +In Fuel 8.0, the whole disk was erased, so the ubuntu EFI boot +entry was skipped due to missing ESP, while for Fuel 9.0 and +above we have to explicitly remove it to keep the system in a +sane state. + +Note: efibootmgr is installed automatically on EFI systems +as a dependency of grub-efi-*. + +Closes: ARMBAND-47 + +Signed-off-by: Alexandru Avadanii +--- + mcagents/erase_node.rb | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/mcagents/erase_node.rb b/mcagents/erase_node.rb +index 3eb98e8..3bac36f 100644 +--- a/mcagents/erase_node.rb ++++ b/mcagents/erase_node.rb +@@ -112,6 +112,10 @@ module MCollective + File.open('/proc/sys/kernel/panic','w') {|file| file.write("10\n")} + + begin ++ # clear out EFI boot entry on EFI-enabled systems ++ system("(which efibootmgr > /dev/null 2>&1 && efibootmgr | "\ ++ "grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | "\ ++ "xargs -I{} efibootmgr --delete-bootnum --bootnum {}) || true") + get_devices(type='all').each do |dev| + debug_msg("erasing bootstrap code area in MBR of #{dev[:name]}") + # clear out the boot code in MBR -- cgit 1.2.3-korg