Updated Branches: refs/heads/branch-0.3.1 d29794062 -> a806283de
BIGTOP-911. fix package.mk to write bigtop.bom Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/a806283d Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/a806283d Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/a806283d Branch: refs/heads/branch-0.3.1 Commit: a806283de76d1ded5259b256814dc700fbebd41e Parents: d297940 Author: Konstantin Boudnik <[email protected]> Authored: Sat Apr 6 17:27:49 2013 -0700 Committer: Konstantin Boudnik <[email protected]> Committed: Sat Apr 6 17:27:49 2013 -0700 ---------------------------------------------------------------------- Makefile | 1 + package.mk | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/a806283d/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index bdcde00..face805 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,7 @@ world: all packages: $(TARGETS) help-header: + @echo " Bigtop BOM: $(BIGTOP_BOM)" @echo " targets:" @echo " all (all TGZs/SRPMS/SDEBS)" @echo " srpm (all SRPMs)" http://git-wip-us.apache.org/repos/asf/bigtop/blob/a806283d/package.mk ---------------------------------------------------------------------- diff --git a/package.mk b/package.mk index 5eaac8a..c0799ef 100644 --- a/package.mk +++ b/package.mk @@ -31,6 +31,7 @@ $(BUILD_DIR)/%/.srpm: mkdir -p $(PKG_BUILD_DIR)/rpm/{INSTALL,SOURCES,BUILD,SRPMS} [ -z "$($(PKG)_TARBALL_SRC)" ] || cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/rpm/SOURCES [ -d $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME) ] && cp -r $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/* $(PKG_BUILD_DIR)/rpm/SOURCES + echo -e "$(BIGTOP_BOM)" | tr ' ' '\012' >> $(PKG_BUILD_DIR)/rpm/SOURCES/bigtop.bom PKG_NAME_FOR_PKG=$(subst -,_,$($(PKG)_NAME)); \ rpmbuild --define "_topdir $(PKG_BUILD_DIR)/rpm/" \ --define "$${PKG_NAME_FOR_PKG}_base_version $($(PKG)_BASE_VERSION)" \ @@ -78,7 +79,7 @@ $(BUILD_DIR)/%/.sdeb: cd $(PKG_BUILD_DIR)/deb/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) && \ cp -r $(BASE_DIR)/bigtop-packages/src/deb/$($(PKG)_NAME) debian && \ cp -r $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/* debian && \ - echo -e "version=$(PKG_PKG_VERSION)\ngit.hash=deadbeaf" >> debian/build.properties && \ + echo -e "$(BIGTOP_BOM)" | tr ' ' '\012' >> debian/bigtop.bom && \ (echo -e "$($(PKG)_PKG_NAME) ($(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE)) stable; urgency=low\n" && \ echo " Clean build" && \ echo " -- Bigtop <[email protected]> "`date +'%a, %d %b %Y %T %z'`) > debian/changelog && \ @@ -226,4 +227,6 @@ TARGETS_SDEB += $(1)-sdeb TARGETS_DEB += $(1)-deb TARGETS_YUM += $(1)-yum TARGETS_APT += $(1)-apt + +BIGTOP_BOM += $(2)_VERSION=$($(2)_BASE_VERSION) endef
