diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-10-07 09:31:18 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-10-07 09:31:18 +0000 |
| commit | bc6e408352af5a6c254842cb0ea74a503c9b443b (patch) | |
| tree | cbf590f2fe105ed4a3cb8c815cd124368a2f8279 /meta/packages/yum/files | |
| parent | 559a522dc3b2c7251cee8933819f729a5aeec46d (diff) | |
| download | openembedded-core-bc6e408352af5a6c254842cb0ea74a503c9b443b.tar.gz openembedded-core-bc6e408352af5a6c254842cb0ea74a503c9b443b.tar.bz2 openembedded-core-bc6e408352af5a6c254842cb0ea74a503c9b443b.zip | |
yum: fixed packaging
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5426 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/yum/files')
| -rw-r--r-- | meta/packages/yum/files/fix | 18 | ||||
| -rw-r--r-- | meta/packages/yum/files/paths.patch | 40 | ||||
| -rw-r--r-- | meta/packages/yum/files/paths2.patch | 33 |
3 files changed, 75 insertions, 16 deletions
diff --git a/meta/packages/yum/files/fix b/meta/packages/yum/files/fix new file mode 100644 index 0000000000..bcb3301e14 --- /dev/null +++ b/meta/packages/yum/files/fix @@ -0,0 +1,18 @@ +--- + 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/meta/packages/yum/files/paths.patch b/meta/packages/yum/files/paths.patch index ee5c999c4b..55e6a0a2ee 100644 --- a/meta/packages/yum/files/paths.patch +++ b/meta/packages/yum/files/paths.patch @@ -1,8 +1,14 @@ -Index: yum-3.2.18/Makefile -=================================================================== ---- yum-3.2.18.orig/Makefile 2008-08-23 09:13:56.000000000 +0100 -+++ yum-3.2.18/Makefile 2008-08-23 09:18:09.000000000 +0100 -@@ -18,19 +18,19 @@ +--- + Makefile | 18 +++++++++--------- + docs/Makefile | 12 ++++++------ + etc/Makefile | 20 ++++++++++---------- + 3 files changed, 25 insertions(+), 25 deletions(-) + +--- yum-3.2.18.orig/Makefile ++++ yum-3.2.18/Makefile +@@ -16,23 +16,23 @@ clean: + + subdirs: for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done install: @@ -27,15 +33,17 @@ Index: yum-3.2.18/Makefile - mkdir -p $(DESTDIR)/var/cache/yum - mkdir -p $(DESTDIR)/var/lib/yum + mkdir -p $(DESTDIR)$(localstatedir)/cache/yum -+ mkdir -p $(DESTDIR)$(localstatedir)/lib/yum ++ mkdir -p $(DESTDIR)$(localstatedir)/lib/yum for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done -Index: yum-3.2.18/docs/Makefile -=================================================================== ---- yum-3.2.18.orig/docs/Makefile 2008-08-23 09:19:07.000000000 +0100 -+++ yum-3.2.18/docs/Makefile 2008-08-23 09:19:37.000000000 +0100 -@@ -6,9 +6,9 @@ + .PHONY: docs test + +--- yum-3.2.18.orig/docs/Makefile ++++ yum-3.2.18/docs/Makefile +@@ -4,11 +4,11 @@ all: + clean: + rm -f *.pyc *.pyo *~ rm -fr epydoc install: @@ -51,11 +59,11 @@ Index: yum-3.2.18/docs/Makefile + install -m 644 yum.conf.5 $(DESTDIR)$(mandir)/man5/yum.conf.5 + install -m 644 yum-updatesd.8 $(DESTDIR)$(mandir)/man8/yum-updatesd.8 + install -m 644 yum-updatesd.conf.5 $(DESTDIR)$(mandir)/man5/yum-updatesd.conf.5 -Index: yum-3.2.18/etc/Makefile -=================================================================== ---- yum-3.2.18.orig/etc/Makefile 2008-08-23 09:19:51.000000000 +0100 -+++ yum-3.2.18/etc/Makefile 2008-08-23 09:20:28.000000000 +0100 -@@ -5,20 +5,20 @@ +--- yum-3.2.18.orig/etc/Makefile ++++ yum-3.2.18/etc/Makefile +@@ -3,22 +3,22 @@ all: + + clean: rm -f *.pyc *.pyo *~ install: diff --git a/meta/packages/yum/files/paths2.patch b/meta/packages/yum/files/paths2.patch new file mode 100644 index 0000000000..08c9c8312e --- /dev/null +++ b/meta/packages/yum/files/paths2.patch @@ -0,0 +1,33 @@ +--- + rpmUtils/Makefile | 2 +- + yum/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- 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" +--- yum-3.2.18.orig/yum/Makefile ++++ yum-3.2.18/yum/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" |