openstack
/
fuel-main
Code Issues Proposed changes

Remove verbose option from rpmbuild 

rpmbuild verbose option generated very huge output.
  These output messages are useless, so they could be skipped

  Closes-bug: #1443496

Change-Id: Iedcde7d3a195d5037d17ae60fc5062ac362e6eb5
This commit is contained in:
iberezovskiy 2015-04-27 19:10:43 +03:00
parent 0128838095
commit 1ec588d364
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/openstack/rpm/module.mk
View File

@ -64,11 +64,11 @@ $(BUILD_DIR)/openstack/rpm/$1.done: \
sed "s/Version:.*/Version:\t`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`/" $(BUILD_DIR)/repos/$1-build/rpm/SPECS/*.spec > $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec
sed -i "s/Source0:.*/Source0:\t$1-`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`\.tar\.gz/" $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec
sudo cp $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec $$(SANDBOX)/tmp/
sudo chroot $$(SANDBOX) rpmbuild --nodeps -vv --define "_topdir /tmp" -bs /tmp/openstack-$1.spec
sudo chroot $$(SANDBOX) rpmbuild --nodeps --define "_topdir /tmp" -bs /tmp/openstack-$1.spec
sudo sh -c "$$$${INSTALL_CENTOS_REPO}"
sudo yum-builddep -c $$(SANDBOX)/etc/yum.conf --enablerepo=centos --enablerepo=centos-master --installroot=$$(SANDBOX) -y --nogpgcheck $$(SANDBOX)/tmp/SRPMS/openstack-$1*.rpm
sudo rm -rf $$(SANDBOX)/tmp/RPMS
sudo chroot $$(SANDBOX) rpmbuild --nodeps -vv --define "_topdir /tmp" -ba /tmp/openstack-$1.spec
sudo chroot $$(SANDBOX) rpmbuild --nodeps --define "_topdir /tmp" -ba /tmp/openstack-$1.spec
cp $$(SANDBOX)/tmp/RPMS/*/*$1*.rpm $(BUILD_DIR)/openstack/rpm/RPMS/x86_64
sudo createrepo $$(SANDBOX)/tmp/RPMS/noarch/
sudo yumdownloader --resolve -c $$(SANDBOX)/etc/yum.conf --enablerepo=centos --enablerepo=centos-master --enablerepo=openstack-local --destdir=$(LOCAL_MIRROR_CENTOS_OS_BASEURL)/Packages openstack-$1* | grep -v '^looking for' | tee $(BUILD_DIR)/openstack/yumdownloader.log

4
packages/rpm/module.mk
View File

@ -58,7 +58,7 @@ $(BUILD_DIR)/packages/rpm/$1.done:
sudo cp -r $(BUILD_DIR)/packages/sources/$1/* $$(SANDBOX)/tmp/SOURCES && \
sudo cp $$(SPECFILE) $$(SANDBOX)/tmp && \
sudo /bin/sh -c 'export TMPDIR=$$(SANDBOX)/tmp/yum TMP=$$(SANDBOX)/tmp/yum; yum-builddep -y -c $$(SANDBOX)/etc/yum.conf --installroot=$$(SANDBOX) $$(SANDBOX)/tmp/$1.spec' && \
sudo chroot $$(SANDBOX) rpmbuild --nodeps -vv --define "_topdir /tmp" -ba /tmp/$1.spec
sudo chroot $$(SANDBOX) rpmbuild --nodeps --define "_topdir /tmp" -ba /tmp/$1.spec
cp $$(SANDBOX)/tmp/RPMS/*/*.rpm $(BUILD_DIR)/packages/rpm/RPMS/x86_64
sudo sh -c "$$$${SANDBOX_DOWN}"
$$(ACTION.TOUCH)
@ -105,7 +105,7 @@ $(BUILD_DIR)/packages/rpm/fuel-docker-images.done: \
sudo cp -r $(BUILD_DIR)/docker/$(DOCKER_ART_NAME) $(SANDBOX)/tmp/SOURCES && \
(cd $(BUILD_DIR)/docker && sudo tar czf $(SANDBOX)/tmp/SOURCES/fuel-images-sources.tar.gz sources utils) && \
sudo cp $(SOURCE_DIR)/packages/rpm/specs/fuel-docker-images.spec $(SANDBOX)/tmp && \
sudo chroot $(SANDBOX) rpmbuild --nodeps -vv --define "_topdir /tmp" -ba /tmp/fuel-docker-images.spec
sudo chroot $(SANDBOX) rpmbuild --nodeps --define "_topdir /tmp" -ba /tmp/fuel-docker-images.spec
cp $(SANDBOX)/tmp/RPMS/*/fuel-docker-images-*.rpm $(BUILD_DIR)/packages/rpm/RPMS/x86_64
find $(BUILD_DIR)/packages/rpm/RPMS -name '*.rpm' | xargs cp -u --target-directory=$(LOCAL_MIRROR_CENTOS_OS_BASEURL)/Packages
createrepo -g $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/comps.xml \