summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Kulanov <skulanov@mirantis.com>2016-06-21 13:03:11 +0000
committerSergey Kulanov <skulanov@mirantis.com>2016-06-21 13:03:11 +0000
commit756b03e93f8d581b189c0a99d86114e4720f1396 (patch)
tree040ae3daef9a336ecf1a39a198d2c617a4ca69bd
parent33af46be827919cd6e20dd8a7b8b86ffb00ce144 (diff)
Revert "Minor changes to run 'make iso' on xenial host."
Notes
Notes (review): Code-Review+1: Dmitry Burmistrov <dburmistrov@mirantis.com> Code-Review+1: Vitaly Parakhin <vparakhin@mirantis.com> Code-Review+1: Vladimir Kozhukalov <vkozhukalov@mirantis.com> Code-Review+2: Sergey Kulanov <skulanov@mirantis.com> Workflow+1: Sergey Kulanov <skulanov@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 21 Jun 2016 13:27:35 +0000 Reviewed-on: https://review.openstack.org/332125 Project: openstack/fuel-main Branch: refs/heads/master
-rw-r--r--packages/rpm/module.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/rpm/module.mk b/packages/rpm/module.mk
index fc71d88..b235f1d 100644
--- a/packages/rpm/module.mk
+++ b/packages/rpm/module.mk
@@ -17,11 +17,11 @@ $(BUILD_DIR)/packages/rpm/buildd.tar.gz: SANDBOX:=$(BUILD_DIR)/packages/rpm/SAND
17$(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_UP:=$(SANDBOX_UP) 17$(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_UP:=$(SANDBOX_UP)
18$(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_DOWN:=$(SANDBOX_DOWN) 18$(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_DOWN:=$(SANDBOX_DOWN)
19$(BUILD_DIR)/packages/rpm/buildd.tar.gz: $(BUILD_DIR)/mirror/centos/repo.done \ 19$(BUILD_DIR)/packages/rpm/buildd.tar.gz: $(BUILD_DIR)/mirror/centos/repo.done \
20$(BUILD_DIR)/mirror/centos/mos-repo.done 20 $(BUILD_DIR)/mirror/centos/mos-repo.done
21 sh -c "$${SANDBOX_UP}" 21 sh -c "$${SANDBOX_UP}"
22 sh -c "$${SANDBOX_DOWN}" 22 sh -c "$${SANDBOX_DOWN}"
23 sudo tar czf $@.tmp -C $(SANDBOX) . 23 sudo tar czf $@.tmp -C $(SANDBOX) .
24 mv -f $@.tmp $@ 24 mv $@.tmp $@
25 25
26 26
27# Usage: 27# Usage:
@@ -60,10 +60,10 @@ $(BUILD_DIR)/packages/rpm/$1.done:
60 sudo cp -r $(BUILD_DIR)/packages/sources/$1/* $$(SANDBOX)/tmp/SOURCES 60 sudo cp -r $(BUILD_DIR)/packages/sources/$1/* $$(SANDBOX)/tmp/SOURCES
61 -test -f $(BUILD_DIR)/packages/sources/$1/changelog && cat $(BUILD_DIR)/packages/sources/$1/changelog >> $$(SPECFILE) 61 -test -f $(BUILD_DIR)/packages/sources/$1/changelog && cat $(BUILD_DIR)/packages/sources/$1/changelog >> $$(SPECFILE)
62 sudo cp $$(SPECFILE) $$(SANDBOX)/tmp && \ 62 sudo cp $$(SPECFILE) $$(SANDBOX)/tmp && \
63 sudo chroot $$(SANDBOX) sh -c 'yum-builddep -y /tmp/$1.spec' 63 sudo chroot $$(SANDBOX) yum-builddep -y /tmp/$1.spec
64 test -f $$(SANDBOX)/tmp/SOURCES/version && \ 64 test -f $$(SANDBOX)/tmp/SOURCES/version && \
65 sudo chroot $$(SANDBOX) sh -c 'rpmbuild --nodeps --define "_topdir /tmp" --define "release `awk -F"=" "/RPMRELEASE/ {print $$$$2}" $$(SANDBOX)/tmp/SOURCES/version`" -ba /tmp/$1.spec' || \ 65 sudo chroot $$(SANDBOX) rpmbuild --nodeps --define "_topdir /tmp" --define "release `awk -F'=' '/RPMRELEASE/ {print $$$$2}' $$(SANDBOX)/tmp/SOURCES/version`" -ba /tmp/$1.spec || \
66 sudo chroot $$(SANDBOX) sh -c 'rpmbuild --nodeps --define "_topdir /tmp" -ba /tmp/$1.spec' 66 sudo chroot $$(SANDBOX) rpmbuild --nodeps --define "_topdir /tmp" -ba /tmp/$1.spec
67 cp $$(SANDBOX)/tmp/RPMS/*/*.rpm $(BUILD_DIR)/packages/rpm/RPMS/x86_64 67 cp $$(SANDBOX)/tmp/RPMS/*/*.rpm $(BUILD_DIR)/packages/rpm/RPMS/x86_64
68 sudo sh -c "$$$${SANDBOX_DOWN}" 68 sudo sh -c "$$$${SANDBOX_DOWN}"
69 $$(ACTION.TOUCH) 69 $$(ACTION.TOUCH)