From 33af46be827919cd6e20dd8a7b8b86ffb00ce144 Mon Sep 17 00:00:00 2001
From: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
Date: Mon, 6 Jun 2016 17:56:28 +0200
Subject: [PATCH] Minor changes to run 'make iso' on xenial host.

- Running chroot without 'sh -c' doesn't set environment variables. This
patch wraps command in 'sh -c'
- add force to mv command as xenial is more strict for changing
  permissions

Change-Id: I83122397c2a8c457abb9687909352179831a46f3
Implements: mos-xenial
---
 packages/rpm/module.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/rpm/module.mk b/packages/rpm/module.mk
index b235f1d72..fc71d8802 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
 $(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_UP:=$(SANDBOX_UP)
 $(BUILD_DIR)/packages/rpm/buildd.tar.gz: export SANDBOX_DOWN:=$(SANDBOX_DOWN)
 $(BUILD_DIR)/packages/rpm/buildd.tar.gz: $(BUILD_DIR)/mirror/centos/repo.done \
-	$(BUILD_DIR)/mirror/centos/mos-repo.done
+$(BUILD_DIR)/mirror/centos/mos-repo.done
 	sh -c "$${SANDBOX_UP}"
 	sh -c "$${SANDBOX_DOWN}"
 	sudo tar czf $@.tmp -C $(SANDBOX) .
-	mv $@.tmp $@
+	mv -f $@.tmp $@
 
 
 # Usage:
@@ -60,10 +60,10 @@ $(BUILD_DIR)/packages/rpm/$1.done:
 	sudo cp -r $(BUILD_DIR)/packages/sources/$1/* $$(SANDBOX)/tmp/SOURCES
 	-test -f $(BUILD_DIR)/packages/sources/$1/changelog && cat $(BUILD_DIR)/packages/sources/$1/changelog >> $$(SPECFILE)
 	sudo cp $$(SPECFILE) $$(SANDBOX)/tmp && \
-	sudo chroot $$(SANDBOX) yum-builddep -y /tmp/$1.spec
+	sudo chroot $$(SANDBOX) sh -c 'yum-builddep -y /tmp/$1.spec'
 	test -f $$(SANDBOX)/tmp/SOURCES/version && \
-		sudo chroot $$(SANDBOX) rpmbuild --nodeps --define "_topdir /tmp" --define "release `awk -F'=' '/RPMRELEASE/ {print $$$$2}' $$(SANDBOX)/tmp/SOURCES/version`" -ba /tmp/$1.spec || \
-		sudo chroot $$(SANDBOX) rpmbuild --nodeps --define "_topdir /tmp" -ba /tmp/$1.spec
+		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' || \
+		sudo chroot $$(SANDBOX) sh -c '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)