diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch | 17 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps_3.2.7.bb | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch b/meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch new file mode 100644 index 0000000000..23310e0592 --- /dev/null +++ b/meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Fix for stricter Makefile parser in Make 3.82 take from Gentoo bugzilla: | ||
2 | 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 | ||
3 | |||
4 | Index: procps-3.2.8/Makefile | ||
5 | =================================================================== | ||
6 | --- procps-3.2.8.orig/Makefile | ||
7 | +++ procps-3.2.8/Makefile | ||
8 | @@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES) | ||
9 | # want this rule first, use := on ALL, and ALL not filled in yet | ||
10 | all: do_all | ||
11 | |||
12 | --include */module.mk | ||
13 | +-include proc/module.mk | ||
14 | +-include ps/module.mk | ||
15 | |||
16 | do_all: $(ALL) | ||
17 | |||
diff --git a/meta/recipes-extended/procps/procps_3.2.7.bb b/meta/recipes-extended/procps/procps_3.2.7.bb index b795c2b36a..470352553c 100644 --- a/meta/recipes-extended/procps/procps_3.2.7.bb +++ b/meta/recipes-extended/procps/procps_3.2.7.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require procps.inc | 1 | require procps.inc |
2 | 2 | ||
3 | PR = "r9" | 3 | PR = "r10" |
4 | 4 | ||
5 | inherit update-rc.d update-alternatives | 5 | inherit update-rc.d update-alternatives |
6 | 6 | ||
@@ -16,6 +16,7 @@ SRC_URI += "file://procmodule.patch;patch=1 \ | |||
16 | file://linux-limits.patch;patch=1 \ | 16 | file://linux-limits.patch;patch=1 \ |
17 | file://sysctl.conf \ | 17 | file://sysctl.conf \ |
18 | file://procps.init \ | 18 | file://procps.init \ |
19 | file://procps-3.2.8+gmake-3.82.patch \ | ||
19 | " | 20 | " |
20 | 21 | ||
21 | FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ | 22 | FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ |