summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-03 23:40:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:53:58 +0100
commitd627534e0f44db2bc07023c51236696051e0f223 (patch)
tree3e62eef90f9a91fac66defd1b2e4e35cc4019ae7 /meta/recipes-core
parenta7b443ae3d195e85c1c4f3bb414d6806e6d1b699 (diff)
downloadpoky-d627534e0f44db2bc07023c51236696051e0f223.tar.gz
busybox: Include sys/resource.h for rusage definition
Seen with eglibc 2.16 (From OE-Core rev: 077bd603040ebd16f01b4fa20999fb71a9a43695) Signed-off-by: Khem Raj <raj.khem@gmail.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')
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch99
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.4.bb3
2 files changed, 101 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch b/meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch
new file mode 100644
index 0000000000..bd55961c1b
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch
@@ -0,0 +1,99 @@
1Signed-off-by: Khem Raj <raj.khem@gmail.com>
2
3Upstream-Status: Pending
4
5From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001
6From: Mike Frysinger <vapier@gentoo.org>
7Date: Fri, 06 Jul 2012 03:19:09 +0000
8Subject: include sys/resource.h where needed
9
10We use functions from sys/resource.h in misc applets, but don't include
11the header. This breaks building with newer glibc versions, so add the
12include where needed.
13
14Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15---
16Index: busybox-1.19.4/loginutils/passwd.c
17===================================================================
18--- busybox-1.19.4.orig/loginutils/passwd.c 2012-02-04 11:34:24.000000000 -0800
19+++ busybox-1.19.4/loginutils/passwd.c 2012-07-06 17:48:27.388096092 -0700
20@@ -15,6 +15,7 @@
21
22 #include "libbb.h"
23 #include <syslog.h>
24+#include <sys/resource.h> /* setrlimit */
25
26 static void nuke_str(char *str)
27 {
28Index: busybox-1.19.4/miscutils/time.c
29===================================================================
30--- busybox-1.19.4.orig/miscutils/time.c 2012-02-04 11:24:55.000000000 -0800
31+++ busybox-1.19.4/miscutils/time.c 2012-07-06 17:48:27.388096092 -0700
32@@ -16,6 +16,7 @@
33 //usage: "\n -v Verbose"
34
35 #include "libbb.h"
36+#include <sys/resource.h> /* getrusage */
37
38 /* Information on the resources used by a child process. */
39 typedef struct {
40Index: busybox-1.19.4/networking/inetd.c
41===================================================================
42--- busybox-1.19.4.orig/networking/inetd.c 2012-02-04 11:34:24.000000000 -0800
43+++ busybox-1.19.4/networking/inetd.c 2012-07-06 17:48:54.852097259 -0700
44@@ -165,6 +165,7 @@
45 //usage: "\n (default: 0 - disabled)"
46
47 #include <syslog.h>
48+#include <sys/resource.h> /* setrlimit */
49 #include <sys/un.h>
50
51 #include "libbb.h"
52Index: busybox-1.19.4/networking/ntpd.c
53===================================================================
54--- busybox-1.19.4.orig/networking/ntpd.c 2012-02-04 11:24:55.000000000 -0800
55+++ busybox-1.19.4/networking/ntpd.c 2012-07-06 17:48:27.392096048 -0700
56@@ -46,6 +46,7 @@
57 #include "libbb.h"
58 #include <math.h>
59 #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
60+#include <sys/resource.h> /* setpriority */
61 #include <sys/timex.h>
62 #ifndef IPTOS_LOWDELAY
63 # define IPTOS_LOWDELAY 0x10
64Index: busybox-1.19.4/networking/ntpd_simple.c
65===================================================================
66--- busybox-1.19.4.orig/networking/ntpd_simple.c 2012-02-04 11:24:55.000000000 -0800
67+++ busybox-1.19.4/networking/ntpd_simple.c 2012-07-06 17:48:27.400095949 -0700
68@@ -7,6 +7,7 @@
69 */
70 #include "libbb.h"
71 #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
72+#include <sys/resource.h> /* setpriority */
73 #ifndef IPTOS_LOWDELAY
74 # define IPTOS_LOWDELAY 0x10
75 #endif
76Index: busybox-1.19.4/runit/chpst.c
77===================================================================
78--- busybox-1.19.4.orig/runit/chpst.c 2012-02-04 11:34:24.000000000 -0800
79+++ busybox-1.19.4/runit/chpst.c 2012-07-06 17:48:27.400095949 -0700
80@@ -91,6 +91,7 @@
81 //usage: "\n a SIGXCPU after N seconds"
82
83 #include "libbb.h"
84+#include <sys/resource.h> /* getrlimit */
85
86 /*
87 Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
88Index: busybox-1.19.4/shell/shell_common.c
89===================================================================
90--- busybox-1.19.4.orig/shell/shell_common.c 2012-02-04 11:34:24.000000000 -0800
91+++ busybox-1.19.4/shell/shell_common.c 2012-07-06 17:48:27.400095949 -0700
92@@ -18,6 +18,7 @@
93 */
94 #include "libbb.h"
95 #include "shell_common.h"
96+#include <sys/resource.h> /* getrlimit */
97
98 const char defifsvar[] ALIGN1 = "IFS= \t\n";
99
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index de331ad71a..4271c67834 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -1,5 +1,5 @@
1require busybox.inc 1require busybox.inc
2PR = "r8" 2PR = "r9"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://B921600.patch \ 5 file://B921600.patch \
@@ -8,6 +8,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
8 file://run-parts.in.usr-bin.patch \ 8 file://run-parts.in.usr-bin.patch \
9 file://watch.in.usr-bin.patch \ 9 file://watch.in.usr-bin.patch \
10 file://busybox-udhcpc-no_deconfig.patch \ 10 file://busybox-udhcpc-no_deconfig.patch \
11 file://sys_resource.patch \
11 file://find-touchscreen.sh \ 12 file://find-touchscreen.sh \
12 file://busybox-cron \ 13 file://busybox-cron \
13 file://busybox-httpd \ 14 file://busybox-httpd \