summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb1
-rw-r--r--meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch64
-rw-r--r--meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync.patch49
-rw-r--r--meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch43
-rw-r--r--meta/recipes-kernel/latencytop/latencytop_0.5.bb32
7 files changed, 0 insertions, 191 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 1a217daa39..8ec623befb 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -159,7 +159,6 @@ DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver"
159DISTRO_PN_ALIAS_pn-keymaps = "OE-Core" 159DISTRO_PN_ALIAS_pn-keymaps = "OE-Core"
160DISTRO_PN_ALIAS_pn-kf = "OSPDT" 160DISTRO_PN_ALIAS_pn-kf = "OSPDT"
161DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame" 161DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame"
162DISTRO_PN_ALIAS_pn-latencytop = "Meego=latencytop Fedora=latencytop Debian=latencytop OpenSuSE=latencytop"
163DISTRO_PN_ALIAS_pn-ldconfig-native = "Ubuntu=libc-bin Fedora=glibc" 162DISTRO_PN_ALIAS_pn-ldconfig-native = "Ubuntu=libc-bin Fedora=glibc"
164DISTRO_PN_ALIAS_pn-liba52 = "Mandriva=a52dec Debian=a52dec" 163DISTRO_PN_ALIAS_pn-liba52 = "Mandriva=a52dec Debian=a52dec"
165DISTRO_PN_ALIAS_pn-libacpi = "Ubuntu=libacpi Mandriva=libacpi" 164DISTRO_PN_ALIAS_pn-libacpi = "Ubuntu=libacpi Mandriva=libacpi"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 16bd9fc6b0..1b7a144a37 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -304,7 +304,6 @@ RECIPE_MAINTAINER_pn-kmod-native = "Chen Qi <Qi.Chen@windriver.com>"
304RECIPE_MAINTAINER_pn-kmscube = "Carlos Rafael Giani <dv@pseudoterminal.org>" 304RECIPE_MAINTAINER_pn-kmscube = "Carlos Rafael Giani <dv@pseudoterminal.org>"
305RECIPE_MAINTAINER_pn-l3afpad = "Maxin B. John <maxin.john@intel.com>" 305RECIPE_MAINTAINER_pn-l3afpad = "Maxin B. John <maxin.john@intel.com>"
306RECIPE_MAINTAINER_pn-lame = "Tanu Kaskinen <tanuk@iki.fi>" 306RECIPE_MAINTAINER_pn-lame = "Tanu Kaskinen <tanuk@iki.fi>"
307RECIPE_MAINTAINER_pn-latencytop = "Alexander Kanavin <alexander.kanavin@intel.com>"
308RECIPE_MAINTAINER_pn-ldconfig-native = "Khem Raj <raj.khem@gmail.com>" 307RECIPE_MAINTAINER_pn-ldconfig-native = "Khem Raj <raj.khem@gmail.com>"
309RECIPE_MAINTAINER_pn-less = "Yi Zhao <yi.zhao@windriver.com>" 308RECIPE_MAINTAINER_pn-less = "Yi Zhao <yi.zhao@windriver.com>"
310RECIPE_MAINTAINER_pn-liba52 = "Tanu Kaskinen <tanuk@iki.fi>" 309RECIPE_MAINTAINER_pn-liba52 = "Tanu Kaskinen <tanuk@iki.fi>"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index a8e47da40c..e3814a44bc 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -26,7 +26,6 @@ RRECOMMENDS_${PN} = "\
26 26
27PROFILETOOLS = "\ 27PROFILETOOLS = "\
28 powertop \ 28 powertop \
29 latencytop \
30 " 29 "
31PERF = "perf" 30PERF = "perf"
32PERF_libc-musl = "" 31PERF_libc-musl = ""
diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch b/meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch
deleted file mode 100644
index b248133460..0000000000
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1From db112739dc4f608a968b8104b382955dc3d96ca3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 7 Sep 2015 07:40:10 +0000
4Subject: [PATCH] Rectify the function signatures to fix prototype mismatches
5
6clang is less forgiving when it comes to coding standards, correct the
7function signatures to reflect the function logic
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 fsync.c | 7 ++++---
14 latencytop.h | 2 +-
15 2 files changed, 5 insertions(+), 4 deletions(-)
16
17diff --git a/fsync.c b/fsync.c
18index 82dff0e..5cefba9 100644
19--- a/fsync.c
20+++ b/fsync.c
21@@ -51,7 +51,7 @@ struct fsync_files {
22 static GList *fsync_data;
23
24
25-static chain_file(struct fsync_process *proc, char *filename)
26+static void chain_file(struct fsync_process *proc, char *filename)
27 {
28 struct fsync_files *file;
29 GList *item;
30@@ -75,7 +75,7 @@ static chain_file(struct fsync_process *proc, char *filename)
31 proc->files = g_list_append(proc->files, file);
32 }
33
34-static report_file(char *process, char *file)
35+static void report_file(char *process, char *file)
36 {
37 struct fsync_process *proc;
38 GList *item;
39@@ -157,9 +157,10 @@ int enable_fsync_tracer(void)
40 write_to_file("/sys/kernel/debug/tracing/current_tracer", "fsync");
41 write_to_file("/sys/kernel/debug/tracing/iter_ctrl", "ftrace_printk");
42 write_to_file("/sys/kernel/debug/tracing/tracing_on", "1");
43+ return ret;
44 }
45
46-int disable_fsync_tracer(void)
47+void disable_fsync_tracer(void)
48 {
49 write_to_file("/sys/kernel/debug/tracing/tracing_on", "0");
50 }
51diff --git a/latencytop.h b/latencytop.h
52index 5394d73..9d107a8 100644
53--- a/latencytop.h
54+++ b/latencytop.h
55@@ -54,5 +54,5 @@ extern char *translate(char *line);
56 extern void init_translations(char *filename);
57 extern int fsync_display(int duration);
58 extern int enable_fsync_tracer(void);
59-extern int disable_fsync_tracer(void);
60+extern void disable_fsync_tracer(void);
61 extern void update_list(void);
62--
632.5.1
64
diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync.patch b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync.patch
deleted file mode 100644
index 7848ccf2ae..0000000000
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-fsync.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1linux: sysfs: use tracing_on as tracing_enabled is deprecated
2
3tracing_enabled use in the kernel is being deprecated as per commit
46752ab4a9c30 [tracing: Deprecate tracing_enabled for tracing_on] in
5the linux mainline kernel. tracing_enabled use will generate a warning
6and may no longer function as expected, therefore move to use tracing_on.
7
8Upstream-Status: Pending
9
10Signed-off-by: Dennis Hall <dennis.hall@windriver.com>
11
12Index: latencytop-0.5/fsync.c
13===================================================================
14--- latencytop-0.5.orig/fsync.c 2012-08-03 10:45:49.000000000 -0400
15+++ latencytop-0.5/fsync.c 2012-08-03 10:48:39.000000000 -0400
16@@ -149,19 +149,19 @@
17 * cd /sys/kernel/debug/tracing
18 * echo fsync > current_tracer
19 * echo ftrace_printk > iter_ctrl
20- * echo 1 > tracing_enabled
21+ * echo 1 > tracing_on
22 */
23 ret = system("/bin/mount -t debugfs none /sys/kernel/debug/");
24 if (!ret)
25 return -1;
26 write_to_file("/sys/kernel/debug/tracing/current_tracer", "fsync");
27 write_to_file("/sys/kernel/debug/tracing/iter_ctrl", "ftrace_printk");
28- write_to_file("/sys/kernel/debug/tracing/tracing_enabled", "1");
29+ write_to_file("/sys/kernel/debug/tracing/tracing_on", "1");
30 }
31
32 int disable_fsync_tracer(void)
33 {
34- write_to_file("/sys/kernel/debug/tracing/tracing_enabled", "0");
35+ write_to_file("/sys/kernel/debug/tracing/tracing_on", "0");
36 }
37
38
39@@ -339,8 +339,8 @@
40 if (curduration > 5)
41 curduration = 5;
42 /* clear the ftrace buffer */
43- write_to_file("/sys/kernel/debug/tracing/tracing_enabled", "0");
44- write_to_file("/sys/kernel/debug/tracing/tracing_enabled", "1");
45+ write_to_file("/sys/kernel/debug/tracing/tracing_on", "0");
46+ write_to_file("/sys/kernel/debug/tracing/tracing_on", "1");
47 key = select(1, &rfds, NULL, NULL, &end);
48 parse_ftrace();
49 print_global_list();
diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
deleted file mode 100644
index 7147fda5d3..0000000000
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1
2Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
3Upstream-Status: Pending
4
5diff --git a/Makefile.orig b/Makefile
6index 16a2369..fa797a2 100644
7--- a/Makefile.orig
8+++ b/Makefile
9@@ -1,10 +1,11 @@
10-# FIXME: Use autoconf ?
11-HAS_GTK_GUI = 1
12+#
13+#
14
15 DESTDIR =
16 SBINDIR = /usr/sbin
17 XCFLAGS = -W -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare
18-LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncursesw
19+LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncurses $(LDFLAGS)
20+CC ?= gcc
21
22 OBJS= latencytop.o text_display.o translate.o fsync.o
23
24@@ -26,16 +27,17 @@ endif
25
26 # We write explicity this "implicit rule"
27 %.o : %.c
28- gcc -c $(CFLAGS) $(XCFLAGS) $< -o $@
29+ $(CC) -c $(CFLAGS) $(XCFLAGS) $< -o $@
30
31 latencytop: $(OBJS) latencytop.h Makefile
32- gcc $(CFLAGS) $(OBJS) $(LDF) -o latencytop
33+ $(CC) $(CFLAGS) $(OBJS) $(LDF) -o latencytop
34
35 clean:
36 rm -f *~ latencytop DEADJOE *.o
37
38 install: latencytop
39 mkdir -p $(DESTDIR)/usr/share/latencytop
40+ mkdir -p $(DESTDIR)/$(SBINDIR)
41 install -m 0644 latencytop.trans $(DESTDIR)/usr/share/latencytop/latencytop.trans
42 install -m 0644 *.png $(DESTDIR)/usr/share/latencytop/
43 install -m 0755 latencytop $(DESTDIR)$(SBINDIR)/
diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
deleted file mode 100644
index eb19471ce8..0000000000
--- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb
+++ /dev/null
@@ -1,32 +0,0 @@
1SUMMARY = "Linux tool for measuring and fixing latency"
2HOMEPAGE = "http://www.latencytop.org/"
3
4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a87dc7fa"
6
7inherit pkgconfig
8
9DEPENDS = "virtual/libintl ncurses glib-2.0"
10
11PR = "r3"
12
13SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.gz/73bb3371c6ee0b0e68e25289027e865c/${BP}.tar.gz \
14 file://latencytop-makefile.patch \
15 file://latencytop-fsync.patch \
16 file://0001-Rectify-the-function-signatures-to-fix-prototype-mis.patch \
17"
18
19SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c"
20SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef"
21
22PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
23
24PACKAGECONFIG[x11] = ",,gtk+"
25
26EXTRA_OEMAKE_X = "${@bb.utils.contains('PACKAGECONFIG', 'x11', 'HAS_GTK_GUI=1', '', d)}"
27
28#CFLAGS += "${LDFLAGS}"
29
30do_install() {
31 oe_runmake install DESTDIR=${D} ${EXTRA_OEMAKE_X}
32}