mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

yum: Fix installation of python modules

Browse Source 
Signed-off-by: Joshua Lock <josh@linux.intel.com>
This commit is contained in:
Joshua Lock
2010-03-24 17:29:02 +00:00
parent 9b3a51fbd8
commit 555f60faa0
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/yum/files/paths2.patch
+16 -14
View File
@@ -3,31 +3,33 @@
yum/Makefile | 2 +- yum/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
--- yum-3.2.18.orig/rpmUtils/Makefile Index: yum-3.2.27/rpmUtils/Makefile
+++ yum-3.2.18/rpmUtils/Makefile ===================================================================
@@ -1,10 +1,10 @@ --- yum-3.2.27.orig/rpmUtils/Makefile 2010-03-24 17:26:39.759798777 +0000
PYTHON=python +++ yum-3.2.27/rpmUtils/Makefile 2010-03-24 17:26:54.835863845 +0000
@@ -2,8 +2,8 @@
PACKAGE = $(shell basename `pwd`) PACKAGE = $(shell basename `pwd`)
PYFILES = $(wildcard *.py) PYFILES = $(wildcard *.py)
PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)') PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
-PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix') -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
+PYSYSDIR = /usr -PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER) +PYSYSDIR = $(libdir)
+PYLIBDIR = $(PYSYSDIR)/python$(PYVER)
PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE) PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
all: all:
echo "Nothing to do" Index: yum-3.2.27/yum/Makefile
--- yum-3.2.18.orig/yum/Makefile ===================================================================
+++ yum-3.2.18/yum/Makefile --- yum-3.2.27.orig/yum/Makefile 2010-03-24 17:26:39.759798777 +0000
@@ -1,10 +1,10 @@ +++ yum-3.2.27/yum/Makefile 2010-03-24 17:26:43.726773783 +0000
PYTHON=python @@ -2,8 +2,8 @@
PACKAGE = $(shell basename `pwd`) PACKAGE = $(shell basename `pwd`)
PYFILES = $(wildcard *.py) PYFILES = $(wildcard *.py)
PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)') PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
-PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix') -PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
+PYSYSDIR = /usr -PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER) +PYSYSDIR = $(libdir)
+PYLIBDIR = $(PYSYSDIR)/python$(PYVER)
PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE) PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
all: all:
echo "Nothing to do"
meta/packages/yum/yum_3.2.27.bb
+1 -1
View File
@@ -1,5 +1,5 @@
HOMEPAGE = "http://linux.duke.edu/projects/yum/" HOMEPAGE = "http://linux.duke.edu/projects/yum/"
PR = "r7" PR = "r8"
SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \ SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
file://paths.patch;patch=1 \ file://paths.patch;patch=1 \