[OE-core] [PATCH] procps: Upgrade to 3.3.10

2014-12-03 Thread Saul Wold
This is now the procps-ng version

cleaned up patches
added to fix up usrbin_execprefix in OE-Core

Add CPPFLAGS to allow seperate build directory works

[YOCTO #6952]

Signed-off-by: Saul Wold s...@linux.intel.com
---
Git was not able to detect a rename unfortunatly in this case.

 .../procps-3.2.8/0001-Fix-musl-build-failure.patch |  29 --
 .../procps-3.2.8/60_linux_version_init.patch   |  54 --
 .../procps/procps-3.2.8/detect_bitness.patch   |  26 -
 .../procps/procps-3.2.8/gnu-kbsd-version.patch |  44 
 .../procps/procps-3.2.8/install.patch  |  39 
 .../procps/procps-3.2.8/linux-limits.patch |  15 ---
 .../procps/procps-3.2.8/procmodule.patch   |  38 ---
 .../procps-3.2.8/procps-3.2.7-top-remcpu.patch | 111 -
 .../procps-3.2.8/procps-3.2.8+gmake-3.82.patch |  19 
 .../procps-3.2.8/procps-3.2.8-ps-cgroup.patch  |  82 ---
 .../procps/procps-3.2.8/psmodule.patch |  23 -
 meta/recipes-extended/procps/procps.inc|  31 --
 .../procps/{procps-3.2.8 = procps}/sysctl.conf|   0
 meta/recipes-extended/procps/procps_3.2.8.bb   |  37 ---
 meta/recipes-extended/procps/procps_3.3.10.bb  |  53 ++
 15 files changed, 53 insertions(+), 548 deletions(-)
 delete mode 100644 
meta/recipes-extended/procps/procps-3.2.8/0001-Fix-musl-build-failure.patch
 delete mode 100644 
meta/recipes-extended/procps/procps-3.2.8/60_linux_version_init.patch
 delete mode 100644 
meta/recipes-extended/procps/procps-3.2.8/detect_bitness.patch
 delete mode 100644 
meta/recipes-extended/procps/procps-3.2.8/gnu-kbsd-version.patch
 delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/install.patch
 delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/linux-limits.patch
 delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/procmodule.patch
 delete mode 100644 
meta/recipes-extended/procps/procps-3.2.8/procps-3.2.7-top-remcpu.patch
 delete mode 100644 
meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8+gmake-3.82.patch
 delete mode 100644 
meta/recipes-extended/procps/procps-3.2.8/procps-3.2.8-ps-cgroup.patch
 delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/psmodule.patch
 delete mode 100644 meta/recipes-extended/procps/procps.inc
 rename meta/recipes-extended/procps/{procps-3.2.8 = procps}/sysctl.conf (100%)
 delete mode 100644 meta/recipes-extended/procps/procps_3.2.8.bb
 create mode 100644 meta/recipes-extended/procps/procps_3.3.10.bb

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 71dc3f0..000
--- 
a/meta/recipes-extended/procps/procps-3.2.8/0001-Fix-musl-build-failure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6f2fd55ef7621fd7ab7897aee2c2651b6faf9e6a Mon Sep 17 00:00:00 2001
-From: Paul Barker p...@paulbarker.me.uk
-Date: Wed, 20 Aug 2014 11:56:11 +0200
-Subject: [PATCH] Fix musl build failure
-
-Include limits.h for PATH_MAX.
-
-Signed-off-by: Paul Barker p...@paulbarker.me.uk
-
-Upstream-status: Pending

- proc/readproc.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/proc/readproc.c b/proc/readproc.c
-index 4fad11d..c5b1869 100644
 a/proc/readproc.c
-+++ b/proc/readproc.c
-@@ -26,6 +26,7 @@
- #include sys/dir.h
- #include sys/types.h
- #include sys/stat.h
-+#include limits.h
- 
- // sometimes it's easier to do this manually, w/o gcc helping
- #ifdef PROF
--- 
-1.9.1
-
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 203ccb3..000
--- a/meta/recipes-extended/procps/procps-3.2.8/60_linux_version_init.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-## 60_linux_init.dpatch by  david.su...@canonical.com
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix Linux version detection which relied on elf loader side-effect.
-## DP: This patch also depends on 40_gnu-kbsd-version, which modified
-## DP: init_Linux_version().
-
-@DPATCH@
-
-Upstream-Status: inappropriate [upstream unmaintained]

- proc/sysinfo.c |1 +
- proc/version.c |5 +++--
- proc/version.h |1 +
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-Index: procps-3.2.8/proc/sysinfo.c
-===
 procps-3.2.8.orig/proc/sysinfo.c
-+++ procps-3.2.8/proc/sysinfo.c
-@@ -212,6 +212,7 @@ static int check_for_privs(void){
- static void init_libproc(void) __attribute__((constructor));
- static void init_libproc(void){
-   have_privs = check_for_privs();
-+  init_Linux_version(); // make sure we have version before continuing...
-   // ought to count CPUs in /proc/stat instead of relying
-   // on glibc, which foolishly tries to parse /proc/cpuinfo
-   //
-Index: 

Re: [OE-core] [PATCH] procps: Upgrade to 3.3.10

2014-12-03 Thread Koen Kooi

 Op 4 dec. 2014, om 03:43 heeft Saul Wold s...@linux.intel.com het volgende 
 geschreven:
 
 This is now the procps-ng version
 
 cleaned up patches
 added to fix up usrbin_execprefix in OE-Core
 
 Add CPPFLAGS to allow seperate build directory works
 
 [YOCTO #6952]
 
 Signed-off-by: Saul Wold s...@linux.intel.com
 ---
 Git was not able to detect a rename unfortunatly in this case.
 
 .../procps/{procps-3.2.8 = procps}/sysctl.conf|   0

So a rename instead of a deletion, good, but...

 
 +++ b/meta/recipes-extended/procps/procps_3.3.10.bb

[..]

 +
 +SRC_URI = 
 http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${PV}.tar.xz
  \
 +   file://fix-configure.patch \
 +  

... sysctl.conf not in SRC_URI, nor is it being installed in 
do_install(_append).
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core