diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-05-31 14:49:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-31 14:49:36 +0000 |
| commit | ec0c7698cd363b71694ca33e87f65fc382acda8d (patch) | |
| tree | 3472b6dbb13612ce59f00c8ef1630fd9c3ed25ed /build/f_isoroot/f_kscfg/Makefile | |
| parent | ebb5b355ba542fc22b8f96f952439251d4b2c90b (diff) | |
| parent | 6d672885e96f25309ef36da9a6b3c93968ec0c5e (diff) | |
Merge "Build system uplift to Fuel 9.0/Mitaka"
Diffstat (limited to 'build/f_isoroot/f_kscfg/Makefile')
| -rw-r--r-- | build/f_isoroot/f_kscfg/Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build/f_isoroot/f_kscfg/Makefile b/build/f_isoroot/f_kscfg/Makefile index 2a82a1803..cfd433f8d 100644 --- a/build/f_isoroot/f_kscfg/Makefile +++ b/build/f_isoroot/f_kscfg/Makefile @@ -11,16 +11,20 @@ TOP := $(shell pwd) .PHONY: all -all: +all: ks.cfg.iso @mkdir -p release - grep -q OpenStack_Fuel ks.cfg - sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" ks.cfg > ks.cfg.patched - @cp ks.cfg.patched release/ks.cfg - @cp ks.cfg.orig release + grep -q OpenStack_Fuel ks.cfg.iso + sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" ks.cfg.iso > ks.cfg + /usr/bin/patch -p0 < ks.cfg.patch + @cp ks.cfg.iso release/ks.cfg.orig + @cp ks.cfg release/ks.cfg + +ks.cfg.iso: + 7z -so x $(ISOCACHE) ks.cfg > ks.cfg.iso .PHONY: clean clean: - @rm -rf release ks.cfg.patched + @rm -rf release ks.cfg.iso ks.cfg .PHONY: release release: all |