Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: build: fix make rpm target ......................................................................
packaging: build: fix make rpm target was broken by the quote all patch, as srpm had wildcards. remove the variable that is used one time and quote correctly. Change-Id: I4632c1dd2007d2b513f59e08846da7d8030b8865 Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/15963/1 diff --git a/Makefile b/Makefile index d59a282..050c7ee 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,6 @@ OUTPUT_RPMBUILD=$(shell pwd -P)/tmp.rpmbuild OUTPUT_DIR=output TARBALL=$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz -SRPM=$(OUTPUT_DIR)/$(PACKAGE_NAME)-$(RPM_VERSION)*.src.rpm ARCH=noarch BUILD_FILE=tmp.built MAVEN_OUTPUT_DIR_DEFAULT=$(shell pwd -P)/tmp.repos @@ -265,7 +264,7 @@ rm -rf "$(OUTPUT_RPMBUILD)" mkdir -p "$(OUTPUT_RPMBUILD)"/{SPECS,RPMS,SRPMS,SOURCES,BUILD,BUILDROOT} mkdir -p "$(OUTPUT_DIR)" - $(RPMBUILD) --define="_topdir $(OUTPUT_RPMBUILD)" $(RPMBUILD_EXTRA_ARGS) --rebuild "$(SRPM)" + $(RPMBUILD) --define="_topdir $(OUTPUT_RPMBUILD)" $(RPMBUILD_EXTRA_ARGS) "$(OUTPUT_DIR)/$(PACKAGE_NAME)-$(RPM_VERSION)"*.src.rpm mv $(OUTPUT_RPMBUILD)/RPMS/$(ARCH)/*.rpm "$(OUTPUT_DIR)" rm -rf "$(OUTPUT_RPMBUILD)" @echo -- To view, visit http://gerrit.ovirt.org/15963 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4632c1dd2007d2b513f59e08846da7d8030b8865 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
