[oe-commits] Marcin Juszkiewicz : yum: do not hardcode /usr

[GIT User account]

Module: openembedded.git
Branch: hrw/poky-merge/add-rpm-packages-support
Commit: 28768286350b64eeb9284cf25e65ed2526dea47e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=28768286350b64eeb9284cf25e65ed2526dea47e

Author: Marcin Juszkiewicz <hrw at openembedded.org>
Date:   Wed Mar  4 20:26:57 2009 +0100

yum: do not hardcode /usr

---

 packages/yum/files/fix          |   18 ------------------
 packages/yum/files/paths2.patch |    4 ++--
 packages/yum/yum_3.2.18.bb      |    2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/packages/yum/files/fix b/packages/yum/files/fix
deleted file mode 100644
index bcb3301..0000000
--- a/packages/yum/files/fix
+++ /dev/null
@@ -1,18 +0,0 @@
----
- rpmUtils/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- yum-3.2.18.orig/rpmUtils/Makefile
-+++ yum-3.2.18/rpmUtils/Makefile
-@@ -1,10 +1,10 @@
- PYTHON=python
- PACKAGE = $(shell basename `pwd`)
- PYFILES = $(wildcard *.py)
- PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
--PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
-+PYSYSDIR := /usr
- PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
- PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
- 
- all: 
- 	echo "Nothing to do"
diff --git a/packages/yum/files/paths2.patch b/packages/yum/files/paths2.patch
index 08c9c83..2e11bdc 100644
--- a/packages/yum/files/paths2.patch
+++ b/packages/yum/files/paths2.patch
@@ -11,7 +11,7 @@
  PYFILES = $(wildcard *.py)
  PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
 -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
-+PYSYSDIR = /usr
++PYSYSDIR = $(prefix)
  PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
  PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
  
@@ -25,7 +25,7 @@
  PYFILES = $(wildcard *.py)
  PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
 -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
-+PYSYSDIR = /usr
++PYSYSDIR = $(prefix)
  PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
  PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
  
diff --git a/packages/yum/yum_3.2.18.bb b/packages/yum/yum_3.2.18.bb
index d8888d0..b147c52 100644
--- a/packages/yum/yum_3.2.18.bb
+++ b/packages/yum/yum_3.2.18.bb
@@ -1,5 +1,5 @@
 HOMEPAGE = "http://linux.duke.edu/projects/yum/"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://paths.patch;patch=1 \