Merge lp:~peter-pearse/ubuntu/natty/openssl/prop001 into lp:ubuntu/natty/openssl

[Peter Pearse]

debian/rules clean:

For all builds, change all 'rm -f' in Makefile to 'rm -fr'.

Allows clean after build to succeed.

[Steve Langasek (vorlon)]

I don't understand how this patch is supposed to work. First, all builds - not just cross-builds - are customarily done as non-root, and second, 'rm -f' doesn't work any better on directories as root than it does as non-root. So I think this patch is wrong; can you show a log of the failure you're trying to fix, to understand what's really going on here?

In any case, we definitely should not be editing the upstream makefiles as part of the debian/rules clean target. Changes to upstream files, where necessary, should be included directly in the packaging.

review: Needs Information

[Steve Langasek (vorlon)]

Aha, have reproduced this problem. It is indeed a generic failure when running clean-after-build, that affects all builds and not just cross-builds.

So I think we can reduce this to a one-line patch:

         dh_testroot
         -rm -f build
         -./Configure $(CONFARGS) debian-$(DEB_HOST_ARCH)
+ -sed -i -e 's/rm -f/rm -rf/' Makefile
         [ ! -f Makefile ] || make -f Makefile clean clean-shared
         #-make -f Makefile dclean
 # perl util/ssldir.pl /usr/local/ssl

Can you confirm whether this fixes the issue for you?

review: Needs Fixing

[Peter Pearse (peter-pearse)]

Fixed for me - amended & re-submitted branch.

[Steve Langasek (vorlon)]

Merged, thanks!

Had to clean up the changelog a bit in the process:
 - target needs to be natty
 - there should be only one package version added; please amend the existing changelog entry when revising a merge
 - the changelog entry should describe what has changed and why (the "why" is now that "clean after build fails", so we should say that so people don't think this is somehow specific to cross-compilation)

Unmerged revisions

54. By Peter Pearse on 2011-01-31

Make generic & neater - thanks to <email address hidden>

53. By Peter Pearse on 2011-01-27

Change 'rm -f' to 'rm -fr' in Makefiles to allow non-root cross build

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-23 20:20:03 +0000
+++ debian/changelog	2011-01-31 11:47:32 +0000
@@ -1,3 +1,15 @@
+openssl (0.9.8o-4ubuntu3) natty; urgency=low
+
+  * Make generic & neater
+
+ -- Peter Pearse <[e-mail]>  Mon, 31 Jan 2011 11:39:43 +0000
+
+openssl (0.9.8o-4ubuntu2) maverick; urgency=low
+
+  * Change Makefile 'rm -f' to 'rm -fr' for (non root) cross builds
+
+ -- Peter Pearse <[e-mail]>  Thu, 27 Jan 2011 10:03:59 +0000
+
 openssl (0.9.8o-4ubuntu1) natty; urgency=low
 
   * Merge from debian unstable.  Remaining changes: (LP: #693902)

=== modified file 'debian/rules'
--- debian/rules	2010-11-18 12:54:37 +0000
+++ debian/rules	2011-01-31 11:47:32 +0000
@@ -73,6 +73,7 @@
 	dh_testroot
 	-rm -f build-stamp
 	-./Configure $(CONFARGS) debian-$(DEB_HOST_ARCH)
+	-sed -i -e 's/rm -f/rm -rf/' Makefile
 	[ ! -f Makefile ] || make -f Makefile  clean clean-shared
 	#-make -f Makefile  dclean
 #	perl util/ssldir.pl /usr/local/ssl