From 52ac6715c72df580f5db99fa8450d7e8b907d024 Mon Sep 17 00:00:00 2001 From: Martin Hundebøll Date: Thu, 15 Nov 2018 10:12:49 +0100 Subject: busybox: make busybox.links.{suid, nosuid} reproducible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3-54-g00ecf