[PATCH 0/1] fix createrepo-native

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/1] fix createrepo-native
@ 2011-01-31  8:52 Qing He
  2011-01-31  8:52 ` [PATCH 1/1] createrepo: fix native binary Qing He
  2011-01-31 16:27 ` [PATCH 0/1] fix createrepo-native Richard Purdie
  0 siblings, 2 replies; 3+ messages in thread
From: Qing He @ 2011-01-31  8:52 UTC (permalink / raw)
  To: poky

From: Qing He <qing.he@intel.com>

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 <qing.he@intel.com>
---


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(-)



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 1/1] createrepo: fix native binary
  2011-01-31  8:52 [PATCH 0/1] fix createrepo-native Qing He
@ 2011-01-31  8:52 ` Qing He
  2011-01-31 16:27 ` [PATCH 0/1] fix createrepo-native Richard Purdie
  1 sibling, 0 replies; 3+ messages in thread
From: Qing He @ 2011-01-31  8:52 UTC (permalink / raw)
  To: poky

From: Qing He <qing.he@intel.com>

Signed-off-by: Qing He <qing.he@intel.com>
---
 .../createrepo/createrepo/fix-native-install.patch |   40 +++++++++++++++++++-
 .../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 f17d224..2ed2202 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 @@
+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 <qing.he@intel.com>
+
 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
diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
index 62cf778..ba1d04b 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/"
 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 \
-- 
1.7.0



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 0/1] fix createrepo-native
  2011-01-31  8:52 [PATCH 0/1] fix createrepo-native Qing He
  2011-01-31  8:52 ` [PATCH 1/1] createrepo: fix native binary Qing He
@ 2011-01-31 16:27 ` Richard Purdie
  1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-01-31 16:27 UTC (permalink / raw)
  To: Qing He; +Cc: poky

On Mon, 2011-01-31 at 16:52 +0800, Qing He wrote:
> From: Qing He <qing.he@intel.com>
> 
> 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 <qing.he@intel.com>
> ---
> 
> 
> 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



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-01-31 16:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-31  8:52 [PATCH 0/1] fix createrepo-native Qing He
2011-01-31  8:52 ` [PATCH 1/1] createrepo: fix native binary Qing He
2011-01-31 16:27 ` [PATCH 0/1] fix createrepo-native Richard Purdie

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.