summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-21 13:27:35 +0000
committerGerrit Code Review <review@openstack.org>2016-06-21 13:27:35 +0000
commitd9d2a471af92acba3ca9ae075c9496fc769826a3 (patch)
tree71e554496eb4f9db16b4d2cd63656423f65b6a06
parent5b324fad3b4f78c80bcf384009c3a119f0693bfe (diff)
parent756b03e93f8d581b189c0a99d86114e4720f1396 (diff)
Merge "Revert "Minor changes to run 'make iso' on xenial host.""
-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)