From 6348b2e8e0510b45f4afd2018e90796714863fc1 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 2 Feb 2016 15:31:07 +0000 Subject: busybox: fix build of last applet If CONFIG_FEATURE_LAST_SMALL is enabled the build fails because of a broken __UT_NAMESIZE test. [ YOCTO #8869 ] Signed-off-by: Ross Burton Signed-off-by: Saul Wold --- .../busybox/busybox/0001-randconfig-fix.patch | 33 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.23.2.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/0001-randconfig-fix.patch diff --git a/meta/recipes-core/busybox/busybox/0001-randconfig-fix.patch b/meta/recipes-core/busybox/busybox/0001-randconfig-fix.patch new file mode 100644 index 0000000000..415ec34090 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-randconfig-fix.patch @@ -0,0 +1,33 @@ +If CONFIG_FEATURE_LAST_SMALL is enabled the build fails because of a broken +__UT_NAMESIZE test. + +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 932302666b0354ede63504d1bef8393cab28db8b Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Sun, 11 Oct 2015 16:58:18 +0200 +Subject: [PATCH] randconfig fix + +Signed-off-by: Denys Vlasenko +--- + miscutils/last.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/miscutils/last.c b/miscutils/last.c +index 6d8b584..f8f3437 100644 +--- a/miscutils/last.c ++++ b/miscutils/last.c +@@ -34,7 +34,8 @@ + && ((UT_LINESIZE != 32) || (UT_NAMESIZE != 32) || (UT_HOSTSIZE != 256)) + #error struct utmpx member char[] size(s) have changed! + #elif defined __UT_LINESIZE \ +- && ((__UT_LINESIZE != 32) || (__UT_NAMESIZE != 64) || (__UT_HOSTSIZE != 256)) ++ && ((__UT_LINESIZE != 32) || (__UT_NAMESIZE != 32) || (__UT_HOSTSIZE != 256)) ++/* __UT_NAMESIZE was checked with 64 above, but glibc-2.11 definitely uses 32! */ + #error struct utmpx member char[] size(s) have changed! + #endif + +-- +2.6.4 + diff --git a/meta/recipes-core/busybox/busybox_1.23.2.bb b/meta/recipes-core/busybox/busybox_1.23.2.bb index 25598232ae..7258df022b 100644 --- a/meta/recipes-core/busybox/busybox_1.23.2.bb +++ b/meta/recipes-core/busybox/busybox_1.23.2.bb @@ -35,6 +35,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-chown-fix-help-text.patch \ file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ file://0002-Passthrough-r-to-linker.patch \ + file://0001-randconfig-fix.patch \ file://mount-via-label.cfg \ file://sha1sum.cfg \ file://sha256sum.cfg \ -- cgit 1.2.3-korg