Browse Source

Merge "Minor changes to run 'make iso' on xenial host."

Jenkins 2 years ago
parent
commit
395976a985
1 changed files with 5 additions and 5 deletions
  1. 5
    5
      packages/rpm/module.mk

+ 5
- 5
packages/rpm/module.mk View File

@@ -17,11 +17,11 @@ $(BUILD_DIR)/packages/rpm/buildd.tar.gz: SANDBOX:=$(BUILD_DIR)/packages/rpm/SAND
17 17
 $(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_UP:=$(SANDBOX_UP)
18 18
 $(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_DOWN:=$(SANDBOX_DOWN)
19 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 21
 	sh -c "$${SANDBOX_UP}"
22 22
 	sh -c "$${SANDBOX_DOWN}"
23 23
 	sudo tar czf $@.tmp -C $(SANDBOX) .
24
-	mv $@.tmp $@
24
+	mv -f $@.tmp $@
25 25
 
26 26
 
27 27
 # Usage:
@@ -60,10 +60,10 @@ $(BUILD_DIR)/packages/rpm/$1.done:
60 60
 	sudo cp -r $(BUILD_DIR)/packages/sources/$1/* $$(SANDBOX)/tmp/SOURCES
61 61
 	-test -f $(BUILD_DIR)/packages/sources/$1/changelog && cat $(BUILD_DIR)/packages/sources/$1/changelog >> $$(SPECFILE)
62 62
 	sudo cp $$(SPECFILE) $$(SANDBOX)/tmp && \
63
-	sudo chroot $$(SANDBOX) yum-builddep -y /tmp/$1.spec
63
+	sudo chroot $$(SANDBOX) sh -c 'yum-builddep -y /tmp/$1.spec'
64 64
 	test -f $$(SANDBOX)/tmp/SOURCES/version && \
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) rpmbuild --nodeps --define "_topdir /tmp" -ba /tmp/$1.spec
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' || \
66
+		sudo chroot $$(SANDBOX) sh -c 'rpmbuild --nodeps --define "_topdir /tmp" -ba /tmp/$1.spec'
67 67
 	cp $$(SANDBOX)/tmp/RPMS/*/*.rpm $(BUILD_DIR)/packages/rpm/RPMS/x86_64
68 68
 	sudo sh -c "$$$${SANDBOX_DOWN}"
69 69
 	$$(ACTION.TOUCH)

Loading…
Cancel
Save