summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-08-23 22:18:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-24 15:02:23 -0700
commited7affc42c513a27a3952d7d1c3ac5c93f20bff8 (patch)
tree4d92f61fed5c4348f7b67d9e2169703060c9a9b0
parent16ca6dda2ce30942c62c8ee3e5f545be9732f25b (diff)
downloadpoky-ed7affc42c513a27a3952d7d1c3ac5c93f20bff8.tar.gz
procps: Fix lib path to support multilib
Revise the install.patch which hardcode the lib paths. Change ${PN} to ${BPN} in file names. (From OE-Core rev: 7e3e69d38898876ba3325852bbec04586635e66f) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/procps/procps-3.2.8/install.patch30
-rw-r--r--meta/recipes-extended/procps/procps_3.2.8.bb8
2 files changed, 24 insertions, 14 deletions
diff --git a/meta/recipes-extended/procps/procps-3.2.8/install.patch b/meta/recipes-extended/procps/procps-3.2.8/install.patch
index b52a2c9141..2a59a5ff68 100644
--- a/meta/recipes-extended/procps/procps-3.2.8/install.patch
+++ b/meta/recipes-extended/procps/procps-3.2.8/install.patch
@@ -1,20 +1,30 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2 2
3--- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100 3diff -ruN procps-3.2.8-orig//Makefile procps-3.2.8/Makefile
4+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200 4--- procps-3.2.8-orig//Makefile 2011-08-23 22:06:46.471163999 +0800
5@@ -30,7 +30,10 @@ 5+++ procps-3.2.8/Makefile 2011-08-23 22:15:01.091163999 +0800
6@@ -29,9 +29,6 @@
7 ln_sf := ln -sf
6 install := install -D --owner 0 --group 0 8 install := install -D --owner 0 --group 0
7 9
8 # Lame x86-64 /lib64 and /usr/lib64 abomination: 10-# Lame x86-64 /lib64 and /usr/lib64 abomination:
9-lib64 := lib$(shell [ -d /lib64 ] && echo 64) 11-lib64 := lib$(shell [ -d /lib64 ] && echo 64)
10+# lib64 := lib$(shell [ -d /lib64 ] && echo 64) 12-
11+
12+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not.
13+lib64 := lib
14
15 usr/bin := $(DESTDIR)/usr/bin/ 13 usr/bin := $(DESTDIR)/usr/bin/
16 bin := $(DESTDIR)/bin/ 14 bin := $(DESTDIR)/bin/
17@@ -211,10 +214,10 @@ 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 @@
18 ###### install 28 ###### install
19 29
20 $(BINFILES) : all 30 $(BINFILES) : all
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index b1a7de7050..a38077eae2 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -1,6 +1,6 @@
1require procps.inc 1require procps.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5inherit update-rc.d update-alternatives 5inherit update-rc.d update-alternatives
6 6
@@ -22,10 +22,10 @@ SRC_URI += "file://procmodule.patch \
22SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0" 22SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0"
23SRC_URI[sha256sum] = "11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535" 23SRC_URI[sha256sum] = "11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535"
24 24
25FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \ 25FILES = "${bindir}/top.${BPN} ${base_bindir}/ps.${BPN} ${bindir}/uptime.${BPN} ${base_bindir}/kill.${BPN} \
26 ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \ 26 ${bindir}/free.${BPN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
27 ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \ 27 ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
28 ${base_sbindir}/sysctl.${PN}" 28 ${base_sbindir}/sysctl.${BPN}"
29 29
30CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" 30CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"
31 31