]> code.ossystems Code Review - openembedded-core.git/commitdiff
busybox: make busybox.links.{suid, nosuid} reproducible
authorMartin Hundebøll <martin@geanix.com>
Thu, 15 Nov 2018 09:12:49 +0000 (10:12 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 5 Dec 2018 22:31:31 +0000 (22:31 +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`.

(From OE-Core rev: bade7cc344c2f0e9316f973c34e9c9dfcbdbe32d)

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

index 8c6dbbaf9bb9ad69708b2123223f56f3ad4e4028..f1b09d95ce6f1a69b1f60774ab132ec598adc1d5 100644 (file)
@@ -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)