[oe-commits] [openembedded-core] 03/05: busybox: make busybox.links.{suid, nosuid} reproducible

git at git.openembedded.org git at git.openembedded.org
Wed Dec 5 22:35:57 UTC 2018


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit 0f70da971e6e01ed9b669137b3ba39b1898a7dfe
Author: Martin Hundebøll <martin at geanix.com>
AuthorDate: Thu Nov 15 10:12:49 2018 +0100

    busybox: make busybox.links.{suid, nosuid} reproducible
    
    The busybox.link.* files are generated from autoconf.h and applets.h,
    which are both auto-generated by the build system. The contents of the
    two files might be in different order, and so the link files are not
    reproducble as is.
    
    Fix this by sorting the lists using `sort`.
    
    (From OE-Core rev: bade7cc344c2f0e9316f973c34e9c9dfcbdbe32d)
    
    Signed-off-by: Martin Hundebøll <martin at geanix.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-core/busybox/busybox.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 8c6dbba..f1b09d9 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -183,7 +183,8 @@ do_compile() {
 			oe_runmake busybox_unstripped
 			mv busybox_unstripped busybox.$s
 			oe_runmake busybox.links
-			mv busybox.links busybox.links.$s
+			sort busybox.links > busybox.links.$s
+			rm busybox.links
 		done
 
 		# hard fail if sh is being linked to the suid busybox (detects bug 10346)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list