fix createrepo-native

PATCH Applied Qing He 2 participants 3 messages Jan 31, 2011

lore

Share & tools

lore

Qing He

author

2011-01-31 08:58 UTC #0 lore raw

cover fix createrepo-native

From: Qing He <[email protected]>

The binaries hard code /usr/share/createrepo to look for python libraries, this needs to change for -native version to work.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Thanks,
Qing He <[email protected]>
---

Qing He (1):
createrepo: fix native binary

 .../createrepo/createrepo/fix-native-install.patch |   40 +++++++++++++++++++-
 .../createrepo/createrepo_0.4.11.bb                |    2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

Qing He

author

2011-01-31 08:58 UTC #1 lore raw

PATCH 1/1 createrepo: fix native binary

From: Qing He <[email protected]>

Signed-off-by Qing He <[email protected]>

---
 .../createrepo/createrepo/fix-native-install.patch |   40 +++++++++++++++++++-
 .../createrepo/createrepo_0.4.11.bb                |    2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

meta/recipes-support/createrepo/createrepo/fix-native-install.patch +39 -1

index f17d224..2ed2202 100644
@@ -1,3 +1,11 @@
+Date: Jan 31, 2011
+
+There are two fixes:
+  1. -native needs to customize prefix
+  2. needs to change python reference in binaries
+
+Signed-off-by: Qing He <[email protected]>
+
 diff --git a/Makefile b/Makefile
 index b2d1a32..3c3639f 100644
 --- a/Makefile

@@ -40,7 +48,7 @@ index b2d1a32..3c3639f 100644
  pkgdatadir = $(datadir)/$(PACKAGE)
  pkglibdir = $(libdir)/$(PACKAGE)
 diff --git a/bin/Makefile b/bin/Makefile
-index 52c1f50..abef96a 100644
+index 52c1f50..e30610e 100644
 --- a/bin/Makefile
 +++ b/bin/Makefile
 @@ -1,22 +1,22 @@

@@ -80,6 +88,36 @@ index 52c1f50..abef96a 100644
  
  pkgdatadir = $(datadir)/$(PACKAGE)
  pkglibdir = $(libdir)/$(PACKAGE)
+@@ -40,8 +40,11 @@ all: $(srcdir)/$(PACKAGE)
+ 
+ 
+ install: all installdirs
+-	$(INSTALL_BIN) $(srcdir)/$(PACKAGE) $(DESTDIR)$(bindir)/$(PACKAGE)
+-	$(INSTALL_BIN) $(srcdir)/modifyrepo $(DESTDIR)$(bindir)/modifyrepo
++	sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/$(PACKAGE) > $(srcdir)/$(PACKAGE).tmp
++	sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/modifyrepo > $(srcdir)/modifyrepo.tmp
++	$(INSTALL_BIN) $(srcdir)/$(PACKAGE).tmp $(DESTDIR)$(bindir)/$(PACKAGE)
++	$(INSTALL_BIN) $(srcdir)/modifyrepo.tmp $(DESTDIR)$(bindir)/modifyrepo
++	rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp
+ 
+ 
+ uninstall:
+diff --git a/bin/createrepo b/bin/createrepo
+index b0de515..eaacb39 100755
+--- a/bin/createrepo
++++ b/bin/createrepo
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-exec /usr/share/createrepo/genpkgmetadata.py "$@"
++exec @DATADIR@/createrepo/genpkgmetadata.py "$@"
+diff --git a/bin/modifyrepo b/bin/modifyrepo
+index c9732d8..6f7c1d4 100755
+--- a/bin/modifyrepo
++++ b/bin/modifyrepo
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-exec /usr/share/createrepo/modifyrepo.py "$@"
++exec @DATADIR@/createrepo/modifyrepo.py "$@"
 diff --git a/docs/Makefile b/docs/Makefile
 index 0a41179..e128c85 100644
 --- a/docs/Makefile

meta/recipes-support/createrepo/createrepo_0.4.11.bb +1 -1

index 62cf778..ba1d04b 100644
@@ -4,7 +4,7 @@ HOMEPAGE = "http://createrepo.baseurl.org/"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \
           file://fix-native-install.patch \

Signature · 1 line

1.7.0

Richard Purdie

Applied

2011-01-31 16:27 UTC #2 lore raw

In reply to Qing He

Quoted 14 lines · Qing He

From: Qing He <[email protected]>
The binaries hard code /usr/share/createrepo to look for python libraries, this needs to change for -native version to work.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix
Thanks,
Qing He <[email protected]>
---

Quoted 6 lines

Qing He (1):
createrepo: fix native binary

 .../createrepo/createrepo/fix-native-install.patch |   40 +++++++++++++++++++-
 .../createrepo/createrepo_0.4.11.bb                |    2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

Merged into master, thanks.

Richard