# HG changeset patch
# User David Scott <[email protected]>
# Date 1275406705 -3600
# Node ID ece26f39ce0998469291d08373815634b242d506
# Parent  07f69949f0bfd5ec679453a8ce202de8d19b4ac3
Avoid permission problems by installing the .spec files to $(RPM_SPECSDIR) 
before calling $(RPMBUILD)

Signed-off-by: David Scott <[email protected]>

diff -r 07f69949f0bf -r ece26f39ce09 mk/Makefile
--- a/mk/Makefile       Fri May 28 15:22:28 2010 +0100
+++ b/mk/Makefile       Tue Jun 01 16:38:25 2010 +0100
@@ -13,7 +13,7 @@
 
 .PHONY: build
 build: srpm $(MY_SOURCES)/MANIFEST
-       $(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bb ../xapi-libs.spec
+       $(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bb 
$(RPM_SPECSDIR)/xapi-libs.spec
        mkdir -p $(MY_MAIN_PACKAGES)
        cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-libs-fe-*.rpm 
$(MY_MAIN_PACKAGES)
 
@@ -21,7 +21,8 @@
 srpm:
        mkdir -p $(RPM_SRPMSDIR) $(RPM_SPECSDIR) $(RPM_SOURCESDIR) 
$(RPM_RPMSDIR)
        hg archive -p xapi-libs-0 -t tbz2 $(RPM_SOURCESDIR)/xapi-libs-0.tar.bz2
-       $(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bs ../xapi-libs.spec
+       install -o root -g root ../xapi-libs.spec $(RPM_SPECSDIR)
+       $(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bs 
$(RPM_SPECSDIR)/xapi-libs.spec
 
 $(MY_SOURCES)/MANIFEST: $(MY_SOURCES_DIRSTAMP)
        rm -f $@
1 file changed, 3 insertions(+), 2 deletions(-)
mk/Makefile |    5 +++--


# HG changeset patch
# User David Scott <[email protected]>
# Date 1275406705 -3600
# Node ID ece26f39ce0998469291d08373815634b242d506
# Parent  07f69949f0bfd5ec679453a8ce202de8d19b4ac3
Avoid permission problems by installing the .spec files to $(RPM_SPECSDIR) before calling $(RPMBUILD)

Signed-off-by: David Scott <[email protected]>

diff -r 07f69949f0bf -r ece26f39ce09 mk/Makefile
--- a/mk/Makefile	Fri May 28 15:22:28 2010 +0100
+++ b/mk/Makefile	Tue Jun 01 16:38:25 2010 +0100
@@ -13,7 +13,7 @@
 
 .PHONY: build
 build: srpm $(MY_SOURCES)/MANIFEST
-	$(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bb ../xapi-libs.spec
+	$(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bb $(RPM_SPECSDIR)/xapi-libs.spec
 	mkdir -p $(MY_MAIN_PACKAGES)
 	cp $(RPM_RPMSDIR)/$(DOMAIN0_ARCH_OPTIMIZED)/xapi-libs-fe-*.rpm $(MY_MAIN_PACKAGES)
 
@@ -21,7 +21,8 @@
 srpm:
 	mkdir -p $(RPM_SRPMSDIR) $(RPM_SPECSDIR) $(RPM_SOURCESDIR) $(RPM_RPMSDIR)
 	hg archive -p xapi-libs-0 -t tbz2 $(RPM_SOURCESDIR)/xapi-libs-0.tar.bz2
-	$(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bs ../xapi-libs.spec
+	install -o root -g root ../xapi-libs.spec $(RPM_SPECSDIR)
+	$(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) -bs $(RPM_SPECSDIR)/xapi-libs.spec
 
 $(MY_SOURCES)/MANIFEST: $(MY_SOURCES_DIRSTAMP)
 	rm -f $@
_______________________________________________
xen-api mailing list
[email protected]
http://lists.xensource.com/mailman/listinfo/xen-api

Reply via email to