summaryrefslogtreecommitdiffstats
path: root/meta/packages/yum
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-03-23 14:17:58 +0000
committerJoshua Lock <josh@linux.intel.com>2010-03-23 14:51:10 +0000
commitff5e6f4b4d1f0431d6225155430b057028ec3bb2 (patch)
treefaa07b10ea279e92d1eb001dec470a1a702bbba3 /meta/packages/yum
parent1a1361040f081e6a87ff3733ade1d07faf80eb8c (diff)
downloadpoky-ff5e6f4b4d1f0431d6225155430b057028ec3bb2.tar.gz
yum: Update yum and createrepo to latest version
Also switch Yum to using BBCLASSEXTEND rather than having separate native and host recipes. Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/packages/yum')
-rw-r--r--meta/packages/yum/createrepo-native/fix.patch17
-rw-r--r--meta/packages/yum/createrepo-native_0.9.8.bb (renamed from meta/packages/yum/createrepo-native_0.9.bb)1
-rw-r--r--meta/packages/yum/files/paths.patch54
-rw-r--r--meta/packages/yum/yum-native_3.2.18.bb23
-rw-r--r--meta/packages/yum/yum_3.2.27.bb (renamed from meta/packages/yum/yum_3.2.18.bb)2
5 files changed, 34 insertions, 63 deletions
diff --git a/meta/packages/yum/createrepo-native/fix.patch b/meta/packages/yum/createrepo-native/fix.patch
deleted file mode 100644
index 4fe58e379d..0000000000
--- a/meta/packages/yum/createrepo-native/fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1---
2 createrepo/yumbased.py | 2 ++
3 1 file changed, 2 insertions(+)
4
5Index: createrepo-0.9/createrepo/yumbased.py
6===================================================================
7--- createrepo-0.9.orig/createrepo/yumbased.py 2008-08-26 11:41:13.000000000 +0100
8+++ createrepo-0.9/createrepo/yumbased.py 2008-08-26 11:37:01.000000000 +0100
9@@ -37,6 +37,8 @@ class CreateRepoPackage(YumLocalPackage)
10 self._hdrend = None
11
12 def _xml(self, item):
13+ if item == []:
14+ return []
15 return xml.sax.saxutils.escape(item)
16
17 def _do_checksum(self):
diff --git a/meta/packages/yum/createrepo-native_0.9.bb b/meta/packages/yum/createrepo-native_0.9.8.bb
index c634ecb746..422b118ac9 100644
--- a/meta/packages/yum/createrepo-native_0.9.bb
+++ b/meta/packages/yum/createrepo-native_0.9.8.bb
@@ -1,7 +1,6 @@
1DEPENDS = "python-native" 1DEPENDS = "python-native"
2 2
3SRC_URI = "http://createrepo.baseurl.org/download/createrepo-${PV}.tar.gz \ 3SRC_URI = "http://createrepo.baseurl.org/download/createrepo-${PV}.tar.gz \
4 file://fix.patch;patch=1 \
5 file://pathfix.patch;patch=1 " 4 file://pathfix.patch;patch=1 "
6PR = "r1" 5PR = "r1"
7 6
diff --git a/meta/packages/yum/files/paths.patch b/meta/packages/yum/files/paths.patch
index 55e6a0a2ee..0175d05b34 100644
--- a/meta/packages/yum/files/paths.patch
+++ b/meta/packages/yum/files/paths.patch
@@ -4,11 +4,11 @@
4 etc/Makefile | 20 ++++++++++---------- 4 etc/Makefile | 20 ++++++++++----------
5 3 files changed, 25 insertions(+), 25 deletions(-) 5 3 files changed, 25 insertions(+), 25 deletions(-)
6 6
7--- yum-3.2.18.orig/Makefile 7Index: yum-3.2.27/Makefile
8+++ yum-3.2.18/Makefile 8===================================================================
9@@ -16,23 +16,23 @@ clean: 9--- yum-3.2.27.orig/Makefile 2010-03-04 01:10:20.000000000 +0000
10 10+++ yum-3.2.27/Makefile 2010-03-23 13:49:50.663912930 +0000
11 subdirs: 11@@ -22,19 +22,19 @@
12 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
13 13
14 install: 14 install:
@@ -37,33 +37,39 @@
37 37
38 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
39 39
40 .PHONY: docs test 40Index: yum-3.2.27/docs/Makefile
41 41===================================================================
42--- yum-3.2.18.orig/docs/Makefile 42--- yum-3.2.27.orig/docs/Makefile 2009-04-07 14:57:06.000000000 +0100
43+++ yum-3.2.18/docs/Makefile 43+++ yum-3.2.27/docs/Makefile 2010-03-23 13:52:30.086667913 +0000
44@@ -4,11 +4,11 @@ all: 44@@ -6,10 +6,10 @@
45 clean:
46 rm -f *.pyc *.pyo *~
47 rm -fr epydoc 45 rm -fr epydoc
48 46
49 install: 47 install:
50- mkdir -p $(DESTDIR)/usr/share/man/man{5,8} 48- mkdir -p $(DESTDIR)/usr/share/man/man5
49- mkdir -p $(DESTDIR)/usr/share/man/man8
51- install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8 50- install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
52- install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8 51- install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
53- install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5 52- install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
54- install -m 644 yum-updatesd.8 $(DESTDIR)/usr/share/man/man8/yum-updatesd.8 53- install -m 644 yum-updatesd.8 $(DESTDIR)/usr/share/man/man8/yum-updatesd.8
55- install -m 644 yum-updatesd.conf.5 $(DESTDIR)/usr/share/man/man5/yum-updatesd.conf.5 54- install -m 644 yum-updatesd.conf.5 $(DESTDIR)/usr/share/man/man5/yum-updatesd.conf.5
56+ mkdir -p $(DESTDIR)$(mandir)/man{5,8} 55+ mkdir -p $(DESTDIR)$(mandir)/man5
56+ mkdir -p $(DESTDIR)$(mandir)/man8
57+ install -m 644 yum.8 $(DESTDIR)$(mandir)/man8/yum.8 57+ install -m 644 yum.8 $(DESTDIR)$(mandir)/man8/yum.8
58+ install -m 644 yum-shell.8 $(DESTDIR)$(mandir)/man8/yum-shell.8 58+ install -m 644 yum-shell.8 $(DESTDIR)$(mandir)/man8/yum-shell.8
59+ 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
60+ 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
61+ 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
62--- yum-3.2.18.orig/etc/Makefile 62Index: yum-3.2.27/etc/Makefile
63+++ yum-3.2.18/etc/Makefile 63===================================================================
64@@ -3,22 +3,22 @@ all: 64--- yum-3.2.27.orig/etc/Makefile 2009-10-26 18:56:06.000000000 +0000
65 65+++ yum-3.2.27/etc/Makefile 2010-03-23 13:54:40.421912460 +0000
66 clean: 66@@ -1,4 +1,4 @@
67-YUMETC=$(DESTDIR)/etc/yum
68+YUMETC=$(DESTDIR)$(sysconfdir)/yum
69
70 all:
71 echo "Nothing to do"
72@@ -7,23 +7,23 @@
67 rm -f *.pyc *.pyo *~ 73 rm -f *.pyc *.pyo *~
68 74
69 install: 75 install:
@@ -72,8 +78,9 @@
72+ mkdir -p $(DESTDIR)$(sysconfdir)/yum/ 78+ mkdir -p $(DESTDIR)$(sysconfdir)/yum/
73+ mkdir -p $(DESTDIR)$(sysconfdir)/yum/repos.d 79+ mkdir -p $(DESTDIR)$(sysconfdir)/yum/repos.d
74 80
75- install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf 81 install -m 644 yum.conf $(YUMETC)/yum.conf
76+ install -m 644 yum.conf $(DESTDIR)$(sysconfdir)/yum/yum.conf 82
83 install -m 644 version-groups.conf $(YUMETC)/version-groups.conf
77 84
78- mkdir -p $(DESTDIR)/etc/logrotate.d 85- mkdir -p $(DESTDIR)/etc/logrotate.d
79- install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum 86- install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum
@@ -93,4 +100,7 @@
93- install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf 100- install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
94+ install -m 755 yum-updatesd.conf $(DESTDIR)$(sysconfdir)/yum/yum-updatesd.conf 101+ install -m 755 yum-updatesd.conf $(DESTDIR)$(sysconfdir)/yum/yum-updatesd.conf
95 102
96 103- mkdir -p $(DESTDIR)/etc/bash_completion.d
104- install -m 644 yum.bash $(DESTDIR)/etc/bash_completion.d
105+ mkdir -p $(DESTDIR)$(sysconfdir)/bash_completion.d
106+ install -m 644 yum.bash $(DESTDIR)$(sysconfdir)/bash_completion.d
diff --git a/meta/packages/yum/yum-native_3.2.18.bb b/meta/packages/yum/yum-native_3.2.18.bb
deleted file mode 100644
index 7c3578fc94..0000000000
--- a/meta/packages/yum/yum-native_3.2.18.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1HOMEPAGE = "http://linux.duke.edu/projects/yum/"
2
3SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
4 file://hacks.patch;patch=1 \
5 file://paths.patch;patch=1 \
6 file://yum-install-recommends.py \
7 file://extract-postinst.awk"
8PR = "r7"
9
10DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
11
12inherit autotools native
13
14do_compile_append () {
15 sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum.py
16 sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum-updatesd.py
17}
18
19do_install_append () {
20 install -d ${STAGING_BINDIR}/
21 install ${WORKDIR}/extract-postinst.awk ${STAGING_BINDIR}/
22 install ${WORKDIR}/yum-install-recommends.py ${STAGING_BINDIR}/
23}
diff --git a/meta/packages/yum/yum_3.2.18.bb b/meta/packages/yum/yum_3.2.27.bb
index 50211e7147..e51aacd562 100644
--- a/meta/packages/yum/yum_3.2.18.bb
+++ b/meta/packages/yum/yum_3.2.27.bb
@@ -39,3 +39,5 @@ pkg_postinst_yum () {
39} 39}
40 40
41FILES_${PN} += "${libdir}/python* ${datadir}/yum-cli" 41FILES_${PN} += "${libdir}/python* ${datadir}/yum-cli"
42
43BBCLASSEXTEND = "native" \ No newline at end of file