From 59e4f9fc1255b7888ffccc87ce6cc3f2b8bf98c3 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 14 May 2015 19:01:41 +0100 Subject: split_and_strip_files: regroup hardlinks to make build deterministic Reverted 7c0fd561bad0250a00cef63e3d787573112a59cf Created separate group of hardlinks for the files inside the same package. This should prevent stripped files to be populated outside of package directories. This turns out not to be straightforward and has overlap with the other hardlink handling code in this area. The code is condensed into a more concise and documented form. [Original patch from Ed with tweaks from RP] [YOCTO #7586] (From OE-Core master rev: 82d00f7254b7d3bb6a167d675d798134884d1b19) (From OE-Core rev: 2abacf00ee3f60735bf7c0dc7130c72267822b30) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- meta/lib/oe/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 8bc56c6..ea6feaa 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -30,8 +30,7 @@ def runstrip(arg): elif elftype & 8 or elftype & 4: extraflags = "--remove-section=.comment --remove-section=.note" - # Use mv to break hardlinks - stripcmd = "'%s' %s '%s' -o '%s.tmp' && chown --reference='%s' '%s.tmp' && mv '%s.tmp' '%s'" % (strip, extraflags, file, file, file, file, file, file) + stripcmd = "'%s' %s '%s'" % (strip, extraflags, file) bb.debug(1, "runstrip: %s" % stripcmd) ret = subprocess.call(stripcmd, shell=True) -- cgit v1.1