Tidied up the last references to ODL

Change-Id: I715f47461622f2d26a492eb61d68b20ca84825aa
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>

diff --git a/fuel/build/Makefile b/fuel/build/Makefile
index 086839d..4714aed 100644 (file)
--- a/fuel/build/Makefile
+++ b/fuel/build/Makefile
@@ -108,10 +108,6 @@ $(SUBDIRS):
 patch-packages:
        ORIGISO=$(ISOCACHE) REVSTATE=$(REVSTATE) $(MAKE) -C $@ -f Makefile release
 
-.PHONY: prepare
-prepare:
-       #$(MAKE) -C opendaylight -f Makefile setup
-
 .PHONY: build-clean $(SUBCLEAN)
 build-clean: $(SUBCLEAN)
        $(MAKE) -C patch-packages -f Makefile clean
@@ -120,9 +116,8 @@ build-clean: $(SUBCLEAN)
        @rm -f $(NEWISO)
 
 .PHONY: clean $(SUBCLEAN)
-clean:  clean-cache prepare $(SUBCLEAN)
+clean:  clean-cache $(SUBCLEAN)
        $(MAKE) -C patch-packages -f Makefile clean
-       #$(MAKE) -C opendaylight -f Makefile clean
        @rm -f *.iso
        @rm -Rf release
        @rm -Rf newiso
@@ -135,7 +130,7 @@ $(SUBCLEAN): %.clean:
 # Todo: Make things smarter - we shouldn't need to clean everything
 # betwen make invocations.
 .PHONY: iso
-iso:   prepare build-clean $(ISOCACHE) $(SUBDIRS) patch-packages
+iso:   build-clean $(ISOCACHE) $(SUBDIRS) patch-packages
        install/install.sh iso $(ISOCACHE) $(NEWISO) $(PRODNO) $(REVSTATE)
        @printf "\n\nProduct ISO is $(NEWISO)\n\n"
 

diff --git a/fuel/build/cache.mk b/fuel/build/cache.mk
index e0699a8..6ce75a5 100644 (file)
--- a/fuel/build/cache.mk
+++ b/fuel/build/cache.mk
@@ -15,10 +15,8 @@ CACHECLEAN := $(addsuffix .clean,$(CACHEFILES) $(CACHEDIRS))
 ############################################################################
 # BEGIN of variables to customize
 #
-#CACHEDIRS := opendaylight/f_odl/package
+#CACHEDIRS := foo/bar
 
-#CACHEFILES := opendaylight/.odl-build-history
-#CACHEFILES += opendaylight/.odl-build.log
 CACHEFILES += .versions
 CACHEFILES += $(shell basename $(ISOSRC))
 #

diff --git a/fuel/build/config.mk b/fuel/build/config.mk
index 0583ac5..e9a5320 100644 (file)
--- a/fuel/build/config.mk
+++ b/fuel/build/config.mk
@@ -8,19 +8,12 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-ODL_MAIN_REPO := https://git.opendaylight.org/gerrit/p/controller.git
-ODL_MAIN_TAG := release/helium
-
 FUEL_MAIN_REPO := https://github.com/stackforge/fuel-main
 FUEL_MAIN_TAG = stable/6.1
 
 DOCKER_REPO := http://get.docker.com/builds/Linux/x86_64
 DOCKER_TAG := docker-latest
 
-.PHONY: get-odl-repo
-get-odl-repo:
-       @echo $(ODL_MAIN_REPO) $(ODL_MAIN_TAG)
-
 .PHONY: get-fuel-repo
 get-fuel-repo:
        @echo $(FUEL_MAIN_REPO) $(FUEL_MAIN_TAG)