summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/createrepo/createrepo/fix-native-install.patch')
-rw-r--r--meta/recipes-support/createrepo/createrepo/fix-native-install.patch88
1 files changed, 46 insertions, 42 deletions
diff --git a/meta/recipes-support/createrepo/createrepo/fix-native-install.patch b/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
index 2ed2202e77..53266b5444 100644
--- a/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
+++ b/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
@@ -4,19 +4,24 @@ There are two fixes:
4 1. -native needs to customize prefix 4 1. -native needs to customize prefix
5 2. needs to change python reference in binaries 5 2. needs to change python reference in binaries
6 6
7Upstream-Status: Inappropriate [native]
8
7Signed-off-by: Qing He <qing.he@intel.com> 9Signed-off-by: Qing He <qing.he@intel.com>
10Signed-off-by: Saul Wold <sgw@linux.intel.com>
8 11
9diff --git a/Makefile b/Makefile 12Index: createrepo-0.9.9/Makefile
10index b2d1a32..3c3639f 100644 13===================================================================
11--- a/Makefile 14--- createrepo-0.9.9.orig/Makefile 2011-01-26 09:14:30.000000000 -0800
12+++ b/Makefile 15+++ createrepo-0.9.9/Makefile 2011-04-06 14:12:06.608923997 -0700
13@@ -3,22 +3,22 @@ VERSION = 0.4.11 16@@ -10,22 +10,22 @@
14 SHELL = /bin/sh 17 SHELL = /bin/sh
15 top_srcdir = . 18 top_srcdir = .
16 srcdir = . 19 srcdir = .
17-prefix = /usr 20-prefix = /usr
18-exec_prefix = ${prefix} 21-exec_prefix = ${prefix}
19- 22+prefix ?= /usr
23+exec_prefix ?= ${prefix}
24
20-bindir = ${exec_prefix}/bin 25-bindir = ${exec_prefix}/bin
21-sbindir = ${exec_prefix}/sbin 26-sbindir = ${exec_prefix}/sbin
22-libexecdir = ${exec_prefix}/libexec 27-libexecdir = ${exec_prefix}/libexec
@@ -26,9 +31,6 @@ index b2d1a32..3c3639f 100644
26-localstatedir = ${prefix}/var 31-localstatedir = ${prefix}/var
27-libdir = ${exec_prefix}/lib 32-libdir = ${exec_prefix}/lib
28-infodir = ${prefix}/info 33-infodir = ${prefix}/info
29+prefix ?= /usr
30+exec_prefix ?= ${prefix}
31+
32+bindir ?= ${exec_prefix}/bin 34+bindir ?= ${exec_prefix}/bin
33+sbindir ?= ${exec_prefix}/sbin 35+sbindir ?= ${exec_prefix}/sbin
34+libexecdir ?= ${exec_prefix}/libexec 36+libexecdir ?= ${exec_prefix}/libexec
@@ -45,19 +47,21 @@ index b2d1a32..3c3639f 100644
45-mandir = ${prefix}/share/man 47-mandir = ${prefix}/share/man
46+mandir ?= ${prefix}/share/man 48+mandir ?= ${prefix}/share/man
47 49
48 pkgdatadir = $(datadir)/$(PACKAGE) 50 pkgdatadir = $(datadir)/$(PKGNAME)
49 pkglibdir = $(libdir)/$(PACKAGE) 51 pkglibdir = $(libdir)/$(PKGNAME)
50diff --git a/bin/Makefile b/bin/Makefile 52Index: createrepo-0.9.9/bin/Makefile
51index 52c1f50..e30610e 100644 53===================================================================
52--- a/bin/Makefile 54--- createrepo-0.9.9.orig/bin/Makefile 2011-01-26 09:14:30.000000000 -0800
53+++ b/bin/Makefile 55+++ createrepo-0.9.9/bin/Makefile 2011-04-06 14:15:07.212923998 -0700
54@@ -1,22 +1,22 @@ 56@@ -1,22 +1,22 @@
55 SHELL = /bin/sh 57 SHELL = /bin/sh
56 top_srcdir = .. 58 top_srcdir = ..
57 srcdir = ../bin 59 srcdir = ../bin
58-prefix = /usr 60-prefix = /usr
59-exec_prefix = ${prefix} 61-exec_prefix = ${prefix}
60- 62+prefix ?= /usr
63+exec_prefix ?= ${prefix}
64
61-bindir = ${exec_prefix}/bin 65-bindir = ${exec_prefix}/bin
62-sbindir = ${exec_prefix}/sbin 66-sbindir = ${exec_prefix}/sbin
63-libexecdir = ${exec_prefix}/libexec 67-libexecdir = ${exec_prefix}/libexec
@@ -67,9 +71,6 @@ index 52c1f50..e30610e 100644
67-localstatedir = ${prefix}/var 71-localstatedir = ${prefix}/var
68-libdir = ${exec_prefix}/lib 72-libdir = ${exec_prefix}/lib
69-infodir = ${prefix}/info 73-infodir = ${prefix}/info
70+prefix ?= /usr
71+exec_prefix ?= ${prefix}
72+
73+bindir ?= ${exec_prefix}/bin 74+bindir ?= ${exec_prefix}/bin
74+sbindir ?= ${exec_prefix}/sbin 75+sbindir ?= ${exec_prefix}/sbin
75+libexecdir ?= ${exec_prefix}/libexec 76+libexecdir ?= ${exec_prefix}/libexec
@@ -86,49 +87,55 @@ index 52c1f50..e30610e 100644
86-mandir = ${prefix}/man 87-mandir = ${prefix}/man
87+mandir ?= ${prefix}/man 88+mandir ?= ${prefix}/man
88 89
89 pkgdatadir = $(datadir)/$(PACKAGE) 90 pkgdatadir = $(datadir)/$(PKGNAME)
90 pkglibdir = $(libdir)/$(PACKAGE) 91 pkglibdir = $(libdir)/$(PKGNAME)
91@@ -40,8 +40,11 @@ all: $(srcdir)/$(PACKAGE) 92@@ -41,9 +41,14 @@
92 93
93 94
94 install: all installdirs 95 install: all installdirs
95- $(INSTALL_BIN) $(srcdir)/$(PACKAGE) $(DESTDIR)$(bindir)/$(PACKAGE) 96- $(INSTALL_BIN) $(srcdir)/$(PKGNAME) $(DESTDIR)$(bindir)/$(PKGNAME)
96- $(INSTALL_BIN) $(srcdir)/modifyrepo $(DESTDIR)$(bindir)/modifyrepo 97- $(INSTALL_BIN) $(srcdir)/modifyrepo $(DESTDIR)$(bindir)/modifyrepo
98- $(INSTALL_BIN) $(srcdir)/mergerepo $(DESTDIR)$(bindir)/mergerepo
97+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/$(PACKAGE) > $(srcdir)/$(PACKAGE).tmp 99+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/$(PACKAGE) > $(srcdir)/$(PACKAGE).tmp
98+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/modifyrepo > $(srcdir)/modifyrepo.tmp 100+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/modifyrepo > $(srcdir)/modifyrepo.tmp
101+ sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/mergerepo > $(srcdir)/mergerepo.tmp
99+ $(INSTALL_BIN) $(srcdir)/$(PACKAGE).tmp $(DESTDIR)$(bindir)/$(PACKAGE) 102+ $(INSTALL_BIN) $(srcdir)/$(PACKAGE).tmp $(DESTDIR)$(bindir)/$(PACKAGE)
100+ $(INSTALL_BIN) $(srcdir)/modifyrepo.tmp $(DESTDIR)$(bindir)/modifyrepo 103+ $(INSTALL_BIN) $(srcdir)/modifyrepo.tmp $(DESTDIR)$(bindir)/modifyrepo
101+ rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp 104+ $(INSTALL_BIN) $(srcdir)/mergerepo.tmp $(DESTDIR)$(bindir)/mergerepo
105+ rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp $(srcdir)/mergerepo.tmp
106+
102 107
103 108
104 uninstall: 109 uninstall:
105diff --git a/bin/createrepo b/bin/createrepo 110Index: createrepo-0.9.9/bin/createrepo
106index b0de515..eaacb39 100755 111===================================================================
107--- a/bin/createrepo 112--- createrepo-0.9.9.orig/bin/createrepo 2011-01-26 09:14:30.000000000 -0800
108+++ b/bin/createrepo 113+++ createrepo-0.9.9/bin/createrepo 2011-04-06 14:12:06.608923997 -0700
109@@ -1,2 +1,2 @@ 114@@ -1,2 +1,2 @@
110 #!/bin/sh 115 #!/bin/sh
111-exec /usr/share/createrepo/genpkgmetadata.py "$@" 116-exec /usr/share/createrepo/genpkgmetadata.py "$@"
112+exec @DATADIR@/createrepo/genpkgmetadata.py "$@" 117+exec @DATADIR@/createrepo/genpkgmetadata.py "$@"
113diff --git a/bin/modifyrepo b/bin/modifyrepo 118Index: createrepo-0.9.9/bin/modifyrepo
114index c9732d8..6f7c1d4 100755 119===================================================================
115--- a/bin/modifyrepo 120--- createrepo-0.9.9.orig/bin/modifyrepo 2011-01-26 09:14:30.000000000 -0800
116+++ b/bin/modifyrepo 121+++ createrepo-0.9.9/bin/modifyrepo 2011-04-06 14:12:06.608923997 -0700
117@@ -1,2 +1,2 @@ 122@@ -1,2 +1,2 @@
118 #!/bin/sh 123 #!/bin/sh
119-exec /usr/share/createrepo/modifyrepo.py "$@" 124-exec /usr/share/createrepo/modifyrepo.py "$@"
120+exec @DATADIR@/createrepo/modifyrepo.py "$@" 125+exec @DATADIR@/createrepo/modifyrepo.py "$@"
121diff --git a/docs/Makefile b/docs/Makefile 126Index: createrepo-0.9.9/docs/Makefile
122index 0a41179..e128c85 100644 127===================================================================
123--- a/docs/Makefile 128--- createrepo-0.9.9.orig/docs/Makefile 2011-01-26 09:14:30.000000000 -0800
124+++ b/docs/Makefile 129+++ createrepo-0.9.9/docs/Makefile 2011-04-06 14:12:06.608923997 -0700
125@@ -1,22 +1,22 @@ 130@@ -1,22 +1,22 @@
126 SHELL = /bin/sh 131 SHELL = /bin/sh
127 top_srcdir = .. 132 top_srcdir = ..
128 srcdir = ../docs 133 srcdir = ../docs
129-prefix = /usr 134-prefix = /usr
130-exec_prefix = ${prefix} 135-exec_prefix = ${prefix}
131- 136+prefix ?= /usr
137+exec_prefix ?= ${prefix}
138
132-bindir = ${exec_prefix}/bin 139-bindir = ${exec_prefix}/bin
133-sbindir = ${exec_prefix}/sbin 140-sbindir = ${exec_prefix}/sbin
134-libexecdir = ${exec_prefix}/libexec 141-libexecdir = ${exec_prefix}/libexec
@@ -138,9 +145,6 @@ index 0a41179..e128c85 100644
138-localstatedir = ${prefix}/var 145-localstatedir = ${prefix}/var
139-libdir = ${exec_prefix}/lib 146-libdir = ${exec_prefix}/lib
140-infodir = ${prefix}/info 147-infodir = ${prefix}/info
141+prefix ?= /usr
142+exec_prefix ?= ${prefix}
143+
144+bindir ?= ${exec_prefix}/bin 148+bindir ?= ${exec_prefix}/bin
145+sbindir ?= ${exec_prefix}/sbin 149+sbindir ?= ${exec_prefix}/sbin
146+libexecdir ?= ${exec_prefix}/libexec 150+libexecdir ?= ${exec_prefix}/libexec
@@ -157,5 +161,5 @@ index 0a41179..e128c85 100644
157-mandir = ${datadir}/man 161-mandir = ${datadir}/man
158+mandir ?= ${datadir}/man 162+mandir ?= ${datadir}/man
159 163
160 pkgdatadir = $(datadir)/$(PACKAGE) 164 pkgdatadir = $(datadir)/$(PKGNAME)
161 pkglibdir = $(libdir)/$(PACKAGE) 165 pkglibdir = $(libdir)/$(PKGNAME)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-01 23:38:21 +0000