diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-05-11 12:48:40 +0200 |
|---|---|---|
| committer | Stefan Berg <stefan.k.berg@ericsson.com> | 2016-05-30 15:09:16 +0000 |
| commit | 6d672885e96f25309ef36da9a6b3c93968ec0c5e (patch) | |
| tree | 9f55d1ea4abbccb9891c0c6d7fbab4a0946a7d18 /build/f_isoroot/f_isolinux/Makefile | |
| parent | 370cf3546e2f5e3a7afa69b4f306bd7c90d44397 (diff) | |
Build system uplift to Fuel 9.0/Mitaka
Switching to Fuel 9.0/Mitaka for the build system.
Overhaul of the patching mechanism. As bootstrap_admin_node.sh has
been transitioned into an RPM (fuel-support), the lazy designer found
it more simple to patch that script during the Fuel build phase than
at the OPNFV ISO generation. The patch mechanism has been changed to a
normal context diff instead of the orig/modified file tuples
previously used. Hopefully this will require fewer manual rebases (may
the fuzz be with us!).
Also the ks.cfg patching has transitioned to a context based ordinary
patch for the same reasons, but this is as before taking place during
OPNFV ISO generation.
Patch naming made more descriptive.
The reaping mechanism has been slightly modified due to a change in
the naming of the node files when these are generated by the Fuel CLI.
IMPORTANT 1: The package cache mechanism is currently disabled, it is
only possible to install Fuel with a direct internet connection. This
will be fixed in a later change set!
IMPORTANT 2: All plugins has been disabled! As you have re-certified
your plugin with Fuel 9.0, please re-enable it in build/Makefile!
Change-Id: Ia918d16a74b68f89d178e06befe6e8a7a9367bf9
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'build/f_isoroot/f_isolinux/Makefile')
| -rw-r--r-- | build/f_isoroot/f_isolinux/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/build/f_isoroot/f_isolinux/Makefile b/build/f_isoroot/f_isolinux/Makefile index b683ea38c..f3e09b234 100644 --- a/build/f_isoroot/f_isolinux/Makefile +++ b/build/f_isoroot/f_isolinux/Makefile @@ -11,16 +11,19 @@ TOP := $(shell pwd) .PHONY: all -all: +all: isolinux.cfg.iso @mkdir -p release/isolinux - grep -q OpenStack_Fuel isolinux.cfg - sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" isolinux.cfg > isolinux.cfg.patched - @cp isolinux.cfg.patched release/isolinux/isolinux.cfg - @cp isolinux.cfg.orig release/isolinux/ + grep -q OpenStack_Fuel isolinux.cfg.iso + sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" isolinux.cfg.iso > isolinux.cfg + @cp isolinux.cfg release/isolinux/isolinux.cfg + @cp isolinux.cfg.iso release/isolinux/isolinux.cfg.orig + +isolinux.cfg.iso: + 7z -so x $(ISOCACHE) isolinux/isolinux.cfg > isolinux.cfg.iso .PHONY: clean clean: - @rm -rf release isolinux.cfg.patched + @rm -rf release isolinux.cfg.iso isolinux.cfg .PHONY: release release: all |