diff options
Diffstat (limited to 'meta/recipes-extended/procps/procps-3.2.8')
12 files changed, 0 insertions, 544 deletions
diff --git a/meta/recipes-extended/procps/procps-3.2.8/0001-Fix-musl-build-failure.patch b/meta/recipes-extended/procps/procps-3.2.8/0001-Fix-musl-build-failure.patch deleted file mode 100644 index 71dc3f07e4..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/0001-Fix-musl-build-failure.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 6f2fd55ef7621fd7ab7897aee2c2651b6faf9e6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Barker <paul@paulbarker.me.uk> | ||
3 | Date: Wed, 20 Aug 2014 11:56:11 +0200 | ||
4 | Subject: [PATCH] Fix musl build failure | ||
5 | |||
6 | Include <limits.h> for PATH_MAX. | ||
7 | |||
8 | Signed-off-by: Paul Barker <paul@paulbarker.me.uk> | ||
9 | |||
10 | Upstream-status: Pending | ||
11 | --- | ||
12 | proc/readproc.c | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/proc/readproc.c b/proc/readproc.c | ||
16 | index 4fad11d..c5b1869 100644 | ||
17 | --- a/proc/readproc.c | ||
18 | +++ b/proc/readproc.c | ||
19 | @@ -26,6 +26,7 @@ | ||
20 | #include <sys/dir.h> | ||
21 | #include <sys/types.h> | ||
22 | #include <sys/stat.h> | ||
23 | +#include <limits.h> | ||
24 | |||
25 | // sometimes it's easier to do this manually, w/o gcc helping | ||
26 | #ifdef PROF | ||
27 | -- | ||
28 | 1.9.1 | ||
29 | |||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/60_linux_version_init.patch b/meta/recipes-extended/procps/procps-3.2.8/60_linux_version_init.patch deleted file mode 100644 index 203ccb3347..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/60_linux_version_init.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | ## 60_linux_init.dpatch by <david.sugar@canonical.com> | ||
2 | ## | ||
3 | ## All lines beginning with `## DP:' are a description of the patch. | ||
4 | ## DP: Fix Linux version detection which relied on elf loader side-effect. | ||
5 | ## DP: This patch also depends on 40_gnu-kbsd-version, which modified | ||
6 | ## DP: init_Linux_version(). | ||
7 | |||
8 | @DPATCH@ | ||
9 | |||
10 | Upstream-Status: inappropriate [upstream unmaintained] | ||
11 | --- | ||
12 | proc/sysinfo.c | 1 + | ||
13 | proc/version.c | 5 +++-- | ||
14 | proc/version.h | 1 + | ||
15 | 3 files changed, 5 insertions(+), 2 deletions(-) | ||
16 | |||
17 | Index: procps-3.2.8/proc/sysinfo.c | ||
18 | =================================================================== | ||
19 | --- procps-3.2.8.orig/proc/sysinfo.c | ||
20 | +++ procps-3.2.8/proc/sysinfo.c | ||
21 | @@ -212,6 +212,7 @@ static int check_for_privs(void){ | ||
22 | static void init_libproc(void) __attribute__((constructor)); | ||
23 | static void init_libproc(void){ | ||
24 | have_privs = check_for_privs(); | ||
25 | + init_Linux_version(); // make sure we have version before continuing... | ||
26 | // ought to count CPUs in /proc/stat instead of relying | ||
27 | // on glibc, which foolishly tries to parse /proc/cpuinfo | ||
28 | // | ||
29 | Index: procps-3.2.8/proc/version.c | ||
30 | =================================================================== | ||
31 | --- procps-3.2.8.orig/proc/version.c | ||
32 | +++ procps-3.2.8/proc/version.c | ||
33 | @@ -33,8 +33,7 @@ void display_version(void) { | ||
34 | |||
35 | int linux_version_code; | ||
36 | |||
37 | -static void init_Linux_version(void) __attribute__((constructor)); | ||
38 | -static void init_Linux_version(void) { | ||
39 | +void init_Linux_version(void) { | ||
40 | int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 2 */ | ||
41 | FILE *fp; | ||
42 | char buf[256]; | ||
43 | Index: procps-3.2.8/proc/version.h | ||
44 | =================================================================== | ||
45 | --- procps-3.2.8.orig/proc/version.h | ||
46 | +++ procps-3.2.8/proc/version.h | ||
47 | @@ -14,6 +14,7 @@ | ||
48 | |||
49 | EXTERN_C_BEGIN | ||
50 | |||
51 | +extern void init_Linux_version(void); /* initialize linux version */ | ||
52 | extern void display_version(void); /* display suite version */ | ||
53 | extern const char procps_version[]; /* global buf for suite version */ | ||
54 | |||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch b/meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch deleted file mode 100644 index 1523c3dfb2..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Do not try to detect 64bit/32bit system | ||
2 | we already feed that information via compiler | ||
3 | defaults | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | Upstream-Status: Inappropriate [OE specific] | ||
7 | Index: procps-3.2.8/Makefile | ||
8 | =================================================================== | ||
9 | --- procps-3.2.8.orig/Makefile 2014-05-03 01:00:01.707387583 -0700 | ||
10 | +++ procps-3.2.8/Makefile 2014-05-03 08:53:08.087175369 -0700 | ||
11 | @@ -118,15 +118,6 @@ | ||
12 | # until you go looking for a 64-bit curses library. | ||
13 | check_gcc = $(shell if $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) dummy.c $(ALL_LDFLAGS) $(1) -o /dev/null $(CURSES) > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) | ||
14 | |||
15 | -# Be 64-bit if at all possible. In a cross-compiling situation, one may | ||
16 | -# do "make m64=-m32 lib64=lib" to produce 32-bit executables. DO NOT | ||
17 | -# attempt to use a 32-bit executable on a 64-bit kernel. Packagers MUST | ||
18 | -# produce separate executables for ppc and ppc64, s390 and s390x, | ||
19 | -# i386 and x86-64, mips and mips64, sparc and sparc64, and so on. | ||
20 | -# Failure to do so will cause data corruption. | ||
21 | -m64 := $(call check_gcc,-m64,$(call check_gcc,-mabi=64,)) | ||
22 | -ALL_CFLAGS += $(m64) | ||
23 | - | ||
24 | ALL_CFLAGS += $(call check_gcc,-Wdeclaration-after-statement,) | ||
25 | ALL_CFLAGS += $(call check_gcc,-Wpadded,) | ||
26 | ALL_CFLAGS += $(call check_gcc,-Wstrict-aliasing,) | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/gnu-kbsd-version.patch b/meta/recipes-extended/procps/procps-3.2.8/gnu-kbsd-version.patch deleted file mode 100644 index 2582857e25..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/gnu-kbsd-version.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [not author, no upstream] | ||
2 | |||
3 | Imported from Debian. | ||
4 | Source: http://anonscm.debian.org/gitweb/?p=collab-maint/procps.git;a=blob;f=debian/patches/gnu-kbsd-version.patch;h=fe5489fc772a3355ff8c0dcf9b953bf0c05aa9f8;hb=b460cfd726b019f8d918b380f78af4c19c5f3e50 | ||
5 | Bugtracker: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632749 | ||
6 | |||
7 | Stops procps utilities from printing a warning when used with | ||
8 | kernels having only two digit versions, e.g. 3.0. | ||
9 | |||
10 | Author: <csmall@debian.org> | ||
11 | Description: Rework version parsing so its ok with other OSes | ||
12 | --- a/proc/version.c | ||
13 | +++ b/proc/version.c | ||
14 | @@ -35,15 +35,23 @@ | ||
15 | |||
16 | static void init_Linux_version(void) __attribute__((constructor)); | ||
17 | static void init_Linux_version(void) { | ||
18 | - static struct utsname uts; | ||
19 | - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ | ||
20 | + int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 2 */ | ||
21 | + FILE *fp; | ||
22 | + char buf[256]; | ||
23 | |||
24 | - if (uname(&uts) == -1) /* failure implies impending death */ | ||
25 | - exit(1); | ||
26 | - if (sscanf(uts.release, "%d.%d.%d", &x, &y, &z) < 3) | ||
27 | + if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ | ||
28 | + exit(1); | ||
29 | + if (fgets(buf, 256, fp) == NULL) { | ||
30 | + fprintf(stderr, "Cannot read kernel version from /proc/version\n"); | ||
31 | + fclose(fp); | ||
32 | + exit(1); | ||
33 | + } | ||
34 | + fclose(fp); | ||
35 | + if (sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z) < 2) | ||
36 | fprintf(stderr, /* *very* unlikely to happen by accident */ | ||
37 | "Non-standard uts for running kernel:\n" | ||
38 | - "release %s=%d.%d.%d gives version code %d\n", | ||
39 | - uts.release, x, y, z, LINUX_VERSION(x,y,z)); | ||
40 | + "release %s=%d.%d.%d gives version code %d\n", | ||
41 | + buf, | ||
42 | + x, y, z, LINUX_VERSION(x,y,z)); | ||
43 | linux_version_code = LINUX_VERSION(x, y, z); | ||
44 | } | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/install.patch b/meta/recipes-extended/procps/procps-3.2.8/install.patch deleted file mode 100644 index 2a59a5ff68..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/install.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff -ruN procps-3.2.8-orig//Makefile procps-3.2.8/Makefile | ||
4 | --- procps-3.2.8-orig//Makefile 2011-08-23 22:06:46.471163999 +0800 | ||
5 | +++ procps-3.2.8/Makefile 2011-08-23 22:15:01.091163999 +0800 | ||
6 | @@ -29,9 +29,6 @@ | ||
7 | ln_sf := ln -sf | ||
8 | install := install -D --owner 0 --group 0 | ||
9 | |||
10 | -# Lame x86-64 /lib64 and /usr/lib64 abomination: | ||
11 | -lib64 := lib$(shell [ -d /lib64 ] && echo 64) | ||
12 | - | ||
13 | usr/bin := $(DESTDIR)/usr/bin/ | ||
14 | bin := $(DESTDIR)/bin/ | ||
15 | sbin := $(DESTDIR)/sbin/ | ||
16 | @@ -39,8 +36,8 @@ | ||
17 | man1 := $(DESTDIR)/usr/share/man/man1/ | ||
18 | man5 := $(DESTDIR)/usr/share/man/man5/ | ||
19 | man8 := $(DESTDIR)/usr/share/man/man8/ | ||
20 | -lib := $(DESTDIR)/$(lib64)/ | ||
21 | -usr/lib := $(DESTDIR)/usr/$(lib64)/ | ||
22 | +lib := $(DESTDIR)/$(base_libdir)/ | ||
23 | +usr/lib := $(DESTDIR)/$(libdir)/ | ||
24 | usr/include := $(DESTDIR)/usr/include/ | ||
25 | |||
26 | #SKIP := $(bin)kill $(man1)kill.1 | ||
27 | @@ -222,10 +219,10 @@ | ||
28 | ###### install | ||
29 | |||
30 | $(BINFILES) : all | ||
31 | - $(install) --mode a=rx $(notdir $@) $@ | ||
32 | + $(install) -m 555 $(notdir $@) $@ | ||
33 | |||
34 | $(MANFILES) : all | ||
35 | - $(install) --mode a=r $(notdir $@) $@ | ||
36 | + $(install) -m 444 $(notdir $@) $@ | ||
37 | |||
38 | install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) | ||
39 | cd $(usr/bin) && $(ln_f) skill snice | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch b/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch deleted file mode 100644 index 2ca972482d..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | diff --git a/pwdx.c b/pwdx.c | ||
4 | index cb96a52..29ebce2 100644 | ||
5 | --- a/pwdx.c | ||
6 | +++ b/pwdx.c | ||
7 | @@ -13,7 +13,7 @@ | ||
8 | #include <stdlib.h> | ||
9 | #include <sys/types.h> | ||
10 | #include <regex.h> | ||
11 | -#include <limits.h> | ||
12 | +#include <linux/limits.h> | ||
13 | #include <unistd.h> | ||
14 | #include <errno.h> | ||
15 | |||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch b/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch deleted file mode 100644 index 2a65c3509f..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | *** procps-3.2.5/proc/module.mk.orig Sun Jul 24 11:53:49 2005 | ||
4 | --- procps-3.2.5/proc/module.mk Sun Jul 24 11:54:32 2005 | ||
5 | *************** | ||
6 | *** 96,102 **** | ||
7 | #################### install rules ########################### | ||
8 | |||
9 | $(lib)$(SOFILE) : proc/$(SONAME) | ||
10 | ! $(install) --mode a=rx $< $@ | ||
11 | |||
12 | ifneq ($(SOLINK),$(SOFILE)) | ||
13 | .PHONY: $(lib)$(SOLINK) | ||
14 | --- 96,102 ---- | ||
15 | #################### install rules ########################### | ||
16 | |||
17 | $(lib)$(SOFILE) : proc/$(SONAME) | ||
18 | ! $(install) -m 555 $< $@ | ||
19 | |||
20 | ifneq ($(SOLINK),$(SOFILE)) | ||
21 | .PHONY: $(lib)$(SOLINK) | ||
22 | *************** | ||
23 | *** 115,121 **** | ||
24 | $(ldconfig) | ||
25 | |||
26 | $(usr/lib)$(ANAME) : proc/$(ANAME) | ||
27 | ! $(install) --mode a=r $< $@ | ||
28 | |||
29 | # Junk anyway... supposed to go in /usr/include/$(NAME) | ||
30 | #INSTALL += $(addprefix $(include),$(HDRFILES)) | ||
31 | --- 115,121 ---- | ||
32 | $(ldconfig) | ||
33 | |||
34 | $(usr/lib)$(ANAME) : proc/$(ANAME) | ||
35 | ! $(install) -m 444 $< $@ | ||
36 | |||
37 | # Junk anyway... supposed to go in /usr/include/$(NAME) | ||
38 | #INSTALL += $(addprefix $(include),$(HDRFILES)) | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.7-top-remcpu.patch b/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.7-top-remcpu.patch deleted file mode 100644 index 0306c8d639..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.7-top-remcpu.patch +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | fix that top will quit after cpu offline | ||
4 | |||
5 | top utiliy fails to read /proc/stat after cpu offline, because Cpu_tot | ||
6 | is still the original cpu numbers when calling cpus_refresh, in which | ||
7 | it is trying to read and sscanf Cpu_tot times /proc/stat. | ||
8 | |||
9 | The patch is from procps-3.2.8-2.fc12.src.rpm | ||
10 | |||
11 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
12 | |||
13 | --- | ||
14 | --- procps-3.2.7/top.c.remcpu 2006-07-10 10:41:11.000000000 +0200 | ||
15 | +++ procps-3.2.7/top.c 2006-07-10 10:41:35.000000000 +0200 | ||
16 | @@ -912,6 +912,7 @@ | ||
17 | static CPU_t *cpus_refresh (CPU_t *cpus) | ||
18 | { | ||
19 | static FILE *fp = NULL; | ||
20 | + static int cpu_max; | ||
21 | int i; | ||
22 | int num; | ||
23 | // enough for a /proc/stat CPU line (not the intr line) | ||
24 | @@ -926,24 +927,29 @@ | ||
25 | can hold tics representing the /proc/stat cpu summary (the first | ||
26 | line read) -- that slot supports our View_CPUSUM toggle */ | ||
27 | cpus = alloc_c((1 + Cpu_tot) * sizeof(CPU_t)); | ||
28 | + cpu_max = Cpu_tot; | ||
29 | } | ||
30 | + else if (cpu_max > Cpu_tot) | ||
31 | + /* move saved CUPs summary to cpu_max possition */ | ||
32 | + memcpy(&cpus[cpu_max], &cpus[Cpu_tot], sizeof(CPU_t)); | ||
33 | + | ||
34 | rewind(fp); | ||
35 | fflush(fp); | ||
36 | |||
37 | // first value the last slot with the cpu summary line | ||
38 | if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read"); | ||
39 | - cpus[Cpu_tot].x = 0; // FIXME: can't tell by kernel version number | ||
40 | - cpus[Cpu_tot].y = 0; // FIXME: can't tell by kernel version number | ||
41 | - cpus[Cpu_tot].z = 0; // FIXME: can't tell by kernel version number | ||
42 | + cpus[cpu_max].x = 0; // FIXME: can't tell by kernel version number | ||
43 | + cpus[cpu_max].y = 0; // FIXME: can't tell by kernel version number | ||
44 | + cpus[cpu_max].z = 0; // FIXME: can't tell by kernel version number | ||
45 | num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", | ||
46 | - &cpus[Cpu_tot].u, | ||
47 | - &cpus[Cpu_tot].n, | ||
48 | - &cpus[Cpu_tot].s, | ||
49 | - &cpus[Cpu_tot].i, | ||
50 | - &cpus[Cpu_tot].w, | ||
51 | - &cpus[Cpu_tot].x, | ||
52 | - &cpus[Cpu_tot].y, | ||
53 | - &cpus[Cpu_tot].z | ||
54 | + &cpus[cpu_max].u, | ||
55 | + &cpus[cpu_max].n, | ||
56 | + &cpus[cpu_max].s, | ||
57 | + &cpus[cpu_max].i, | ||
58 | + &cpus[cpu_max].w, | ||
59 | + &cpus[cpu_max].x, | ||
60 | + &cpus[cpu_max].y, | ||
61 | + &cpus[cpu_max].z | ||
62 | ); | ||
63 | if (num < 4) | ||
64 | std_err("failed /proc/stat read"); | ||
65 | @@ -955,7 +961,7 @@ | ||
66 | } | ||
67 | |||
68 | // now value each separate cpu's tics | ||
69 | - for (i = 0; 1 < Cpu_tot && i < Cpu_tot; i++) { | ||
70 | + for (i = 0; ; i++) { | ||
71 | if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read"); | ||
72 | cpus[i].x = 0; // FIXME: can't tell by kernel version number | ||
73 | cpus[i].y = 0; // FIXME: can't tell by kernel version number | ||
74 | @@ -964,9 +970,35 @@ | ||
75 | &cpus[i].id, | ||
76 | &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y, &cpus[i].z | ||
77 | ); | ||
78 | - if (num < 4) | ||
79 | - std_err("failed /proc/stat read"); | ||
80 | + if (num < 4) { | ||
81 | + Cpu_tot = i; | ||
82 | + break; | ||
83 | + } | ||
84 | + if (i == cpu_max - 1) { | ||
85 | + // Bump cpu_max and extend cpus | ||
86 | + cpu_max++; | ||
87 | + cpus = realloc(cpus, (1 + cpu_max) * sizeof(CPU_t)); | ||
88 | + if (!cpus) std_err("realloc failed"); | ||
89 | + memcpy(&cpus[cpu_max], &cpus[cpu_max-1], sizeof(CPU_t)); | ||
90 | + } | ||
91 | + } | ||
92 | + | ||
93 | + if (cpu_max > Cpu_tot) | ||
94 | + memcpy(&cpus[Cpu_tot], &cpus[cpu_max], sizeof(CPU_t)); | ||
95 | + | ||
96 | + // and just in case we're 2.2.xx compiled without SMP support... | ||
97 | + if (Cpu_tot == 1) { | ||
98 | + cpus[0].id = cpus[1].id = 0; | ||
99 | + cpus[0].u = cpus[1].u; | ||
100 | + cpus[0].n = cpus[1].n; | ||
101 | + cpus[0].s = cpus[1].s; | ||
102 | + cpus[0].i = cpus[1].i; | ||
103 | + cpus[0].w = cpus[1].w; | ||
104 | + cpus[0].x = cpus[1].x; | ||
105 | + cpus[0].y = cpus[1].y; | ||
106 | + cpus[0].z = cpus[1].z; | ||
107 | } | ||
108 | + | ||
109 | return cpus; | ||
110 | } | ||
111 | |||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch b/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch deleted file mode 100644 index c8cee26eac..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Fix for stricter Makefile parser in Make 3.82 take from Gentoo bugzilla: | ||
4 | http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-process/procps/files/procps-3.2.8%2Bgmake-3.82.patch?revision=1.1 | ||
5 | |||
6 | Index: procps-3.2.8/Makefile | ||
7 | =================================================================== | ||
8 | --- procps-3.2.8.orig/Makefile | ||
9 | +++ procps-3.2.8/Makefile | ||
10 | @@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES) | ||
11 | # want this rule first, use := on ALL, and ALL not filled in yet | ||
12 | all: do_all | ||
13 | |||
14 | --include */module.mk | ||
15 | +-include proc/module.mk | ||
16 | +-include ps/module.mk | ||
17 | |||
18 | do_all: $(ALL) | ||
19 | |||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8-ps-cgroup.patch b/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8-ps-cgroup.patch deleted file mode 100644 index 1a294142f5..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8-ps-cgroup.patch +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | From e529ce0b53f6b73d8b760cd37b23e0397720cede Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Novotny <dnovotny@fedoraproject.org> | ||
3 | Date: Mon, 16 Feb 2009 12:22:20 +0000 | ||
4 | Subject: add cgroup support | ||
5 | |||
6 | Rebased for 3.2.8: Andrei Gherzan <andrei.gherzan@windriver.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | The patch was imported from the meta-ivi repository | ||
11 | (git://git.yoctoproject.org/meta-ivi) as of commit id | ||
12 | 74b9624fe94b2b90810717a13d481b0db9d2d95a | ||
13 | |||
14 | Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> | ||
15 | |||
16 | Index: procps-3.2.8/ps/output.c | ||
17 | =================================================================== | ||
18 | --- procps-3.2.8.orig/ps/output.c 2012-11-15 17:44:05.501337741 +0200 | ||
19 | +++ procps-3.2.8/ps/output.c 2012-11-15 17:48:31.585328231 +0200 | ||
20 | @@ -1099,6 +1099,39 @@ | ||
21 | return snprintf(outbuf, COLWID, "*"); | ||
22 | } | ||
23 | |||
24 | +static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){ | ||
25 | + char filename[48]; | ||
26 | + FILE *fd; | ||
27 | + int counter = 0; | ||
28 | + int c; | ||
29 | + int is_cgroup = 0; | ||
30 | + | ||
31 | + outbuf[0]='\0'; | ||
32 | + snprintf(filename, sizeof filename, "/proc/%d/cgroup", pp->tgid); | ||
33 | + fd = fopen(filename, "r"); | ||
34 | + if (likely(fd == NULL)) goto fail; | ||
35 | + while (( (c = fgetc(fd)) != EOF) && (counter<665)) { | ||
36 | + if (is_cgroup == 0) { | ||
37 | + if (c == ':') { | ||
38 | + is_cgroup = 1; | ||
39 | + if (counter>0) | ||
40 | + outbuf[counter++]=';'; | ||
41 | + } | ||
42 | + }else | ||
43 | + if ((c == '\n') || (c == '\0')) | ||
44 | + is_cgroup = 0; | ||
45 | + else | ||
46 | + outbuf[counter++]=c; | ||
47 | + } | ||
48 | + outbuf[counter]='\0'; | ||
49 | + close(fd); | ||
50 | + if (counter>0) | ||
51 | + return counter; | ||
52 | +fail: | ||
53 | + outbuf[0] = '-'; | ||
54 | + outbuf[1] = '\0'; | ||
55 | + return 1; | ||
56 | +} | ||
57 | |||
58 | /****************** FLASK & seLinux security stuff **********************/ | ||
59 | // move the bulk of this to libproc sometime | ||
60 | @@ -1293,6 +1326,7 @@ | ||
61 | {"bsdtime", "TIME", pr_bsdtime, sr_nop, 6, 0, LNX, ET|RIGHT}, | ||
62 | {"c", "C", pr_c, sr_pcpu, 2, 0, SUN, ET|RIGHT}, | ||
63 | {"caught", "CAUGHT", pr_sigcatch, sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigcatch*/ | ||
64 | +{"cgroup", "CGROUP", pr_cgroup, sr_nop, 35, 0, LNX, PO|LEFT}, /* cgroups*/ | ||
65 | {"class", "CLS", pr_class, sr_sched, 3, 0, XXX, TO|LEFT}, | ||
66 | {"cls", "CLS", pr_class, sr_sched, 3, 0, HPU, TO|RIGHT}, /*says HPUX or RT*/ | ||
67 | {"cmaj_flt", "-", pr_nop, sr_cmaj_flt, 1, 0, LNX, AN|RIGHT}, | ||
68 | Index: procps-3.2.8/ps/ps.1 | ||
69 | =================================================================== | ||
70 | --- procps-3.2.8.orig/ps/ps.1 2012-11-15 17:44:50.845336117 +0200 | ||
71 | +++ procps-3.2.8/ps/ps.1 2012-11-15 17:49:09.621326859 +0200 | ||
72 | @@ -904,6 +904,10 @@ | ||
73 | displayed. (alias\ \fBsig_catch\fR,\ \fBsigcatch\fR). | ||
74 | T} | ||
75 | |||
76 | +cgroup CGROUP T{ | ||
77 | +display control groups to which the process belonges. | ||
78 | +t} | ||
79 | + | ||
80 | class CLS T{ | ||
81 | scheduling class of the process. (alias\ \fBpolicy\fR,\ \fBcls\fR). | ||
82 | Field's possible values are: | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch b/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch deleted file mode 100644 index 0775eaba26..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | *** procps-3.2.5/ps/module.mk.orig Sun Jul 24 11:54:40 2005 | ||
4 | --- procps-3.2.5/ps/module.mk Sun Jul 24 11:55:02 2005 | ||
5 | *************** | ||
6 | *** 33,40 **** | ||
7 | |||
8 | |||
9 | $(bin)ps: ps/ps | ||
10 | ! $(install) --mode a=rx $< $@ | ||
11 | |||
12 | $(man1)ps.1 : ps/ps.1 | ||
13 | ! $(install) --mode a=r $< $@ | ||
14 | -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz | ||
15 | --- 33,40 ---- | ||
16 | |||
17 | |||
18 | $(bin)ps: ps/ps | ||
19 | ! $(install) -m 555 $< $@ | ||
20 | |||
21 | $(man1)ps.1 : ps/ps.1 | ||
22 | ! $(install) -m 444 $< $@ | ||
23 | -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz | ||
diff --git a/meta/recipes-extended/procps/procps-3.2.8/sysctl.conf b/meta/recipes-extended/procps/procps-3.2.8/sysctl.conf deleted file mode 100644 index 34e7488bf7..0000000000 --- a/meta/recipes-extended/procps/procps-3.2.8/sysctl.conf +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | # This configuration file is taken from Debian. | ||
2 | # | ||
3 | # /etc/sysctl.conf - Configuration file for setting system variables | ||
4 | # See sysctl.conf (5) for information. | ||
5 | # | ||
6 | |||
7 | #kernel.domainname = example.com | ||
8 | |||
9 | # Uncomment the following to stop low-level messages on console | ||
10 | #kernel.printk = 4 4 1 7 | ||
11 | |||
12 | ##############################################################3 | ||
13 | # Functions previously found in netbase | ||
14 | # | ||
15 | |||
16 | # Uncomment the next two lines to enable Spoof protection (reverse-path filter) | ||
17 | # Turn on Source Address Verification in all interfaces to | ||
18 | # prevent some spoofing attacks | ||
19 | net.ipv4.conf.default.rp_filter=1 | ||
20 | net.ipv4.conf.all.rp_filter=1 | ||
21 | |||
22 | # Uncomment the next line to enable TCP/IP SYN cookies | ||
23 | #net.ipv4.tcp_syncookies=1 | ||
24 | |||
25 | # Uncomment the next line to enable packet forwarding for IPv4 | ||
26 | #net.ipv4.ip_forward=1 | ||
27 | |||
28 | # Uncomment the next line to enable packet forwarding for IPv6 | ||
29 | #net.ipv6.conf.all.forwarding=1 | ||
30 | |||
31 | |||
32 | ################################################################### | ||
33 | # Additional settings - these settings can improve the network | ||
34 | # security of the host and prevent against some network attacks | ||
35 | # including spoofing attacks and man in the middle attacks through | ||
36 | # redirection. Some network environments, however, require that these | ||
37 | # settings are disabled so review and enable them as needed. | ||
38 | # | ||
39 | # Ignore ICMP broadcasts | ||
40 | #net.ipv4.icmp_echo_ignore_broadcasts = 1 | ||
41 | # | ||
42 | # Ignore bogus ICMP errors | ||
43 | #net.ipv4.icmp_ignore_bogus_error_responses = 1 | ||
44 | # | ||
45 | # Do not accept ICMP redirects (prevent MITM attacks) | ||
46 | #net.ipv4.conf.all.accept_redirects = 0 | ||
47 | #net.ipv6.conf.all.accept_redirects = 0 | ||
48 | # _or_ | ||
49 | # Accept ICMP redirects only for gateways listed in our default | ||
50 | # gateway list (enabled by default) | ||
51 | # net.ipv4.conf.all.secure_redirects = 1 | ||
52 | # | ||
53 | # Do not send ICMP redirects (we are not a router) | ||
54 | #net.ipv4.conf.all.send_redirects = 0 | ||
55 | # | ||
56 | # Do not accept IP source route packets (we are not a router) | ||
57 | #net.ipv4.conf.all.accept_source_route = 0 | ||
58 | #net.ipv6.conf.all.accept_source_route = 0 | ||
59 | # | ||
60 | # Log Martian Packets | ||
61 | #net.ipv4.conf.all.log_martians = 1 | ||
62 | # | ||
63 | |||
64 | #kernel.shmmax = 141762560 | ||