Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: build: remove make rpm and related ......................................................................
packaging: build: remove make rpm and related not needed any more as people use the standard commands. Change-Id: Id5950908156e42b0ae972227af41e23a06f2671a Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile 1 file changed, 1 insertion(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/05/23205/1 diff --git a/Makefile b/Makefile index 7fdf96a..1d23abb 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,6 @@ PACKAGE_NAME=ovirt-engine-dwh MVN=mvn -RPMBUILD=rpmbuild PYTHON=python PYFLAKES=pyflakes PEP8=pep8 @@ -76,7 +75,6 @@ BUILD_FLAGS:=$(BUILD_FLAGS) $(EXTRA_BUILD_FLAGS) PYTHON_SYS_DIR:=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib as f;print(f())") -OUTPUT_RPMBUILD=$(shell pwd -P)/tmp.rpmbuild OUTPUT_DIR=output TARBALL=$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz ARCH=noarch @@ -149,7 +147,7 @@ clean: $(MVN) clean $(EXTRA_BUILD_FLAGS) - rm -rf $(OUTPUT_RPMBUILD) $(OUTPUT_DIR) $(BUILD_FILE) + rm -rf $(OUTPUT_DIR) $(BUILD_FILE) rm -rf $(GENERATED) test: @@ -164,35 +162,8 @@ .PHONY: ovirt-engine-dwh.spec.in -# legacy -tarball: dist dist: ovirt-engine-dwh.spec git ls-files | tar --files-from /proc/self/fd/0 -czf "$(TARBALL)" ovirt-engine-dwh.spec - @echo - @echo You can use $(RPMBUILD) -tb $(TARBALL) to produce rpms - @echo - -srpm: dist - rm -rf $(OUTPUT_RPMBUILD) - mkdir -p $(OUTPUT_RPMBUILD)/{SPECS,RPMS,SRPMS,SOURCES,BUILD,BUILDROOT} - mkdir -p $(OUTPUT_DIR) - $(RPMBUILD) -ts --define="_topdir $(OUTPUT_RPMBUILD)" $(TARBALL) - mv $(OUTPUT_RPMBUILD)/SRPMS/*.rpm $(OUTPUT_DIR) - rm -rf $(OUTPUT_RPMBUILD) - @echo - @echo srpm is ready at $(OUTPUT_DIR) - @echo - -rpm: srpm - 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) - mv $(OUTPUT_RPMBUILD)/RPMS/$(ARCH)/*.rpm $(OUTPUT_DIR) - rm -rf $(OUTPUT_RPMBUILD) - @echo - @echo rpms are ready at $(OUTPUT_DIR) - @echo # copy SOURCEDIR to TARGETDIR # exclude EXCLUDEGEN a list of files to exclude with .in -- To view, visit http://gerrit.ovirt.org/23205 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5950908156e42b0ae972227af41e23a06f2671a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
