summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot/f_isolinux/Makefile
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-05-31 14:49:36 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-31 14:49:36 +0000
commitec0c7698cd363b71694ca33e87f65fc382acda8d (patch)
tree3472b6dbb13612ce59f00c8ef1630fd9c3ed25ed /build/f_isoroot/f_isolinux/Makefile
parentebb5b355ba542fc22b8f96f952439251d4b2c90b (diff)
parent6d672885e96f25309ef36da9a6b3c93968ec0c5e (diff)
Merge "Build system uplift to Fuel 9.0/Mitaka"
Diffstat (limited to 'build/f_isoroot/f_isolinux/Makefile')
-rw-r--r--build/f_isoroot/f_isolinux/Makefile15
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