diff options
-rw-r--r-- | meta/recipes-core/busybox/busybox/0001-randconfig-fix.patch | 33 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.23.2.bb | 1 |
2 files changed, 34 insertions, 0 deletions
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 @@ | |||
1 | If CONFIG_FEATURE_LAST_SMALL is enabled the build fails because of a broken | ||
2 | __UT_NAMESIZE test. | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | From 932302666b0354ede63504d1bef8393cab28db8b Mon Sep 17 00:00:00 2001 | ||
8 | From: Denys Vlasenko <vda.linux@googlemail.com> | ||
9 | Date: Sun, 11 Oct 2015 16:58:18 +0200 | ||
10 | Subject: [PATCH] randconfig fix | ||
11 | |||
12 | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> | ||
13 | --- | ||
14 | miscutils/last.c | 3 ++- | ||
15 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/miscutils/last.c b/miscutils/last.c | ||
18 | index 6d8b584..f8f3437 100644 | ||
19 | --- a/miscutils/last.c | ||
20 | +++ b/miscutils/last.c | ||
21 | @@ -34,7 +34,8 @@ | ||
22 | && ((UT_LINESIZE != 32) || (UT_NAMESIZE != 32) || (UT_HOSTSIZE != 256)) | ||
23 | #error struct utmpx member char[] size(s) have changed! | ||
24 | #elif defined __UT_LINESIZE \ | ||
25 | - && ((__UT_LINESIZE != 32) || (__UT_NAMESIZE != 64) || (__UT_HOSTSIZE != 256)) | ||
26 | + && ((__UT_LINESIZE != 32) || (__UT_NAMESIZE != 32) || (__UT_HOSTSIZE != 256)) | ||
27 | +/* __UT_NAMESIZE was checked with 64 above, but glibc-2.11 definitely uses 32! */ | ||
28 | #error struct utmpx member char[] size(s) have changed! | ||
29 | #endif | ||
30 | |||
31 | -- | ||
32 | 2.6.4 | ||
33 | |||
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 \ | |||
35 | file://0001-chown-fix-help-text.patch \ | 35 | file://0001-chown-fix-help-text.patch \ |
36 | file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ | 36 | file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \ |
37 | file://0002-Passthrough-r-to-linker.patch \ | 37 | file://0002-Passthrough-r-to-linker.patch \ |
38 | file://0001-randconfig-fix.patch \ | ||
38 | file://mount-via-label.cfg \ | 39 | file://mount-via-label.cfg \ |
39 | file://sha1sum.cfg \ | 40 | file://sha1sum.cfg \ |
40 | file://sha256sum.cfg \ | 41 | file://sha256sum.cfg \ |