summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-07-05 10:29:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 15:44:13 +0100
commit131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0 (patch)
treecde6580df91d24345c12bac7b171e2d0d35d8d17 /meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch
parent0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (diff)
downloadpoky-131e5e7e8fc497bb2c77cfb3e52eb201d2aaf3d0.tar.gz
busybox: upgrade to stable 1.21.1
Merged or backported patches are dropped. The wget_dl_dir_fix.patch was submitted more than 1 year ago, it's about the -P option behavior, and it's not accepted, so I dropped this patch too. (From OE-Core rev: a2f31a6a6accb8eee2084cb39edb8e9af4b4189f) Signed-off-by: Chen Qi <Qi.Chen@windriver.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.patch28
1 files changed, 0 insertions, 28 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
deleted file mode 100644
index 69bbe73c64..0000000000
--- a/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Signed-off-by: Radu Moisan <radu.moisan@intel.com>
2Upstream-Status: Pending
3
4--- busybox-1.20.2/libbb/kernel_version.c
5+++ busybox-1.20.2-kernel_ver/libbb/kernel_version.c
6@@ -20,18 +20,15 @@
7 int FAST_FUNC get_linux_version_code(void)
8 {
9 struct utsname name;
10- char *s;
11+ char *s, *t;
12 int i, r;
13
14- if (uname(&name) == -1) {
15- bb_perror_msg("can't get system information");
16- return 0;
17- }
18-
19+ uname(&name); /* never fails */
20 s = name.release;
21 r = 0;
22 for (i = 0; i < 3; i++) {
23- r = r * 256 + atoi(strtok(s, "."));
24+ t = strtok(s, ".");
25+ r = r * 256 + (t ? atoi(t) : 0);
26 s = NULL;
27 }
28 return r;