]> code.ossystems Code Review - openembedded-core.git/commitdiff
busybox: make busybox.links.{suid, nosuid} reproducible
authorMartin Hundebøll <martin@geanix.com>
Thu, 8 Nov 2018 12:07:27 +0000 (13:07 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 13 Nov 2018 15:18:28 +0000 (15:18 +0000)
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`.

Signed-off-by: Martin Hundebøll <martin@geanix.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/busybox/busybox.inc

index 10582a75345cabe5a8324c845d74066c5ce7e15d..09433dd824291f28e264423ef854d3b8d7d72599 100644 (file)
@@ -184,7 +184,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)