On Thu, 2011-12-08 at 08:34 +0100, Martin Kosek wrote:
> On Wed, 2011-12-07 at 20:39 -0500, John Dennis wrote:
> > If "make rpms" fails it doesn't clean up the rpmbuild directory it created.
> > The next make-lint will also fail because it finds files under rpmbuild.
> > make-lint is invoked by "make rpms", a vicous cycle.
> > 
> > The patch contains two sets of changes
> > 
> > Include "rpmbuild" in the IGNORE_PATHS list of make-lint.
> > 
> > Fix the Makefile to use $(RPMBUILD) consistently, there were a number
> > of hardcoded uses of "rpmbuild" as a direcotry.
> 
> ACK. Pushed to master, ipa-2-1.
> 
> Martin

John send me a patch to remove old $(RPMBUILD) before it is filled with
new content for rpmbuild (attached). I found it quite useful.

Pushed under one-liner rule.

Martin
>From 7100e01a226132504ddb9f80aca55e057566df9b Mon Sep 17 00:00:00 2001
From: John Dennis <jden...@redhat.com>
Date: Fri, 9 Dec 2011 10:00:27 +0100
Subject: [PATCH] Remove old RPMROOT contents before it is used for rpmbuild

---
 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 9db0ff5c1f0adea4a85659c5c3a3919011a30282..af50558c1ad6b354f10d80aa374b3e60ec4c2a05 100644
--- a/Makefile
+++ b/Makefile
@@ -161,6 +161,7 @@ tarballs: local-archive
 	rm -rf dist/$(TARBALL_PREFIX)
 
 rpmroot:
+	rm -rf $(RPMBUILD)
 	mkdir -p $(RPMBUILD)/BUILD
 	mkdir -p $(RPMBUILD)/RPMS
 	mkdir -p $(RPMBUILD)/SOURCES
-- 
1.7.7.3

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to