summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-05-26 19:02:30 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-05-27 01:33:59 (GMT)
commit7fa8cbf213b2321527dc51561e3ee81529357af5 (patch)
treec0217a1320901cd74579cb9d94b21a6bcee19d12
parentc2f65d99c7daddf045fe1fcb99b52bf86e8f2737 (diff)
downloadpoky-7fa8cbf213b2321527dc51561e3ee81529357af5.tar.gz
Revert "createrepo: Update to 0.9.9"
This was just the wrong update to go to, it was not fully vetted and contains yum requirements which is not a direction we are moving in. This reverts commit 7576eba58cdfebf0606623c25ae969ef52774099. (From OE-Core rev: 7ffcabba6308d8b0e6caf883e675e6ae094d3302) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/createrepo/createrepo/fix-native-install.patch88
-rw-r--r--meta/recipes-support/createrepo/createrepo_0.4.11.bb (renamed from meta/recipes-support/createrepo/createrepo_0.9.9.bb)7
2 files changed, 46 insertions, 49 deletions
diff --git a/meta/recipes-support/createrepo/createrepo/fix-native-install.patch b/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
index ece205b..d8202a4 100644
--- a/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
+++ b/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
@@ -6,24 +6,19 @@ There are two fixes:
6 1. -native needs to customize prefix 6 1. -native needs to customize prefix
7 2. needs to change python reference in binaries 7 2. needs to change python reference in binaries
8 8
9Upstream-Status: Inappropriate [native]
10
11Signed-off-by: Qing He <qing.he@intel.com> 9Signed-off-by: Qing He <qing.he@intel.com>
12Signed-off-by: Saul Wold <sgw@linux.intel.com>
13 10
14Index: createrepo-0.9.9/Makefile 11diff --git a/Makefile b/Makefile
15=================================================================== 12index b2d1a32..3c3639f 100644
16--- createrepo-0.9.9.orig/Makefile 2011-01-26 09:14:30.000000000 -0800 13--- a/Makefile
17+++ createrepo-0.9.9/Makefile 2011-04-06 14:12:06.608923997 -0700 14+++ b/Makefile
18@@ -10,22 +10,22 @@ 15@@ -3,22 +3,22 @@ VERSION = 0.4.11
19 SHELL = /bin/sh 16 SHELL = /bin/sh
20 top_srcdir = . 17 top_srcdir = .
21 srcdir = . 18 srcdir = .
22-prefix = /usr 19-prefix = /usr
23-exec_prefix = ${prefix} 20-exec_prefix = ${prefix}
24+prefix ?= /usr 21-
25+exec_prefix ?= ${prefix}
26
27-bindir = ${exec_prefix}/bin 22-bindir = ${exec_prefix}/bin
28-sbindir = ${exec_prefix}/sbin 23-sbindir = ${exec_prefix}/sbin
29-libexecdir = ${exec_prefix}/libexec 24-libexecdir = ${exec_prefix}/libexec
@@ -33,6 +28,9 @@ Index: createrepo-0.9.9/Makefile
33-localstatedir = ${prefix}/var 28-localstatedir = ${prefix}/var
34-libdir = ${exec_prefix}/lib 29-libdir = ${exec_prefix}/lib
35-infodir = ${prefix}/info 30-infodir = ${prefix}/info
31+prefix ?= /usr
32+exec_prefix ?= ${prefix}
33+
36+bindir ?= ${exec_prefix}/bin 34+bindir ?= ${exec_prefix}/bin
37+sbindir ?= ${exec_prefix}/sbin 35+sbindir ?= ${exec_prefix}/sbin
38+libexecdir ?= ${exec_prefix}/libexec 36+libexecdir ?= ${exec_prefix}/libexec
@@ -49,21 +47,19 @@ Index: createrepo-0.9.9/Makefile
49-mandir = ${prefix}/share/man 47-mandir = ${prefix}/share/man
50+mandir ?= ${prefix}/share/man 48+mandir ?= ${prefix}/share/man
51 49
52 pkgdatadir = $(datadir)/$(PKGNAME) 50 pkgdatadir = $(datadir)/$(PACKAGE)
53 pkglibdir = $(libdir)/$(PKGNAME) 51 pkglibdir = $(libdir)/$(PACKAGE)
54Index: createrepo-0.9.9/bin/Makefile 52diff --git a/bin/Makefile b/bin/Makefile
55=================================================================== 53index 52c1f50..e30610e 100644
56--- createrepo-0.9.9.orig/bin/Makefile 2011-01-26 09:14:30.000000000 -0800 54--- a/bin/Makefile
57+++ createrepo-0.9.9/bin/Makefile 2011-04-06 14:15:07.212923998 -0700 55+++ b/bin/Makefile
58@@ -1,22 +1,22 @@ 56@@ -1,22 +1,22 @@
59 SHELL = /bin/sh 57 SHELL = /bin/sh
60 top_srcdir = .. 58 top_srcdir = ..
61 srcdir = ../bin 59 srcdir = ../bin
62-prefix = /usr 60-prefix = /usr
63-exec_prefix = ${prefix} 61-exec_prefix = ${prefix}
64+prefix ?= /usr 62-
65+exec_prefix ?= ${prefix}
66
67-bindir = ${exec_prefix}/bin 63-bindir = ${exec_prefix}/bin
68-sbindir = ${exec_prefix}/sbin 64-sbindir = ${exec_prefix}/sbin
69-libexecdir = ${exec_prefix}/libexec 65-libexecdir = ${exec_prefix}/libexec
@@ -73,6 +69,9 @@ Index: createrepo-0.9.9/bin/Makefile
73-localstatedir = ${prefix}/var 69-localstatedir = ${prefix}/var
74-libdir = ${exec_prefix}/lib 70-libdir = ${exec_prefix}/lib
75-infodir = ${prefix}/info 71-infodir = ${prefix}/info
72+prefix ?= /usr
73+exec_prefix ?= ${prefix}
74+
76+bindir ?= ${exec_prefix}/bin 75+bindir ?= ${exec_prefix}/bin
77+sbindir ?= ${exec_prefix}/sbin 76+sbindir ?= ${exec_prefix}/sbin
78+libexecdir ?= ${exec_prefix}/libexec 77+libexecdir ?= ${exec_prefix}/libexec
@@ -89,55 +88,49 @@ Index: createrepo-0.9.9/bin/Makefile
89-mandir = ${prefix}/man 88-mandir = ${prefix}/man
90+mandir ?= ${prefix}/man 89+mandir ?= ${prefix}/man
91 90
92 pkgdatadir = $(datadir)/$(PKGNAME) 91 pkgdatadir = $(datadir)/$(PACKAGE)
93 pkglibdir = $(libdir)/$(PKGNAME) 92 pkglibdir = $(libdir)/$(PACKAGE)
94@@ -41,9 +41,14 @@ 93@@ -40,8 +40,11 @@ all: $(srcdir)/$(PACKAGE)
95 94
96 95
97 install: all installdirs 96 install: all installdirs
98- $(INSTALL_BIN) $(srcdir)/$(PKGNAME) $(DESTDIR)$(bindir)/$(PKGNAME) 97- $(INSTALL_BIN) $(srcdir)/$(PACKAGE) $(DESTDIR)$(bindir)/$(PACKAGE)
99- $(INSTALL_BIN) $(srcdir)/modifyrepo $(DESTDIR)$(bindir)/modifyrepo 98- $(INSTALL_BIN) $(srcdir)/modifyrepo $(DESTDIR)$(bindir)/modifyrepo
100- $(INSTALL_BIN) $(srcdir)/mergerepo $(DESTDIR)$(bindir)/mergerepo
101+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/$(PACKAGE) > $(srcdir)/$(PACKAGE).tmp 99+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/$(PACKAGE) > $(srcdir)/$(PACKAGE).tmp
102+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/modifyrepo > $(srcdir)/modifyrepo.tmp 100+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/modifyrepo > $(srcdir)/modifyrepo.tmp
103+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/mergerepo > $(srcdir)/mergerepo.tmp
104+ $(INSTALL_BIN) $(srcdir)/$(PACKAGE).tmp $(DESTDIR)$(bindir)/$(PACKAGE) 101+ $(INSTALL_BIN) $(srcdir)/$(PACKAGE).tmp $(DESTDIR)$(bindir)/$(PACKAGE)
105+ $(INSTALL_BIN) $(srcdir)/modifyrepo.tmp $(DESTDIR)$(bindir)/modifyrepo 102+ $(INSTALL_BIN) $(srcdir)/modifyrepo.tmp $(DESTDIR)$(bindir)/modifyrepo
106+ $(INSTALL_BIN) $(srcdir)/mergerepo.tmp $(DESTDIR)$(bindir)/mergerepo 103+ rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp
107+ rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp $(srcdir)/mergerepo.tmp
108+
109 104
110 105
111 uninstall: 106 uninstall:
112Index: createrepo-0.9.9/bin/createrepo 107diff --git a/bin/createrepo b/bin/createrepo
113=================================================================== 108index b0de515..eaacb39 100755
114--- createrepo-0.9.9.orig/bin/createrepo 2011-01-26 09:14:30.000000000 -0800 109--- a/bin/createrepo
115+++ createrepo-0.9.9/bin/createrepo 2011-04-06 14:12:06.608923997 -0700 110+++ b/bin/createrepo
116@@ -1,2 +1,2 @@ 111@@ -1,2 +1,2 @@
117 #!/bin/sh 112 #!/bin/sh
118-exec /usr/share/createrepo/genpkgmetadata.py "$@" 113-exec /usr/share/createrepo/genpkgmetadata.py "$@"
119+exec @DATADIR@/createrepo/genpkgmetadata.py "$@" 114+exec @DATADIR@/createrepo/genpkgmetadata.py "$@"
120Index: createrepo-0.9.9/bin/modifyrepo 115diff --git a/bin/modifyrepo b/bin/modifyrepo
121=================================================================== 116index c9732d8..6f7c1d4 100755
122--- createrepo-0.9.9.orig/bin/modifyrepo 2011-01-26 09:14:30.000000000 -0800 117--- a/bin/modifyrepo
123+++ createrepo-0.9.9/bin/modifyrepo 2011-04-06 14:12:06.608923997 -0700 118+++ b/bin/modifyrepo
124@@ -1,2 +1,2 @@ 119@@ -1,2 +1,2 @@
125 #!/bin/sh 120 #!/bin/sh
126-exec /usr/share/createrepo/modifyrepo.py "$@" 121-exec /usr/share/createrepo/modifyrepo.py "$@"
127+exec @DATADIR@/createrepo/modifyrepo.py "$@" 122+exec @DATADIR@/createrepo/modifyrepo.py "$@"
128Index: createrepo-0.9.9/docs/Makefile 123diff --git a/docs/Makefile b/docs/Makefile
129=================================================================== 124index 0a41179..e128c85 100644
130--- createrepo-0.9.9.orig/docs/Makefile 2011-01-26 09:14:30.000000000 -0800 125--- a/docs/Makefile
131+++ createrepo-0.9.9/docs/Makefile 2011-04-06 14:12:06.608923997 -0700 126+++ b/docs/Makefile
132@@ -1,22 +1,22 @@ 127@@ -1,22 +1,22 @@
133 SHELL = /bin/sh 128 SHELL = /bin/sh
134 top_srcdir = .. 129 top_srcdir = ..
135 srcdir = ../docs 130 srcdir = ../docs
136-prefix = /usr 131-prefix = /usr
137-exec_prefix = ${prefix} 132-exec_prefix = ${prefix}
138+prefix ?= /usr 133-
139+exec_prefix ?= ${prefix}
140
141-bindir = ${exec_prefix}/bin 134-bindir = ${exec_prefix}/bin
142-sbindir = ${exec_prefix}/sbin 135-sbindir = ${exec_prefix}/sbin
143-libexecdir = ${exec_prefix}/libexec 136-libexecdir = ${exec_prefix}/libexec
@@ -147,6 +140,9 @@ Index: createrepo-0.9.9/docs/Makefile
147-localstatedir = ${prefix}/var 140-localstatedir = ${prefix}/var
148-libdir = ${exec_prefix}/lib 141-libdir = ${exec_prefix}/lib
149-infodir = ${prefix}/info 142-infodir = ${prefix}/info
143+prefix ?= /usr
144+exec_prefix ?= ${prefix}
145+
150+bindir ?= ${exec_prefix}/bin 146+bindir ?= ${exec_prefix}/bin
151+sbindir ?= ${exec_prefix}/sbin 147+sbindir ?= ${exec_prefix}/sbin
152+libexecdir ?= ${exec_prefix}/libexec 148+libexecdir ?= ${exec_prefix}/libexec
@@ -163,5 +159,5 @@ Index: createrepo-0.9.9/docs/Makefile
163-mandir = ${datadir}/man 159-mandir = ${datadir}/man
164+mandir ?= ${datadir}/man 160+mandir ?= ${datadir}/man
165 161
166 pkgdatadir = $(datadir)/$(PKGNAME) 162 pkgdatadir = $(datadir)/$(PACKAGE)
167 pkglibdir = $(libdir)/$(PKGNAME) 163 pkglibdir = $(libdir)/$(PACKAGE)
diff --git a/meta/recipes-support/createrepo/createrepo_0.9.9.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
index 89f18f4e..ba1d04b 100644
--- a/meta/recipes-support/createrepo/createrepo_0.9.9.bb
+++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
@@ -4,13 +4,14 @@ HOMEPAGE = "http://createrepo.baseurl.org/"
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" 5LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
6 6
7PR = "r0" 7PR = "r1"
8 8
9SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ 9SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \
10 file://fix-native-install.patch \ 10 file://fix-native-install.patch \
11 " 11 "
12SRC_URI[md5sum] = "10641f19a40e9f633b300e23dde00349" 12
13SRC_URI[sha256sum] = "ee897463837b299fb20bf6e970f8c5324cd8b7f26ad3675a9938a2d7ae42ff03" 13SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2"
14SRC_URI[sha256sum] = "a73ae11a0dcde8bde36d900bc3f7f8f1083ba752c70a5c61b72d1e1e7608f21b"
14 15
15BBCLASSEXTEND = "native" 16BBCLASSEXTEND = "native"
16 17