summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/createrepo/createrepo
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-01-31 16:49:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-31 16:27:14 +0000
commita9dda28e3f4d5361e6c68f68cd2f22fff1dbe7c6 (patch)
treeb6598bfc9da02acb75927c0a35b18db4a8811fa2 /meta/recipes-support/createrepo/createrepo
parenteed008baf2a9ebdfe90d244208e85a7713e97700 (diff)
downloadpoky-a9dda28e3f4d5361e6c68f68cd2f22fff1dbe7c6.tar.gz
createrepo: fix native binary
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-support/createrepo/createrepo')
-rw-r--r--meta/recipes-support/createrepo/createrepo/fix-native-install.patch40
1 files changed, 39 insertions, 1 deletions
diff --git a/meta/recipes-support/createrepo/createrepo/fix-native-install.patch b/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
index f17d224d1f..2ed2202e77 100644
--- a/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
+++ b/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
@@ -1,3 +1,11 @@
1Date: Jan 31, 2011
2
3There are two fixes:
4 1. -native needs to customize prefix
5 2. needs to change python reference in binaries
6
7Signed-off-by: Qing He <qing.he@intel.com>
8
1diff --git a/Makefile b/Makefile 9diff --git a/Makefile b/Makefile
2index b2d1a32..3c3639f 100644 10index b2d1a32..3c3639f 100644
3--- a/Makefile 11--- a/Makefile
@@ -40,7 +48,7 @@ index b2d1a32..3c3639f 100644
40 pkgdatadir = $(datadir)/$(PACKAGE) 48 pkgdatadir = $(datadir)/$(PACKAGE)
41 pkglibdir = $(libdir)/$(PACKAGE) 49 pkglibdir = $(libdir)/$(PACKAGE)
42diff --git a/bin/Makefile b/bin/Makefile 50diff --git a/bin/Makefile b/bin/Makefile
43index 52c1f50..abef96a 100644 51index 52c1f50..e30610e 100644
44--- a/bin/Makefile 52--- a/bin/Makefile
45+++ b/bin/Makefile 53+++ b/bin/Makefile
46@@ -1,22 +1,22 @@ 54@@ -1,22 +1,22 @@
@@ -80,6 +88,36 @@ index 52c1f50..abef96a 100644
80 88
81 pkgdatadir = $(datadir)/$(PACKAGE) 89 pkgdatadir = $(datadir)/$(PACKAGE)
82 pkglibdir = $(libdir)/$(PACKAGE) 90 pkglibdir = $(libdir)/$(PACKAGE)
91@@ -40,8 +40,11 @@ all: $(srcdir)/$(PACKAGE)
92
93
94 install: all installdirs
95- $(INSTALL_BIN) $(srcdir)/$(PACKAGE) $(DESTDIR)$(bindir)/$(PACKAGE)
96- $(INSTALL_BIN) $(srcdir)/modifyrepo $(DESTDIR)$(bindir)/modifyrepo
97+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/$(PACKAGE) > $(srcdir)/$(PACKAGE).tmp
98+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/modifyrepo > $(srcdir)/modifyrepo.tmp
99+ $(INSTALL_BIN) $(srcdir)/$(PACKAGE).tmp $(DESTDIR)$(bindir)/$(PACKAGE)
100+ $(INSTALL_BIN) $(srcdir)/modifyrepo.tmp $(DESTDIR)$(bindir)/modifyrepo
101+ rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp
102
103
104 uninstall:
105diff --git a/bin/createrepo b/bin/createrepo
106index b0de515..eaacb39 100755
107--- a/bin/createrepo
108+++ b/bin/createrepo
109@@ -1,2 +1,2 @@
110 #!/bin/sh
111-exec /usr/share/createrepo/genpkgmetadata.py "$@"
112+exec @DATADIR@/createrepo/genpkgmetadata.py "$@"
113diff --git a/bin/modifyrepo b/bin/modifyrepo
114index c9732d8..6f7c1d4 100755
115--- a/bin/modifyrepo
116+++ b/bin/modifyrepo
117@@ -1,2 +1,2 @@
118 #!/bin/sh
119-exec /usr/share/createrepo/modifyrepo.py "$@"
120+exec @DATADIR@/createrepo/modifyrepo.py "$@"
83diff --git a/docs/Makefile b/docs/Makefile 121diff --git a/docs/Makefile b/docs/Makefile
84index 0a41179..e128c85 100644 122index 0a41179..e128c85 100644
85--- a/docs/Makefile 123--- a/docs/Makefile