aboutsummaryrefslogtreecommitdiffstats
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:31:31 +0000
commit0f70da971e6e01ed9b669137b3ba39b1898a7dfe (patch)
treeb5b33e97f9b9f966440e0593d4ad4abf8c3fc47f
parent83214b835cd82d5dddb47c418c4e7a20ac433f61 (diff)
downloadopenembedded-core-contrib-0f70da971e6e01ed9b669137b3ba39b1898a7dfe.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> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-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() {
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)