summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMartin Hundebøll <martin@geanix.com>2018-11-15 10:12:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-24 22:02:47 +0000
commitc31c80aa8a80d027f4320ca46d4a1635f5f72f4f (patch)
treeefa86e6902738b52aaf3a539d15f1e0f42c92ccc /meta/recipes-core
parent436da7fbf33b77c26550a6004b36d3545fbc95f8 (diff)
downloadpoky-c31c80aa8a80d027f4320ca46d4a1635f5f72f4f.tar.gz
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@geanix.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 10582a7534..09433dd824 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -184,7 +184,8 @@ do_compile() {
184 oe_runmake busybox_unstripped 184 oe_runmake busybox_unstripped
185 mv busybox_unstripped busybox.$s 185 mv busybox_unstripped busybox.$s
186 oe_runmake busybox.links 186 oe_runmake busybox.links
187 mv busybox.links busybox.links.$s 187 sort busybox.links > busybox.links.$s
188 rm busybox.links
188 done 189 done
189 190
190 # hard fail if sh is being linked to the suid busybox (detects bug 10346) 191 # hard fail if sh is being linked to the suid busybox (detects bug 10346)