diff options
author | Radu Moisan <radu.moisan@intel.com> | 2012-08-22 12:22:22 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-23 11:43:34 +0100 |
commit | d48585caf9cf13c06eabc068b3c3a17a3f92636d (patch) | |
tree | 38f666bb65af6ea7093be2ab418d30256e10fc69 /meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | |
parent | 8e335f1da265cdb0ea2d5f95b3dfe8c856213c96 (diff) | |
download | poky-d48585caf9cf13c06eabc068b3c3a17a3f92636d.tar.gz |
busybox: Upgrade to upstream 1.20.2
Updated defconfig file from generated .config
Disabled CONFIG_LSOF,CONFIG_CROSS_COMPILER_PREFIX, and CONFIG_EXTRA_CFLAGS
for backwards compatibility.
Added busybox-1.20.2-kernel_ver.patch from upstream.
(From OE-Core rev: e5f2cc805509a23e160c6f05e6776d6d32e3ce98)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch')
-rw-r--r-- | meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch new file mode 100644 index 0000000000..456fb08e11 --- /dev/null +++ b/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | --- busybox-1.20.2/libbb/kernel_version.c | ||
2 | +++ busybox-1.20.2-kernel_ver/libbb/kernel_version.c | ||
3 | @@ -20,18 +20,15 @@ | ||
4 | int FAST_FUNC get_linux_version_code(void) | ||
5 | { | ||
6 | struct utsname name; | ||
7 | - char *s; | ||
8 | + char *s, *t; | ||
9 | int i, r; | ||
10 | |||
11 | - if (uname(&name) == -1) { | ||
12 | - bb_perror_msg("can't get system information"); | ||
13 | - return 0; | ||
14 | - } | ||
15 | - | ||
16 | + uname(&name); /* never fails */ | ||
17 | s = name.release; | ||
18 | r = 0; | ||
19 | for (i = 0; i < 3; i++) { | ||
20 | - r = r * 256 + atoi(strtok(s, ".")); | ||
21 | + t = strtok(s, "."); | ||
22 | + r = r * 256 + (t ? atoi(t) : 0); | ||
23 | s = NULL; | ||
24 | } | ||
25 | return r; | ||