Unhardcode FUEL version for fuel library
Change-Id: I311d0325efcae087ba1ae59b40106a6172adceaf Related-blueprint: package-fuel-components
This commit is contained in:
parent
5b898d26d2
commit
ad85171672
|
@ -91,7 +91,7 @@ $(eval $(call prepare_git_source,fuel-ostf,fuel-ostf-$(PACKAGE_VERSION).tar.gz,$
|
||||||
#ASTUTE_PKGS
|
#ASTUTE_PKGS
|
||||||
$(eval $(call prepare_git_source,astute,astute-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/astute,HEAD,$(ASTUTE_GERRIT_COMMIT)))
|
$(eval $(call prepare_git_source,astute,astute-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/astute,HEAD,$(ASTUTE_GERRIT_COMMIT)))
|
||||||
#FUELLIB_PKGS
|
#FUELLIB_PKGS
|
||||||
$(eval $(call prepare_git_source,fuel-library6.1,fuel-library6.1-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-library6.1,HEAD,$(FUELLIB_GERRIT_COMMIT)))
|
$(eval $(call prepare_git_source,fuel-library$(PRODUCT_VERSION),fuel-library$(PRODUCT_VERSION)-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/fuel-library$(PRODUCT_VERSION),HEAD,$(FUELLIB_GERRIT_COMMIT)))
|
||||||
#FUEL_PYTHON_PKGS
|
#FUEL_PYTHON_PKGS
|
||||||
$(eval $(call prepare_git_source,python-fuelclient,python-fuelclient-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/python-fuelclient,HEAD,$(PYTHON_FUELCLIENT_GERRIT_COMMIT)))
|
$(eval $(call prepare_git_source,python-fuelclient,python-fuelclient-$(PACKAGE_VERSION).tar.gz,$(BUILD_DIR)/repos/python-fuelclient,HEAD,$(PYTHON_FUELCLIENT_GERRIT_COMMIT)))
|
||||||
#FUEL-IMAGE PKGS
|
#FUEL-IMAGE PKGS
|
||||||
|
@ -116,8 +116,8 @@ packages-rpm: $(BUILD_DIR)/packages/rpm/build.done
|
||||||
packages-deb: $(BUILD_DIR)/packages/deb/build.done
|
packages-deb: $(BUILD_DIR)/packages/deb/build.done
|
||||||
|
|
||||||
#FIXME(aglarendil): make sources generation uniform
|
#FIXME(aglarendil): make sources generation uniform
|
||||||
#$(BUILD_DIR)/packages/source_fuel-library.done: $(BUILD_DIR)/packages/source_fuel-library6.1.done
|
#$(BUILD_DIR)/packages/source_fuel-library.done: $(BUILD_DIR)/packages/source_fuel-library$(PRODUCT_VERSION).done
|
||||||
# ln -s $(BUILD_DIR)/packages/sources/fuel-library6.1 $(BUILD_DIR)/packages/sources/fuel-library
|
# ln -s $(BUILD_DIR)/packages/sources/fuel-library$(PRODUCT_VERSION) $(BUILD_DIR)/packages/sources/fuel-library
|
||||||
# $(ACTION.TOUCH)
|
# $(ACTION.TOUCH)
|
||||||
|
|
||||||
###################################
|
###################################
|
||||||
|
|
6
repos.mk
6
repos.mk
|
@ -47,12 +47,12 @@ $(eval $(call build_repo,fuel-ostf,$(OSTF_REPO),$(OSTF_COMMIT),$(OSTF_GERRIT_URL
|
||||||
$(BUILD_DIR)/repos/fuel-main.done:
|
$(BUILD_DIR)/repos/fuel-main.done:
|
||||||
ln -s $(SOURCE_DIR) $(BUILD_DIR)/repos/fuel-main
|
ln -s $(SOURCE_DIR) $(BUILD_DIR)/repos/fuel-main
|
||||||
$(ACTION.TOUCH)
|
$(ACTION.TOUCH)
|
||||||
$(BUILD_DIR)/repos/repos.done: $(BUILD_DIR)/repos/fuel-main.done $(BUILD_DIR)/repos/fuel-library6.1.done
|
$(BUILD_DIR)/repos/repos.done: $(BUILD_DIR)/repos/fuel-main.done $(BUILD_DIR)/repos/fuel-library$(PRODUCT_VERSION).done
|
||||||
|
|
||||||
#FIXME(aglarendil): make repos generation uniform
|
#FIXME(aglarendil): make repos generation uniform
|
||||||
|
|
||||||
$(BUILD_DIR)/repos/fuel-library6.1.done: $(BUILD_DIR)/repos/fuel-library.done
|
$(BUILD_DIR)/repos/fuel-library$(PRODUCT_VERSION).done: $(BUILD_DIR)/repos/fuel-library.done
|
||||||
ln -s $(BUILD_DIR)/repos/fuel-library $(BUILD_DIR)/repos/fuel-library6.1
|
ln -s $(BUILD_DIR)/repos/fuel-library $(BUILD_DIR)/repos/fuel-library$(PRODUCT_VERSION)
|
||||||
$(ACTION.TOUCH)
|
$(ACTION.TOUCH)
|
||||||
|
|
||||||
$(BUILD_DIR)/repos/repos.done:
|
$(BUILD_DIR)/repos/repos.done:
|
||||||
|
|
Loading…
Reference in New Issue