Ubuntu
openssl package

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

  1. Natty (11.04)
  2. prop001
  3. Merge into natty
Proposed by Peter Pearse
Status: Needs review
Proposed branch: lp://qastaging/~peter-pearse/ubuntu/natty/openssl/prop001
Merge into: lp://qastaging/ubuntu/natty/openssl
Diff against target: 31 lines (+13/-0)
2 files modified
debian/changelog (+12/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp://qastaging/~peter-pearse/ubuntu/natty/openssl/prop001
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+47984@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2011-01-27.

Description of the change

debian/rules clean:

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

Allows clean after build to succeed.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote : Posted in a previous version of this proposal

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
Revision history for this message
Steve Langasek (vorlon) wrote : Posted in a previous version of this proposal

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
Revision history for this message
Peter Pearse (peter-pearse) wrote :

Fixed for me - amended & re-submitted branch.

Reply
Revision history for this message
Steve Langasek (vorlon) wrote :

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)

Reply

Unmerged revisions

54. By Peter Pearse

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

53. By Peter Pearse

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: