diff options
author | Qing He <qing.he@intel.com> | 2010-11-10 15:57:07 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2010-11-14 21:07:45 -0800 |
commit | 3155cdeb0dbc8de482bd328af00b82dd012da01e (patch) | |
tree | a0fe683981342119a32e903f42aadf3a7c10c75b /meta | |
parent | 1a76da9a2d2d9db6409313e7a4d90ee040dfb59c (diff) | |
download | openembedded-core-3155cdeb0dbc8de482bd328af00b82dd012da01e.tar.gz openembedded-core-3155cdeb0dbc8de482bd328af00b82dd012da01e.tar.bz2 openembedded-core-3155cdeb0dbc8de482bd328af00b82dd012da01e.zip |
procps: upgrade to version 3.2.8
from 3.2.7
also update license info
[sgw@linux.intel.com: added gmake-3.82 patch to correct location]
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/procps/procps-3.2.8/install.patch (renamed from meta/recipes-extended/procps/procps-3.2.7/install.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch (renamed from meta/recipes-extended/procps/procps-3.2.7/linux-limits.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps-3.2.8/pagesz-not-constant.patch (renamed from meta/recipes-extended/procps/procps-3.2.7/pagesz-not-constant.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps-3.2.8/procmodule.patch (renamed from meta/recipes-extended/procps/procps-3.2.7/procmodule.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch (renamed from meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps-3.2.8/procps.init (renamed from meta/recipes-extended/procps/procps-3.2.7/procps.init) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps-3.2.8/psmodule.patch (renamed from meta/recipes-extended/procps/procps-3.2.7/psmodule.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps-3.2.8/sysctl.conf (renamed from meta/recipes-extended/procps/procps-3.2.7/sysctl.conf) | 0 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps.inc | 8 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps_3.2.8.bb (renamed from meta/recipes-extended/procps/procps_3.2.7.bb) | 8 |
10 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-extended/procps/procps-3.2.7/install.patch b/meta/recipes-extended/procps/procps-3.2.8/install.patch index 9f1ef6915d..9f1ef6915d 100644 --- a/meta/recipes-extended/procps/procps-3.2.7/install.patch +++ b/meta/recipes-extended/procps/procps-3.2.8/install.patch diff --git a/meta/recipes-extended/procps/procps-3.2.7/linux-limits.patch b/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch index dcd66163ad..dcd66163ad 100644 --- a/meta/recipes-extended/procps/procps-3.2.7/linux-limits.patch +++ b/meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch diff --git a/meta/recipes-extended/procps/procps-3.2.7/pagesz-not-constant.patch b/meta/recipes-extended/procps/procps-3.2.8/pagesz-not-constant.patch index 8e9e1ebfe1..8e9e1ebfe1 100644 --- a/meta/recipes-extended/procps/procps-3.2.7/pagesz-not-constant.patch +++ b/meta/recipes-extended/procps/procps-3.2.8/pagesz-not-constant.patch diff --git a/meta/recipes-extended/procps/procps-3.2.7/procmodule.patch b/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch index fabfabaa59..fabfabaa59 100644 --- a/meta/recipes-extended/procps/procps-3.2.7/procmodule.patch +++ b/meta/recipes-extended/procps/procps-3.2.8/procmodule.patch 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.8/procps-3.2.8+gmake-3.82.patch index 23310e0592..23310e0592 100644 --- 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.8/procps-3.2.8+gmake-3.82.patch diff --git a/meta/recipes-extended/procps/procps-3.2.7/procps.init b/meta/recipes-extended/procps/procps-3.2.8/procps.init index 739dcf4be7..739dcf4be7 100644 --- a/meta/recipes-extended/procps/procps-3.2.7/procps.init +++ b/meta/recipes-extended/procps/procps-3.2.8/procps.init diff --git a/meta/recipes-extended/procps/procps-3.2.7/psmodule.patch b/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch index f298c1c1c4..f298c1c1c4 100644 --- a/meta/recipes-extended/procps/procps-3.2.7/psmodule.patch +++ b/meta/recipes-extended/procps/procps-3.2.8/psmodule.patch diff --git a/meta/recipes-extended/procps/procps-3.2.7/sysctl.conf b/meta/recipes-extended/procps/procps-3.2.8/sysctl.conf index 34e7488bf7..34e7488bf7 100644 --- a/meta/recipes-extended/procps/procps-3.2.7/sysctl.conf +++ b/meta/recipes-extended/procps/procps-3.2.8/sysctl.conf diff --git a/meta/recipes-extended/procps/procps.inc b/meta/recipes-extended/procps/procps.inc index 2de32d2c83..b8e20a89cb 100644 --- a/meta/recipes-extended/procps/procps.inc +++ b/meta/recipes-extended/procps/procps.inc @@ -5,12 +5,16 @@ includes the programs ps, top, vmstat, w, kill, and skill." HOMEPAGE = "http://procps.sf.net" SECTION = "base" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812 \ + file://ps/COPYING;md5=6e29c688d912da12b66b73e32b03d812 \ + file://proc/COPYING;md5=6e29c688d912da12b66b73e32b03d812" DEPENDS = "ncurses" FILES_${PN} += "${base_libdir}/libproc-*.so" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ - file://install.patch;patch=1" + file://install.patch" inherit autotools diff --git a/meta/recipes-extended/procps/procps_3.2.7.bb b/meta/recipes-extended/procps/procps_3.2.8.bb index 470352553c..32d812443f 100644 --- a/meta/recipes-extended/procps/procps_3.2.7.bb +++ b/meta/recipes-extended/procps/procps_3.2.8.bb @@ -1,6 +1,6 @@ require procps.inc -PR = "r10" +PR = "r0" inherit update-rc.d update-alternatives @@ -11,9 +11,9 @@ ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pki ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps" ALTERNATIVE_PRIORITY = "90" -SRC_URI += "file://procmodule.patch;patch=1 \ - file://psmodule.patch;patch=1 \ - file://linux-limits.patch;patch=1 \ +SRC_URI += "file://procmodule.patch \ + file://psmodule.patch \ + file://linux-limits.patch \ file://sysctl.conf \ file://procps.init \ file://procps-3.2.8+gmake-3.82.patch \ |