summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-10-07 09:31:18 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-10-07 09:31:18 +0000
commitbc6e408352af5a6c254842cb0ea74a503c9b443b (patch)
treecbf590f2fe105ed4a3cb8c815cd124368a2f8279 /meta/packages
parent559a522dc3b2c7251cee8933819f729a5aeec46d (diff)
downloadpoky-bc6e408352af5a6c254842cb0ea74a503c9b443b.tar.gz
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')
-rw-r--r--meta/packages/yum/files/fix18
-rw-r--r--meta/packages/yum/files/paths.patch40
-rw-r--r--meta/packages/yum/files/paths2.patch33
-rw-r--r--meta/packages/yum/yum_3.2.18.bb8
4 files changed, 81 insertions, 18 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 @@
1---
2 rpmUtils/Makefile | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5--- yum-3.2.18.orig/rpmUtils/Makefile
6+++ yum-3.2.18/rpmUtils/Makefile
7@@ -1,10 +1,10 @@
8 PYTHON=python
9 PACKAGE = $(shell basename `pwd`)
10 PYFILES = $(wildcard *.py)
11 PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
12-PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
13+PYSYSDIR := /usr
14 PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
15 PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
16
17 all:
18 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 @@
1Index: yum-3.2.18/Makefile 1---
2=================================================================== 2 Makefile | 18 +++++++++---------
3--- yum-3.2.18.orig/Makefile 2008-08-23 09:13:56.000000000 +0100 3 docs/Makefile | 12 ++++++------
4+++ yum-3.2.18/Makefile 2008-08-23 09:18:09.000000000 +0100 4 etc/Makefile | 20 ++++++++++----------
5@@ -18,19 +18,19 @@ 5 3 files changed, 25 insertions(+), 25 deletions(-)
6
7--- yum-3.2.18.orig/Makefile
8+++ yum-3.2.18/Makefile
9@@ -16,23 +16,23 @@ clean:
10
11 subdirs:
6 for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done 12 for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done
7 13
8 install: 14 install:
@@ -27,15 +33,17 @@ Index: yum-3.2.18/Makefile
27- mkdir -p $(DESTDIR)/var/cache/yum 33- mkdir -p $(DESTDIR)/var/cache/yum
28- mkdir -p $(DESTDIR)/var/lib/yum 34- mkdir -p $(DESTDIR)/var/lib/yum
29+ mkdir -p $(DESTDIR)$(localstatedir)/cache/yum 35+ mkdir -p $(DESTDIR)$(localstatedir)/cache/yum
30+ mkdir -p $(DESTDIR)$(localstatedir)/lib/yum 36+ mkdir -p $(DESTDIR)$(localstatedir)/lib/yum
31 37
32 for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done 38 for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
33 39
34Index: yum-3.2.18/docs/Makefile 40 .PHONY: docs test
35=================================================================== 41
36--- yum-3.2.18.orig/docs/Makefile 2008-08-23 09:19:07.000000000 +0100 42--- yum-3.2.18.orig/docs/Makefile
37+++ yum-3.2.18/docs/Makefile 2008-08-23 09:19:37.000000000 +0100 43+++ yum-3.2.18/docs/Makefile
38@@ -6,9 +6,9 @@ 44@@ -4,11 +4,11 @@ all:
45 clean:
46 rm -f *.pyc *.pyo *~
39 rm -fr epydoc 47 rm -fr epydoc
40 48
41 install: 49 install:
@@ -51,11 +59,11 @@ Index: yum-3.2.18/docs/Makefile
51+ install -m 644 yum.conf.5 $(DESTDIR)$(mandir)/man5/yum.conf.5 59+ install -m 644 yum.conf.5 $(DESTDIR)$(mandir)/man5/yum.conf.5
52+ install -m 644 yum-updatesd.8 $(DESTDIR)$(mandir)/man8/yum-updatesd.8 60+ install -m 644 yum-updatesd.8 $(DESTDIR)$(mandir)/man8/yum-updatesd.8
53+ install -m 644 yum-updatesd.conf.5 $(DESTDIR)$(mandir)/man5/yum-updatesd.conf.5 61+ install -m 644 yum-updatesd.conf.5 $(DESTDIR)$(mandir)/man5/yum-updatesd.conf.5
54Index: yum-3.2.18/etc/Makefile 62--- yum-3.2.18.orig/etc/Makefile
55=================================================================== 63+++ yum-3.2.18/etc/Makefile
56--- yum-3.2.18.orig/etc/Makefile 2008-08-23 09:19:51.000000000 +0100 64@@ -3,22 +3,22 @@ all:
57+++ yum-3.2.18/etc/Makefile 2008-08-23 09:20:28.000000000 +0100 65
58@@ -5,20 +5,20 @@ 66 clean:
59 rm -f *.pyc *.pyo *~ 67 rm -f *.pyc *.pyo *~
60 68
61 install: 69 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 @@
1---
2 rpmUtils/Makefile | 2 +-
3 yum/Makefile | 2 +-
4 2 files changed, 2 insertions(+), 2 deletions(-)
5
6--- yum-3.2.18.orig/rpmUtils/Makefile
7+++ yum-3.2.18/rpmUtils/Makefile
8@@ -1,10 +1,10 @@
9 PYTHON=python
10 PACKAGE = $(shell basename `pwd`)
11 PYFILES = $(wildcard *.py)
12 PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
13-PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
14+PYSYSDIR = /usr
15 PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
16 PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
17
18 all:
19 echo "Nothing to do"
20--- yum-3.2.18.orig/yum/Makefile
21+++ yum-3.2.18/yum/Makefile
22@@ -1,10 +1,10 @@
23 PYTHON=python
24 PACKAGE = $(shell basename `pwd`)
25 PYFILES = $(wildcard *.py)
26 PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
27-PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
28+PYSYSDIR = /usr
29 PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
30 PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
31
32 all:
33 echo "Nothing to do"
diff --git a/meta/packages/yum/yum_3.2.18.bb b/meta/packages/yum/yum_3.2.18.bb
index 9770a4e688..4c68803098 100644
--- a/meta/packages/yum/yum_3.2.18.bb
+++ b/meta/packages/yum/yum_3.2.18.bb
@@ -1,12 +1,14 @@
1HOMEPAGE = "http://linux.duke.edu/projects/yum/" 1HOMEPAGE = "http://linux.duke.edu/projects/yum/"
2PR = "r2" 2PR = "r3"
3 3
4SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \ 4SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
5 file://paths.patch;patch=1 \ 5 file://paths.patch;patch=1 \
6 file://paths2.patch;patch=1 \
6 file://yum-install-recommends.py \ 7 file://yum-install-recommends.py \
7 file://extract-postinst.awk" 8 file://extract-postinst.awk"
8 9
9DEPENDS = "rpm python python-iniparse python-urlgrabber yum-metadata-parser libxml2" 10DEPENDS = "python"
11RDEPENDS = "rpm python-core python-iniparse python-urlgrabber yum-metadata-parser"
10 12
11S = "${WORKDIR}/yum-${PV}" 13S = "${WORKDIR}/yum-${PV}"
12 14
@@ -22,3 +24,5 @@ do_install_append () {
22 install ${WORKDIR}/extract-postinst.awk ${D}${bindir}/ 24 install ${WORKDIR}/extract-postinst.awk ${D}${bindir}/
23 install ${WORKDIR}/yum-install-recommends.py ${D}${bindir}/ 25 install ${WORKDIR}/yum-install-recommends.py ${D}${bindir}/
24} 26}
27
28FILES_${PN} += "${libdir}/python* ${datadir}/yum-cli"