diff options
Diffstat (limited to 'meta/recipes-support/createrepo')
-rw-r--r-- | meta/recipes-support/createrepo/createrepo/fix-native-install.patch | 40 | ||||
-rw-r--r-- | meta/recipes-support/createrepo/createrepo_0.4.11.bb | 2 |
2 files changed, 40 insertions, 2 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 @@ | |||
1 | Date: Jan 31, 2011 | ||
2 | |||
3 | There are two fixes: | ||
4 | 1. -native needs to customize prefix | ||
5 | 2. needs to change python reference in binaries | ||
6 | |||
7 | Signed-off-by: Qing He <qing.he@intel.com> | ||
8 | |||
1 | diff --git a/Makefile b/Makefile | 9 | diff --git a/Makefile b/Makefile |
2 | index b2d1a32..3c3639f 100644 | 10 | index 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) |
42 | diff --git a/bin/Makefile b/bin/Makefile | 50 | diff --git a/bin/Makefile b/bin/Makefile |
43 | index 52c1f50..abef96a 100644 | 51 | index 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: | ||
105 | diff --git a/bin/createrepo b/bin/createrepo | ||
106 | index 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 "$@" | ||
113 | diff --git a/bin/modifyrepo b/bin/modifyrepo | ||
114 | index 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 "$@" | ||
83 | diff --git a/docs/Makefile b/docs/Makefile | 121 | diff --git a/docs/Makefile b/docs/Makefile |
84 | index 0a41179..e128c85 100644 | 122 | index 0a41179..e128c85 100644 |
85 | --- a/docs/Makefile | 123 | --- a/docs/Makefile |
diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb index 62cf778706..ba1d04b2bd 100644 --- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb +++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://createrepo.baseurl.org/" | |||
4 | LICENSE = "GPLv2+" | 4 | LICENSE = "GPLv2+" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" |
6 | 6 | ||
7 | PR = "r0" | 7 | PR = "r1" |
8 | 8 | ||
9 | SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ | 9 | SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \ |
10 | file://fix-native-install.patch \ | 10 | file://fix-native-install.patch \ |