summaryrefslogtreecommitdiffstats
path: root/meta
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-12-05 22:34:00 +0000
commit52ac6715c72df580f5db99fa8450d7e8b907d024 (patch)
tree87cfe67048e8b490d723b33f9e7f78a086288d8b /meta
parent9b66c49eab6195ee508fc81f5dd4c4137e462d4a (diff)
downloadpoky-52ac6715c72df580f5db99fa8450d7e8b907d024.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) (From OE-Core rev: 0f70da971e6e01ed9b669137b3ba39b1898a7dfe) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 8c6dbbaf9b..f1b09d95ce 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -183,7 +183,8 @@ do_compile() {
183 oe_runmake busybox_unstripped 183 oe_runmake busybox_unstripped
184 mv busybox_unstripped busybox.$s 184 mv busybox_unstripped busybox.$s
185 oe_runmake busybox.links 185 oe_runmake busybox.links
186 mv busybox.links busybox.links.$s 186 sort busybox.links > busybox.links.$s
187 rm busybox.links
187 done 188 done
188 189
189 # hard fail if sh is being linked to the suid busybox (detects bug 10346) 190 # hard fail if sh is being linked to the suid busybox (detects bug 10346)