diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-03-22 11:45:31 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-03-31 13:26:03 +0200 |
commit | fbfaf104c7203f8e910a67f20e9140d49baa3248 (patch) | |
tree | 702fbb9bc90ddd45ce608ada7ffd08e5e5ddad56 | |
parent | b5bb61163751d93672bdcdfb24dda21398e42657 (diff) | |
download | meta-openembedded-fbfaf104c7203f8e910a67f20e9140d49baa3248.tar.gz |
atop: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch | 97 | ||||
-rw-r--r-- | meta-oe/recipes-support/atop/atop_2.2.3.bb | 1 |
2 files changed, 98 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch b/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch new file mode 100644 index 0000000000..3708f60ba0 --- /dev/null +++ b/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch | |||
@@ -0,0 +1,97 @@ | |||
1 | From 7b651793269b6b86f12c43c30b751b86def27222 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 18 Mar 2017 17:56:40 -0700 | ||
4 | Subject: [PATCH] include missing header files | ||
5 | |||
6 | fixes build with musl | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | deviate.c | 1 + | ||
11 | procdbase.c | 2 +- | ||
12 | showgeneric.c | 2 +- | ||
13 | showlinux.c | 2 +- | ||
14 | showprocs.c | 2 +- | ||
15 | showsys.c | 2 +- | ||
16 | 6 files changed, 6 insertions(+), 5 deletions(-) | ||
17 | |||
18 | diff --git a/deviate.c b/deviate.c | ||
19 | index 7cf1b49..8e615af 100644 | ||
20 | --- a/deviate.c | ||
21 | +++ b/deviate.c | ||
22 | @@ -178,6 +178,7 @@ static const char rcsid[] = "$Id: deviate.c,v 1.45 2010/10/23 14:02:03 gerlof Ex | ||
23 | #include <stdio.h> | ||
24 | #include <errno.h> | ||
25 | #include <fcntl.h> | ||
26 | +#include <stdlib.h> | ||
27 | #include <unistd.h> | ||
28 | #include <limits.h> | ||
29 | #include <memory.h> | ||
30 | diff --git a/procdbase.c b/procdbase.c | ||
31 | index 9cab347..0487d26 100644 | ||
32 | --- a/procdbase.c | ||
33 | +++ b/procdbase.c | ||
34 | @@ -67,7 +67,7 @@ static const char rcsid[] = "$Id: procdbase.c,v 1.8 2010/04/23 12:19:35 gerlof E | ||
35 | #include <fcntl.h> | ||
36 | #include <unistd.h> | ||
37 | #include <string.h> | ||
38 | -#include <malloc.h> | ||
39 | +#include <stdlib.h> | ||
40 | |||
41 | #include "atop.h" | ||
42 | #include "photoproc.h" | ||
43 | diff --git a/showgeneric.c b/showgeneric.c | ||
44 | index 775afa8..3d5be0e 100644 | ||
45 | --- a/showgeneric.c | ||
46 | +++ b/showgeneric.c | ||
47 | @@ -268,7 +268,7 @@ static const char rcsid[] = "$Id: showgeneric.c,v 1.71 2010/10/25 19:08:32 gerlo | ||
48 | #include <errno.h> | ||
49 | #include <fcntl.h> | ||
50 | #include <string.h> | ||
51 | -#include <termio.h> | ||
52 | +#include <termios.h> | ||
53 | #include <unistd.h> | ||
54 | #include <stdarg.h> | ||
55 | #include <curses.h> | ||
56 | diff --git a/showlinux.c b/showlinux.c | ||
57 | index 6e60754..aba2ee6 100644 | ||
58 | --- a/showlinux.c | ||
59 | +++ b/showlinux.c | ||
60 | @@ -274,7 +274,7 @@ static const char rcsid[] = "$Id: showlinux.c,v 1.70 2010/10/23 14:04:12 gerlof | ||
61 | #include <string.h> | ||
62 | #include <errno.h> | ||
63 | #include <fcntl.h> | ||
64 | -#include <termio.h> | ||
65 | +#include <termios.h> | ||
66 | #include <unistd.h> | ||
67 | #include <stdarg.h> | ||
68 | #include <curses.h> | ||
69 | diff --git a/showprocs.c b/showprocs.c | ||
70 | index 5194524..f0169ad 100644 | ||
71 | --- a/showprocs.c | ||
72 | +++ b/showprocs.c | ||
73 | @@ -94,7 +94,7 @@ static const char rcsid[] = "$Id: showprocs.c,v 1.15 2011/09/05 11:44:16 gerlof | ||
74 | #include <string.h> | ||
75 | #include <errno.h> | ||
76 | #include <fcntl.h> | ||
77 | -#include <termio.h> | ||
78 | +#include <termios.h> | ||
79 | #include <unistd.h> | ||
80 | #include <stdarg.h> | ||
81 | #include <curses.h> | ||
82 | diff --git a/showsys.c b/showsys.c | ||
83 | index 26331be..5a05fe5 100644 | ||
84 | --- a/showsys.c | ||
85 | +++ b/showsys.c | ||
86 | @@ -80,7 +80,7 @@ static const char rcsid[] = "XXXXXX"; | ||
87 | #include <string.h> | ||
88 | #include <errno.h> | ||
89 | #include <fcntl.h> | ||
90 | -#include <termio.h> | ||
91 | +#include <termios.h> | ||
92 | #include <unistd.h> | ||
93 | #include <stdarg.h> | ||
94 | #include <curses.h> | ||
95 | -- | ||
96 | 2.12.0 | ||
97 | |||
diff --git a/meta-oe/recipes-support/atop/atop_2.2.3.bb b/meta-oe/recipes-support/atop/atop_2.2.3.bb index a36f08dd79..1ab9e7cf9e 100644 --- a/meta-oe/recipes-support/atop/atop_2.2.3.bb +++ b/meta-oe/recipes-support/atop/atop_2.2.3.bb | |||
@@ -20,6 +20,7 @@ ATOP_VER = "${@'-'.join(d.getVar('PV').rsplit('.', 1))}" | |||
20 | SRC_URI = " \ | 20 | SRC_URI = " \ |
21 | http://www.atoptool.nl/download/${BPN}-${ATOP_VER}.tar.gz \ | 21 | http://www.atoptool.nl/download/${BPN}-${ATOP_VER}.tar.gz \ |
22 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \ | 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \ |
23 | file://0001-include-missing-header-files.patch \ | ||
23 | file://remove-bashisms.patch \ | 24 | file://remove-bashisms.patch \ |
24 | file://fix-permissions.patch \ | 25 | file://fix-permissions.patch \ |
25 | file://sysvinit-implement-status.patch \ | 26 | file://sysvinit-implement-status.patch \ |