Merging RPM support from Poky

Merging RPM support from Poky

[Marcin Juszkiewicz]

As some of you know Poky has RPM support written. It consists few parts:

- creating RPM packages
- creating rootfs from RPM packages
- using RPM/YUM on device to managing packages (installing from local and
  remote packages

I had one attempt to get it merged before but it had some bugs so I started
from scratch. Extracting required patches from pile of 1800 Poky changsets
took me some time.

With this patchset I managed to build 'minimal-image' for AT91SAM9263-EK
machine. As distribution I used 'minimal' to get something other then
Angstrom.

So please review it (patch 67 is already merged in .dev tree).

It is also visible on Web: http://cgit.openembedded.net/cgit.cgi?url=openembedded/log/&h=hrw/poky-merge/add-rpm-packages-support

Fetch via: git pull hrw/poky-merge/add-rpm-packages-support

 classes/base.bbclass                               |   13 +
 classes/package.bbclass                            |    6 +
 classes/package_rpm.bbclass                        |  140 +++++++--
 classes/packaged-staging.bbclass                   |   14 +
 classes/rootfs_rpm.bbclass                         |  220 ++++++++++++++
 classes/rpm_core.bbclass                           |   16 -
 packages/beecrypt/beecrypt_3.1.0.bb                |   16 +-
 packages/beecrypt/files/x64fix.patch               |   20 ++
 packages/fakechroot/fakechroot-native_2.5.bb       |    2 +-
 packages/fakechroot/fakechroot_2.5.bb              |    3 +-
 packages/fakechroot/files/fix-readlink.patch       |   32 ++
 packages/libxml/libxml2-native.inc                 |    5 +-
 packages/libxml/libxml2-native_2.7.2.bb            |    2 +-
 packages/openssl/openssl-native_0.9.7g.bb          |    1 +
 packages/openssl/openssl-native_0.9.7m.bb          |    1 +
 packages/openssl/openssl-native_0.9.8g.bb          |    1 +
 packages/python/python-iniparse-native_0.2.3.bb    |   10 +
 packages/python/python-iniparse_0.2.3.bb           |   11 +
 packages/python/python-urlgrabber-native_3.1.0.bb  |   10 +
 packages/python/python-urlgrabber_3.1.0.bb         |   11 +
 .../python/yum-metadata-parser-native_1.1.2.bb     |   12 +
 packages/python/yum-metadata-parser_1.1.2.bb       |   13 +
 packages/rpm/files/cross_libpaths.patch            |  239 +++++++++++++++-
 packages/rpm/files/extcond.patch                   |   78 +++++
 packages/rpm/files/external-tools.patch            |  108 +++++++
 packages/rpm/files/fix_mypath.patch                |   13 -
 packages/rpm/files/missingok.patch                 |   44 +++
 packages/rpm/files/tagsbackport.patch              |   37 +++
 packages/rpm/files/weakdeps.patch                  |  312 ++++++++++++++++++++
 packages/rpm/rpm-native_4.4.2.3.bb                 |    7 +
 packages/rpm/rpm_4.4.2.3.bb                        |  108 +++++++
 packages/rpm/rpm_4.4.bb                            |   44 ---
 packages/yum/createrepo-native/fix.patch           |   17 +
 packages/yum/createrepo-native/pathfix.patch       |   81 +++++
 packages/yum/createrepo-native_0.9.bb              |   17 +
 packages/yum/files/extract-postinst.awk            |   11 +
 packages/yum/files/fix                             |   18 ++
 packages/yum/files/hacks.patch                     |   81 +++++
 packages/yum/files/paths.patch                     |   96 ++++++
 packages/yum/files/paths2.patch                    |   33 ++
 packages/yum/files/yum-install-recommends.py       |   39 +++
 packages/yum/yum-native_3.2.18.bb                  |   25 ++
 packages/yum/yum_3.2.18.bb                         |   32 ++
 43 files changed, 1872 insertions(+), 127 deletions(-)

[PATCH 01/70] rpm: drop 4.4

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

---
 packages/rpm/files/cross_libpaths.patch |   24 -----------------
 packages/rpm/files/fix_mypath.patch     |   13 ---------
 packages/rpm/rpm_4.4.bb                 |   44 -------------------------------
 3 files changed, 0 insertions(+), 81 deletions(-)
 delete mode 100644 packages/rpm/files/cross_libpaths.patch
 delete mode 100644 packages/rpm/files/fix_mypath.patch
 delete mode 100644 packages/rpm/rpm_4.4.bb

diff --git a/packages/rpm/files/cross_libpaths.patch b/packages/rpm/files/cross_libpaths.patch
deleted file mode 100644
index d6139db..0000000
--- a/packages/rpm/files/cross_libpaths.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: rpm-4.4/configure.ac
-===================================================================
---- rpm-4.4.orig/configure.ac	2005-01-29 10:54:37.698359056 -0500
-+++ rpm-4.4/configure.ac	2005-01-29 10:55:16.492461456 -0500
-@@ -321,10 +321,8 @@
- 
- localdone=
- 
--dirs=$prefix
- if test "$cross_compiling" != "yes"; then
--  dirs="$dirs /usr/local"
--fi
-+dirs="$prefix /usr/local"
- for dir in $dirs
- do
- 	case $dir in
-@@ -366,6 +364,7 @@
- else
- 	AC_MSG_RESULT(no)
- fi
-+fi
- 
- dnl
- dnl Check for features
diff --git a/packages/rpm/files/fix_mypath.patch b/packages/rpm/files/fix_mypath.patch
deleted file mode 100644
index 09512be..0000000
--- a/packages/rpm/files/fix_mypath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rpm-4.4/configure.ac
-===================================================================
---- rpm-4.4.orig/configure.ac	2005-01-29 10:54:13.599022712 -0500
-+++ rpm-4.4/configure.ac	2005-01-29 10:54:37.698359056 -0500
-@@ -230,7 +230,7 @@
- dnl use defaults if cross-compiling, otherwise use the default path.
- dnl
- if test "$cross_compiling" = "yes"; then
--    MYPATH=""
-+    MYPATH=":"
- else
- #    MYPATH="/bin:/usr/bin:/usr/local/bin:$PATH:/sbin:/usr/sbin:/usr/local/sbin:/opt/gnu/bin"
-     MYPATH=$PATH
diff --git a/packages/rpm/rpm_4.4.bb b/packages/rpm/rpm_4.4.bb
deleted file mode 100644
index ff69ddc..0000000
--- a/packages/rpm/rpm_4.4.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "The RPM Package Manager."
-HOMEPAGE = "http://rpm.org/"
-LICENSE = "LGPL GPL"
-# NOTE: currently rpm doesn't support using an external popt,
-# file, or virtual/db.  FIXME: patch it to support that.
-# DEPENDS = "virtual/db popt file zlib"
-DEPENDS = "zlib"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.jbj.org/pub/rpm-4.4.x/rpm-4.4-1.src.rpm \
-	   file://fix_mypath.patch;patch=1 \
-	   file://cross_libpaths.patch;patch=1"
-TARBALL = "${WORKDIR}/rpm-4.4.tar.gz"
-
-inherit autotools gettext
-
-acpaths = ""
-# NOTE: currently BROKEN because its internal build of 'file' tries
-# to run the binary it builds.  Either switch to an external build,
-# or depend on our file-native and make it call that.
-BROKEN = "1"
-EXTRA_OECONF = "--without-python \
-		--without-apidocs \
-		--without-selinux \
-		--without-lua \
-		--without-dmalloc \
-		--without-efence"
-
-python unpack_again () {
-	import bb, os
-	os.chdir(bb.data.getVar('WORKDIR', d, 1) or '')
-	if not oe_unpack_file(bb.data.expand('${TARBALL}', d), d):
-		raise bb.build.FuncFailed(bb.data.expand("Unable to unpack ${TARBALL}", d))
-}
-
-python do_unpack () {
-	bb.build.exec_func('base_do_unpack', d)
-	bb.build.exec_func('unpack_again', d)
-}
-
-do_configure () {
-	touch db3/configure.ac
-	autotools_do_configure
-}
-- 
1.6.1.3

[PATCH 02/70] rpm/rpm-native: Add recipe for 4.4.2.3 (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5069 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/rpm/files/cross_libpaths.patch |  145 +++++++++++++++++++++++++++++++
 packages/rpm/files/external-tools.patch |  108 +++++++++++++++++++++++
 packages/rpm/rpm-native_4.4.2.3.bb      |   10 ++
 packages/rpm/rpm_4.4.2.3.bb             |   84 ++++++++++++++++++
 4 files changed, 347 insertions(+), 0 deletions(-)
 create mode 100644 packages/rpm/files/cross_libpaths.patch
 create mode 100644 packages/rpm/files/external-tools.patch
 create mode 100644 packages/rpm/rpm-native_4.4.2.3.bb
 create mode 100644 packages/rpm/rpm_4.4.2.3.bb

diff --git a/packages/rpm/files/cross_libpaths.patch b/packages/rpm/files/cross_libpaths.patch
new file mode 100644
index 0000000..8cc34f2
--- /dev/null
+++ b/packages/rpm/files/cross_libpaths.patch
@@ -0,0 +1,145 @@
+Index: rpm-4.4.2.3/configure.ac
+===================================================================
+--- rpm-4.4.2.3.orig/configure.ac	2008-08-17 11:40:29.000000000 +0100
++++ rpm-4.4.2.3/configure.ac	2008-08-17 11:40:29.000000000 +0100
+@@ -326,10 +326,8 @@
+ 
+ localdone=
+ 
+-dirs=$prefix
+ if test "$cross_compiling" != "yes"; then
+-  dirs="$dirs /usr/local"
+-fi
++dirs="$prefix /usr/local"
+ for dir in $dirs
+ do
+ 	case $dir in
+@@ -371,6 +369,7 @@
+ else
+ 	AC_MSG_RESULT(no)
+ fi
++fi
+ 
+ dnl
+ dnl Check for features
+@@ -473,7 +472,7 @@
+     AC_CHECK_HEADER([beecrypt/api.h], [
+       AC_DEFINE(HAVE_BEECRYPT_API_H, 1, [Define to 1 if you have the <beecrypt/api.h> header file.])
+     ])
+-    WITH_BEECRYPT_INCLUDE="-I${includedir}/beecrypt"
++    WITH_BEECRYPT_INCLUDE=""
+     WITH_BEECRYPT_LIB="-lbeecrypt"
+   ])
+ ],[
+@@ -506,7 +505,7 @@
+     AC_CHECK_LIB(neon, ne_send_request_chunk, [
+ 	AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1, [Define to 1 if you have ne_send_request_chunk() in libneon.])
+     ])
+-    WITH_NEON_INCLUDE="-I${includedir}/neon"
++    WITH_NEON_INCLUDE=""
+     WITH_NEON_LIB="-lneon"
+   ])
+ ],[
+Index: rpm-4.4.2.3/rpmio/Makefile.am
+===================================================================
+--- rpm-4.4.2.3.orig/rpmio/Makefile.am	2008-04-01 08:28:22.000000000 +0100
++++ rpm-4.4.2.3/rpmio/Makefile.am	2008-08-17 11:40:29.000000000 +0100
+@@ -26,8 +26,6 @@
+ 
+ BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs)
+ 
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+ usrlibdir = $(libdir)@MARK64@
+ usrlib_LTLIBRARIES = librpmio.la
+ librpmio_la_SOURCES = \
+Index: rpm-4.4.2.3/rpmio/rpmio_internal.h
+===================================================================
+--- rpm-4.4.2.3.orig/rpmio/rpmio_internal.h	2008-04-01 08:28:22.000000000 +0100
++++ rpm-4.4.2.3/rpmio/rpmio_internal.h	2008-08-17 11:40:29.000000000 +0100
+@@ -12,22 +12,22 @@
+ #if HAVE_BEECRYPT_API_H
+ #include <api.h>
+ #else
+-#include <beecrypt.api.h>
++#include <beecrypt/beecrypt.api.h>
+ #endif
+ 
+ #include <rpmpgp.h>
+ #include <rpmsw.h>
+ 
+ /* Drag in the beecrypt includes. */
+-#include <beecrypt.h>
+-#include <base64.h>
+-#include <dsa.h>
+-#include <endianness.h>
+-#include <md5.h>
+-#include <mp.h>
+-#include <rsa.h>
+-#include <rsapk.h>
+-#include <sha1.h>
++#include <beecrypt/beecrypt.h>
++#include <beecrypt/base64.h>
++#include <beecrypt/dsa.h>
++#include <beecrypt/endianness.h>
++#include <beecrypt/md5.h>
++#include <beecrypt/mp.h>
++#include <beecrypt/rsa.h>
++#include <beecrypt/rsapk.h>
++#include <beecrypt/sha1.h>
+ #if HAVE_BEECRYPT_API_H
+ #include <sha256.h>
+ #include <sha384.h>
+Index: rpm-4.4.2.3/Makefile.am
+===================================================================
+--- rpm-4.4.2.3.orig/Makefile.am	2008-08-17 11:42:36.000000000 +0100
++++ rpm-4.4.2.3/Makefile.am	2008-08-17 11:42:50.000000000 +0100
+@@ -10,7 +10,7 @@
+ 	po/*.in po/*.po po/rpm.pot \
+ 	rpm.magic rpmpopt-$(VERSION) rpmqv.c 
+ 
+-SUBDIRS = po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts doc .
++SUBDIRS = po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts doc .
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)/build \
+Index: rpm-4.4.2.3/rpmdb/Makefile.am
+===================================================================
+--- rpm-4.4.2.3.orig/rpmdb/Makefile.am	2008-08-17 11:43:36.000000000 +0100
++++ rpm-4.4.2.3/rpmdb/Makefile.am	2008-08-17 11:43:57.000000000 +0100
+@@ -41,9 +41,6 @@
+ # XXX watchout, ../db3/libdb.la created by this Makefile may surprise
+ libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
+ 
+-# XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+ usrlibdir = $(libdir)@MARK64@
+ usrlib_LTLIBRARIES = librpmdb.la
+ librpmdb_la_SOURCES = \
+Index: rpm-4.4.2.3/lib/Makefile.am
+===================================================================
+--- rpm-4.4.2.3.orig/lib/Makefile.am	2008-08-17 11:46:43.000000000 +0100
++++ rpm-4.4.2.3/lib/Makefile.am	2008-08-17 11:46:51.000000000 +0100
+@@ -29,8 +29,6 @@
+ mylibs = librpm.la
+ LIBS =
+ 
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+ usrlibdir = $(libdir)@MARK64@
+ usrlib_LTLIBRARIES = librpm.la
+ librpm_la_SOURCES = \
+Index: rpm-4.4.2.3/build/Makefile.am
+===================================================================
+--- rpm-4.4.2.3.orig/build/Makefile.am	2008-08-17 11:47:37.000000000 +0100
++++ rpm-4.4.2.3/build/Makefile.am	2008-08-17 11:47:43.000000000 +0100
+@@ -22,8 +22,6 @@
+ pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h
+ noinst_HEADERS = buildio.h
+ 
+-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
+-
+ usrlibdir = $(libdir)@MARK64@
+ usrlib_LTLIBRARIES = librpmbuild.la
+ librpmbuild_la_SOURCES = \
diff --git a/packages/rpm/files/external-tools.patch b/packages/rpm/files/external-tools.patch
new file mode 100644
index 0000000..e967b87
--- /dev/null
+++ b/packages/rpm/files/external-tools.patch
@@ -0,0 +1,108 @@
+Index: rpm-4.4.2.3/configure.ac
+===================================================================
+--- rpm-4.4.2.3.orig/configure.ac	2008-04-01 08:30:14.000000000 +0100
++++ rpm-4.4.2.3/configure.ac	2008-08-17 10:57:30.000000000 +0100
+@@ -529,7 +529,7 @@
+ WITH_MAGIC_INCLUDE=
+ WITH_MAGIC_LIB=
+ 
+-if test -d file ; then
++if test -d file_disabled ; then
+   WITH_RPMFILE=rpmfile
+   WITH_MAGIC_SUBDIR=file
+   WITH_MAGIC_INCLUDE="-I\${top_srcdir}/${WITH_MAGIC_SUBDIR}/src"
+@@ -1307,7 +1307,7 @@
+ dnl # XXX Propagate -lucb to popt ...
+ dnl export LIBS INCPATH CONFIG_SITE
+ 
+-AC_CONFIG_SUBDIRS(popt file db3)
++AC_CONFIG_SUBDIRS(db/dist)
+ 
+ AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt
+ 	rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
+Index: rpm-4.4.2.3/db/dist/configure.ac
+===================================================================
+--- rpm-4.4.2.3.orig/db/dist/configure.ac	2008-04-01 08:28:21.000000000 +0100
++++ rpm-4.4.2.3/db/dist/configure.ac	2008-08-17 09:54:37.000000000 +0100
+@@ -11,14 +11,6 @@
+ AC_CANONICAL_HOST()
+ AC_ARG_PROGRAM()
+ 
+-# Don't build in the top-level or dist directories.
+-AC_MSG_CHECKING(if building in the top-level or dist directories)
+-if [ test -d db_archive -o -f configure.ac ] ; then
+-	AC_MSG_RESULT(yes)
+-	AC_MSG_ERROR(
+-    [Berkeley DB should not be built in the top-level or dist directories.])
+-fi
+-AC_MSG_RESULT(no)
+ 
+ # Substitution variables.
+ AC_SUBST(ADDITIONAL_INCS)
+@@ -281,7 +273,7 @@
+ AC_PROG_LIBTOOL
+ 
+ SOFLAGS="-rpath \$(libdir)"
+-LIBTOOL_PROG="${SHELL} ./libtool"
++LIBTOOL_PROG="${SHELL} ./$host_alias-libtool"
+ 
+ # Set SOSUFFIX and friends
+ SOSUFFIX_CONFIG
+@@ -297,7 +289,7 @@
+ MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
+ MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
+ 
+-LIBTOOL="\$(SHELL) ./libtool"
++LIBTOOL="\$(SHELL) ./$host_alias-libtool"
+ 
+ case "$host_os" in
+ cygwin* | mingw*)
+Index: rpm-4.4.2.3/db/dist/aclocal/options.ac
+===================================================================
+--- rpm-4.4.2.3.orig/db/dist/aclocal/options.ac	2008-08-17 09:57:49.000000000 +0100
++++ rpm-4.4.2.3/db/dist/aclocal/options.ac	2008-08-17 09:57:59.000000000 +0100
+@@ -277,10 +277,6 @@
+ 
+ # Uniquename excludes C++, Java, RPC.
+ if test "$db_cv_uniquename" = "yes"; then
+-	if test "$db_cv_rpc" = "yes"; then
+-		AC_MSG_ERROR(
+-		    [--with-uniquename is not compatible with --enable-rpc])
+-	fi
+ 	if test "$db_cv_cxx" = "yes"; then
+ 		AC_MSG_ERROR(
+ 		    [--with-uniquename is not compatible with --enable-cxx])
+Index: rpm-4.4.2.3/db/dist/aclocal/rpc.ac
+===================================================================
+--- rpm-4.4.2.3.orig/db/dist/aclocal/rpc.ac	2008-08-17 10:46:26.000000000 +0100
++++ rpm-4.4.2.3/db/dist/aclocal/rpc.ac	2008-08-17 10:46:47.000000000 +0100
+@@ -60,6 +60,7 @@
+ 	    -e 's/^}/__dbsrv_timeout(0);}/' \
+ 	    -e '}' \
+ 	    -e '1,/^#include/s/^#include/#include "db_config.h"\
++#include "db_int_def.h"\
+ &/' > db_server_svc.c
+ 
+ 	$RPCGEN -c $XDR_FILE |
+Index: rpm-4.4.2.3/tools/rpmfile.c
+===================================================================
+--- rpm-4.4.2.3.orig/tools/rpmfile.c	2008-08-17 11:01:51.000000000 +0100
++++ rpm-4.4.2.3/tools/rpmfile.c	2008-08-17 11:03:07.000000000 +0100
+@@ -29,7 +29,7 @@
+  * file - find type of a file or files - main program.
+  */
+ 
+-#include "file.h"
++#include "../file/src/file.h"
+ #include "magic.h"
+ 
+ #include <stdio.h>
+@@ -69,7 +69,7 @@
+ 
+ #include <netinet/in.h>		/* for byte swapping */
+ 
+-#include "patchlevel.h"
++#include "../file/src/patchlevel.h"
+ 
+ #ifndef	lint
+ FILE_RCSID("@(#)$Id: file.c,v 1.96 2005/03/06 05:58:22 christos Exp $")
diff --git a/packages/rpm/rpm-native_4.4.2.3.bb b/packages/rpm/rpm-native_4.4.2.3.bb
new file mode 100644
index 0000000..f122a47
--- /dev/null
+++ b/packages/rpm/rpm-native_4.4.2.3.bb
@@ -0,0 +1,10 @@
+require rpm_${PV}.bb
+inherit native
+
+DEPENDS = "beecrypt-native zlib-native file-native popt-native"
+
+PR = "r2"
+
+export sharedstatedir = "${layout_sharedstatedir}"
+export localstatedir = "${layout_localstatedir}"
+
diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
new file mode 100644
index 0000000..b04b500
--- /dev/null
+++ b/packages/rpm/rpm_4.4.2.3.bb
@@ -0,0 +1,84 @@
+DESCRIPTION = "The RPM Package Manager."
+HOMEPAGE = "http://rpm.org/"
+LICENSE = "LGPL GPL"
+DEPENDS = "zlib beecrypt file popt"
+PR = "r1"
+
+SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
+           file://external-tools.patch;patch=1 \
+	   file://cross_libpaths.patch;patch=1"
+
+inherit autotools gettext
+
+S = "${WORKDIR}/rpm-${PV}"
+
+acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
+
+EXTRA_OECONF = "--without-python \
+		--without-apidocs \
+		--without-selinux \
+		--without-lua \
+		--without-dmalloc \
+		--without-efence"
+
+# Handle the db MUTEX settings here, the POSIX library is
+# the default - "POSIX/pthreads/library".
+# Don't ignore the nice SWP instruction on the ARM:
+# These enable the ARM assembler mutex code, this won't
+# work with thumb compilation...
+ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
+MUTEX = ""
+MUTEX_arm = "${ARM_MUTEX}"
+MUTEX_armeb = "${ARM_MUTEX}"
+EXTRA_OECONF += "${MUTEX}"
+
+do_configure () {
+	rm ${S}/popt/ -Rf
+	rm ${S}/db/dist/configure.in -f
+	cd ${S}/db/dist/aclocal
+	rm libtool* -f
+	for i in `ls *.ac`; do
+	    j=`echo $i | sed 's/.ac/.m4/g'`
+	    mv $i $j
+	done
+	cd ${S}/db/dist/aclocal_java
+	for i in `ls *.ac`; do
+	    j=`echo $i | sed 's/.ac/.m4/g'`
+	    mv $i $j
+	done
+	cd ${S}
+	autotools_do_configure
+	cd ${S}/db/dist
+	. ./RELEASE
+	# Edit version information we couldn't pre-compute.
+	(echo "1,\$s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" &&
+	 echo "1,\$s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" &&
+	 echo "1,\$s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" &&
+	 echo "1,\$s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" &&
+	 echo "1,\$s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" &&
+	 echo "1,\$s/__EDIT_DB_VERSION__/$DB_VERSION/g" &&
+	 echo "w" &&
+	 echo "q") | ed configure
+	cd ${S}/db3
+	${S}/db3/configure \
+		    --build=${BUILD_SYS} \
+		    --host=${HOST_SYS} \
+		    --target=${TARGET_SYS} \
+		    --prefix=${prefix} \
+		    --exec_prefix=${exec_prefix} \
+		    --bindir=${bindir} \
+		    --sbindir=${sbindir} \
+		    --libexecdir=${libexecdir} \
+		    --datadir=${datadir} \
+		    --sysconfdir=${sysconfdir} \
+		    --sharedstatedir=${sharedstatedir} \
+		    --localstatedir=${localstatedir} \
+		    --libdir=${libdir} \
+		    --includedir=${includedir} \
+		    --oldincludedir=${oldincludedir} \
+		    --infodir=${infodir} \
+		    --mandir=${mandir} \
+		    ${EXTRA_OECONF} \
+		    --with-pic
+
+}
-- 
1.6.1.3

Re: [PATCH 02/70] rpm/rpm-native: Add recipe for 4.4.2.3 (from Poky)

[Tom Rini]

On Wed, Mar 04, 2009 at 04:52:17PM +0100, Marcin Juszkiewicz wrote:

> From: Richard Purdie <richard@openedhand.com>
> 
> git-svn-id: https://svn.o-hand.com/repos/poky@5069 311d38ba-8fff-0310-9ca6-ca027cbcb966
> ---
>  packages/rpm/files/cross_libpaths.patch |  145 +++++++++++++++++++++++++++++++
>  packages/rpm/files/external-tools.patch |  108 +++++++++++++++++++++++
>  packages/rpm/rpm-native_4.4.2.3.bb      |   10 ++
>  packages/rpm/rpm_4.4.2.3.bb             |   84 ++++++++++++++++++

rpm-native's configure depends on 'ed' being on the host.  We don't
currently check for this in sanity.bbclass nor have an ed-native package
which can be added to DEPENDS.

See http://pastebin.com/m1ea52c95, MACHINE=nokia800 (but I also see it
for db1200 and beagleboard and mx31ads) DISTRO=minimal.

-- 
Tom Rini

Re: [PATCH 02/70] rpm/rpm-native: Add recipe for 4.4.2.3 (from Poky)

[Marcin Juszkiewicz]

On Wednesday 04 of March 2009 20:17:51 Tom Rini wrote:

> rpm-native's configure depends on 'ed' being on the host.  We don't
> currently check for this in sanity.bbclass nor have an ed-native
> package which can be added to DEPENDS.

fixed

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

[PATCH 03/70] rpm: Patch out some Makefile strangeness causing build failures (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5085 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/rpm/files/cross_libpaths.patch |   33 +++++++++++++++++++-----------
 packages/rpm/rpm_4.4.2.3.bb             |    2 +-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/packages/rpm/files/cross_libpaths.patch b/packages/rpm/files/cross_libpaths.patch
index 8cc34f2..4fed9b7 100644
--- a/packages/rpm/files/cross_libpaths.patch
+++ b/packages/rpm/files/cross_libpaths.patch
@@ -1,7 +1,7 @@
 Index: rpm-4.4.2.3/configure.ac
 ===================================================================
---- rpm-4.4.2.3.orig/configure.ac	2008-08-17 11:40:29.000000000 +0100
-+++ rpm-4.4.2.3/configure.ac	2008-08-17 11:40:29.000000000 +0100
+--- rpm-4.4.2.3.orig/configure.ac	2008-08-18 10:25:14.000000000 +0100
++++ rpm-4.4.2.3/configure.ac	2008-08-18 10:25:14.000000000 +0100
 @@ -326,10 +326,8 @@
  
  localdone=
@@ -43,7 +43,7 @@ Index: rpm-4.4.2.3/configure.ac
 Index: rpm-4.4.2.3/rpmio/Makefile.am
 ===================================================================
 --- rpm-4.4.2.3.orig/rpmio/Makefile.am	2008-04-01 08:28:22.000000000 +0100
-+++ rpm-4.4.2.3/rpmio/Makefile.am	2008-08-17 11:40:29.000000000 +0100
++++ rpm-4.4.2.3/rpmio/Makefile.am	2008-08-18 10:25:14.000000000 +0100
 @@ -26,8 +26,6 @@
  
  BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs)
@@ -56,7 +56,7 @@ Index: rpm-4.4.2.3/rpmio/Makefile.am
 Index: rpm-4.4.2.3/rpmio/rpmio_internal.h
 ===================================================================
 --- rpm-4.4.2.3.orig/rpmio/rpmio_internal.h	2008-04-01 08:28:22.000000000 +0100
-+++ rpm-4.4.2.3/rpmio/rpmio_internal.h	2008-08-17 11:40:29.000000000 +0100
++++ rpm-4.4.2.3/rpmio/rpmio_internal.h	2008-08-18 10:25:14.000000000 +0100
 @@ -12,22 +12,22 @@
  #if HAVE_BEECRYPT_API_H
  #include <api.h>
@@ -92,8 +92,8 @@ Index: rpm-4.4.2.3/rpmio/rpmio_internal.h
  #include <sha384.h>
 Index: rpm-4.4.2.3/Makefile.am
 ===================================================================
---- rpm-4.4.2.3.orig/Makefile.am	2008-08-17 11:42:36.000000000 +0100
-+++ rpm-4.4.2.3/Makefile.am	2008-08-17 11:42:50.000000000 +0100
+--- rpm-4.4.2.3.orig/Makefile.am	2008-04-01 08:28:21.000000000 +0100
++++ rpm-4.4.2.3/Makefile.am	2008-08-20 08:26:44.000000000 +0100
 @@ -10,7 +10,7 @@
  	po/*.in po/*.po po/rpm.pot \
  	rpm.magic rpmpopt-$(VERSION) rpmqv.c 
@@ -103,10 +103,19 @@ Index: rpm-4.4.2.3/Makefile.am
  
  INCLUDES = \
  	-I$(top_srcdir)/build \
+@@ -93,7 +93,7 @@
+ rpm2cpio_LDFLAGS =	$(myLDFLAGS)
+ rpm2cpio_LDADD =	$(myLDADD) @LIBMISC@
+ 
+-$(PROGRAMS): 		$(myLDADD) @WITH_APIDOCS_TARGET@
++$(PROGRAMS): 		@WITH_APIDOCS_TARGET@
+ 
+ .PHONY:	splint
+ splint:
 Index: rpm-4.4.2.3/rpmdb/Makefile.am
 ===================================================================
---- rpm-4.4.2.3.orig/rpmdb/Makefile.am	2008-08-17 11:43:36.000000000 +0100
-+++ rpm-4.4.2.3/rpmdb/Makefile.am	2008-08-17 11:43:57.000000000 +0100
+--- rpm-4.4.2.3.orig/rpmdb/Makefile.am	2008-04-01 08:28:22.000000000 +0100
++++ rpm-4.4.2.3/rpmdb/Makefile.am	2008-08-18 10:25:14.000000000 +0100
 @@ -41,9 +41,6 @@
  # XXX watchout, ../db3/libdb.la created by this Makefile may surprise
  libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
@@ -119,8 +128,8 @@ Index: rpm-4.4.2.3/rpmdb/Makefile.am
  librpmdb_la_SOURCES = \
 Index: rpm-4.4.2.3/lib/Makefile.am
 ===================================================================
---- rpm-4.4.2.3.orig/lib/Makefile.am	2008-08-17 11:46:43.000000000 +0100
-+++ rpm-4.4.2.3/lib/Makefile.am	2008-08-17 11:46:51.000000000 +0100
+--- rpm-4.4.2.3.orig/lib/Makefile.am	2008-04-01 08:28:22.000000000 +0100
++++ rpm-4.4.2.3/lib/Makefile.am	2008-08-18 10:25:14.000000000 +0100
 @@ -29,8 +29,6 @@
  mylibs = librpm.la
  LIBS =
@@ -132,8 +141,8 @@ Index: rpm-4.4.2.3/lib/Makefile.am
  librpm_la_SOURCES = \
 Index: rpm-4.4.2.3/build/Makefile.am
 ===================================================================
---- rpm-4.4.2.3.orig/build/Makefile.am	2008-08-17 11:47:37.000000000 +0100
-+++ rpm-4.4.2.3/build/Makefile.am	2008-08-17 11:47:43.000000000 +0100
+--- rpm-4.4.2.3.orig/build/Makefile.am	2008-04-01 08:28:21.000000000 +0100
++++ rpm-4.4.2.3/build/Makefile.am	2008-08-18 10:25:14.000000000 +0100
 @@ -22,8 +22,6 @@
  pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h
  noinst_HEADERS = buildio.h
diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
index b04b500..a568ea8 100644
--- a/packages/rpm/rpm_4.4.2.3.bb
+++ b/packages/rpm/rpm_4.4.2.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
 DEPENDS = "zlib beecrypt file popt"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
-- 
1.6.1.3

[PATCH 04/70] rpm: Enable python extensions and improve cross compiling patches (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5093 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/rpm/files/cross_libpaths.patch |  140 +++++++++++++++++++++++++------
 packages/rpm/files/external-tools.patch |    4 +-
 packages/rpm/rpm-native_4.4.2.3.bb      |    3 +-
 packages/rpm/rpm_4.4.2.3.bb             |   18 ++++-
 4 files changed, 133 insertions(+), 32 deletions(-)

diff --git a/packages/rpm/files/cross_libpaths.patch b/packages/rpm/files/cross_libpaths.patch
index 4fed9b7..798db15 100644
--- a/packages/rpm/files/cross_libpaths.patch
+++ b/packages/rpm/files/cross_libpaths.patch
@@ -1,7 +1,7 @@
 Index: rpm-4.4.2.3/configure.ac
 ===================================================================
---- rpm-4.4.2.3.orig/configure.ac	2008-08-18 10:25:14.000000000 +0100
-+++ rpm-4.4.2.3/configure.ac	2008-08-18 10:25:14.000000000 +0100
+--- rpm-4.4.2.3.orig/configure.ac	2008-08-23 16:03:51.000000000 +0100
++++ rpm-4.4.2.3/configure.ac	2008-08-25 16:26:11.000000000 +0100
 @@ -326,10 +326,8 @@
  
  localdone=
@@ -40,23 +40,47 @@ Index: rpm-4.4.2.3/configure.ac
      WITH_NEON_LIB="-lneon"
    ])
  ],[
+@@ -857,6 +856,12 @@
+ dnl
+ dnl Auto-detect which python bindings should be built.
+ dnl
++
++AC_ARG_WITH(python-incdir, [  --with-python-incdir    python include directory ])
++PYTHON_INCDIR=$withval
++AC_ARG_WITH(python-libdir, [  --with-python-libdir    python library directory ])
++PYTHON_LIBDIR=$withval
++
+ withval=auto
+ AC_ARG_WITH(python, [  --with-python           build rpm python bindings ])
+ 
+@@ -934,6 +939,8 @@
+ AC_SUBST(WITH_PYTHON_SUBDIR)
+ AC_SUBST(WITH_PYTHON_SUBPACKAGE)
+ AC_SUBST(WITH_PYTHON_VERSION)
++AC_SUBST(PYTHON_LIBDIR)
++AC_SUBST(PYTHON_INCDIR)
+ 
+ AC_PATH_PROG(__DOXYGEN, doxygen, no, $PATH)
+ dnl
 Index: rpm-4.4.2.3/rpmio/Makefile.am
 ===================================================================
 --- rpm-4.4.2.3.orig/rpmio/Makefile.am	2008-04-01 08:28:22.000000000 +0100
-+++ rpm-4.4.2.3/rpmio/Makefile.am	2008-08-18 10:25:14.000000000 +0100
-@@ -26,8 +26,6 @@
++++ rpm-4.4.2.3/rpmio/Makefile.am	2008-08-23 12:14:12.000000000 +0100
+@@ -26,9 +26,7 @@
  
  BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs)
  
 -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
 -
- usrlibdir = $(libdir)@MARK64@
+-usrlibdir = $(libdir)@MARK64@
++usrlibdir = $(libdir)
  usrlib_LTLIBRARIES = librpmio.la
  librpmio_la_SOURCES = \
+ 	argv.c digest.c fts.c macro.c rpmdav.c \
 Index: rpm-4.4.2.3/rpmio/rpmio_internal.h
 ===================================================================
 --- rpm-4.4.2.3.orig/rpmio/rpmio_internal.h	2008-04-01 08:28:22.000000000 +0100
-+++ rpm-4.4.2.3/rpmio/rpmio_internal.h	2008-08-18 10:25:14.000000000 +0100
++++ rpm-4.4.2.3/rpmio/rpmio_internal.h	2008-08-23 12:07:29.000000000 +0100
 @@ -12,22 +12,22 @@
  #if HAVE_BEECRYPT_API_H
  #include <api.h>
@@ -93,7 +117,7 @@ Index: rpm-4.4.2.3/rpmio/rpmio_internal.h
 Index: rpm-4.4.2.3/Makefile.am
 ===================================================================
 --- rpm-4.4.2.3.orig/Makefile.am	2008-04-01 08:28:21.000000000 +0100
-+++ rpm-4.4.2.3/Makefile.am	2008-08-20 08:26:44.000000000 +0100
++++ rpm-4.4.2.3/Makefile.am	2008-08-23 12:07:29.000000000 +0100
 @@ -10,7 +10,7 @@
  	po/*.in po/*.po po/rpm.pot \
  	rpm.magic rpmpopt-$(VERSION) rpmqv.c 
@@ -103,52 +127,118 @@ Index: rpm-4.4.2.3/Makefile.am
  
  INCLUDES = \
  	-I$(top_srcdir)/build \
-@@ -93,7 +93,7 @@
- rpm2cpio_LDFLAGS =	$(myLDFLAGS)
- rpm2cpio_LDADD =	$(myLDADD) @LIBMISC@
- 
--$(PROGRAMS): 		$(myLDADD) @WITH_APIDOCS_TARGET@
-+$(PROGRAMS): 		@WITH_APIDOCS_TARGET@
- 
- .PHONY:	splint
- splint:
 Index: rpm-4.4.2.3/rpmdb/Makefile.am
 ===================================================================
 --- rpm-4.4.2.3.orig/rpmdb/Makefile.am	2008-04-01 08:28:22.000000000 +0100
-+++ rpm-4.4.2.3/rpmdb/Makefile.am	2008-08-18 10:25:14.000000000 +0100
-@@ -41,9 +41,6 @@
++++ rpm-4.4.2.3/rpmdb/Makefile.am	2008-08-23 12:13:18.000000000 +0100
+@@ -41,10 +41,7 @@
  # XXX watchout, ../db3/libdb.la created by this Makefile may surprise
  libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
  
 -# XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
 -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
 -
- usrlibdir = $(libdir)@MARK64@
+-usrlibdir = $(libdir)@MARK64@
++usrlibdir = $(libdir)
  usrlib_LTLIBRARIES = librpmdb.la
  librpmdb_la_SOURCES = \
+ 	dbconfig.c fprint.c \
 Index: rpm-4.4.2.3/lib/Makefile.am
 ===================================================================
 --- rpm-4.4.2.3.orig/lib/Makefile.am	2008-04-01 08:28:22.000000000 +0100
-+++ rpm-4.4.2.3/lib/Makefile.am	2008-08-18 10:25:14.000000000 +0100
-@@ -29,8 +29,6 @@
++++ rpm-4.4.2.3/lib/Makefile.am	2008-08-23 16:03:51.000000000 +0100
+@@ -29,9 +29,7 @@
  mylibs = librpm.la
  LIBS =
  
 -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
 -
- usrlibdir = $(libdir)@MARK64@
+-usrlibdir = $(libdir)@MARK64@
++usrlibdir = $(libdir)
  usrlib_LTLIBRARIES = librpm.la
  librpm_la_SOURCES = \
+ 	cpio.c depends.c formats.c fs.c fsm.c getdate.c \
 Index: rpm-4.4.2.3/build/Makefile.am
 ===================================================================
 --- rpm-4.4.2.3.orig/build/Makefile.am	2008-04-01 08:28:21.000000000 +0100
-+++ rpm-4.4.2.3/build/Makefile.am	2008-08-18 10:25:14.000000000 +0100
-@@ -22,8 +22,6 @@
++++ rpm-4.4.2.3/build/Makefile.am	2008-08-23 16:03:51.000000000 +0100
+@@ -22,9 +22,7 @@
  pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h
  noinst_HEADERS = buildio.h
  
 -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
 -
- usrlibdir = $(libdir)@MARK64@
+-usrlibdir = $(libdir)@MARK64@
++usrlibdir = $(libdir)
  usrlib_LTLIBRARIES = librpmbuild.la
  librpmbuild_la_SOURCES = \
+ 	build.c expression.c files.c misc.c names.c pack.c \
+Index: rpm-4.4.2.3/python/Makefile.am
+===================================================================
+--- rpm-4.4.2.3.orig/python/Makefile.am	2008-04-01 08:28:22.000000000 +0100
++++ rpm-4.4.2.3/python/Makefile.am	2008-08-25 16:26:56.000000000 +0100
+@@ -4,8 +4,8 @@
+ 
+ LINT = splint
+ 
+-pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@
+-pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@
++pylibdir = @PYTHON_LIBDIR@
++pyincdir = @PYTHON_INCDIR@
+ 
+ SUBDIRS = rpm
+ 
+Index: rpm-4.4.2.3/python/rpm/Makefile.am
+===================================================================
+--- rpm-4.4.2.3.orig/python/rpm/Makefile.am	2008-04-01 08:28:22.000000000 +0100
++++ rpm-4.4.2.3/python/rpm/Makefile.am	2008-08-25 16:27:29.000000000 +0100
+@@ -4,8 +4,8 @@
+ 
+ PYVER = @WITH_PYTHON_VERSION@
+ 
+-pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@
+-pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@
++pylibdir = @PYTHON_LIBDIR@
++pyincdir = @PYTHON_INCDIR@
+ 
+ EXTRA_DIST = \
+ 	__init__.py
+Index: rpm-4.4.2.3/file/src/Makefile.am
+===================================================================
+--- rpm-4.4.2.3.orig/file/src/Makefile.am	2008-08-23 16:06:25.000000000 +0100
++++ rpm-4.4.2.3/file/src/Makefile.am	2008-08-23 16:06:39.000000000 +0100
+@@ -4,7 +4,7 @@
+ EXTRA_DIST = test.c
+ 
+ # XXX Make sure compress.c links internal zlib
+-INCLUDES = -I. -I ../../zlib
++INCLUDES = -I. 
+ 
+ pkglibdir =  @prefix@/lib/rpm
+ MAGIC    = $(pkglibdir)/magic
+@@ -26,7 +26,7 @@
+ 
+ noinst_PROGRAMS = file
+ file_SOURCES = file.c
+-file_LDFLAGS = -L../../zlib # -all-static
++#file_LDFLAGS = -L../../zlib # -all-static
+ file_LDADD = libmagic.la
+ 
+ listobjs:
+Index: rpm-4.4.2.3/file/magic/Makefile.am
+===================================================================
+--- rpm-4.4.2.3.orig/file/magic/Makefile.am	2008-08-25 16:14:47.000000000 +0100
++++ rpm-4.4.2.3/file/magic/Makefile.am	2008-08-25 16:15:02.000000000 +0100
+@@ -18,10 +18,10 @@
+ 	done >> $@
+ 
+ magic.mgc: magic
+-	$(top_builddir)/src/file -C -m magic
++	file -C -m magic
+ 
+ magic.mime.mgc: magic.mime
+-	$(top_builddir)/src/file -C -m $(srcdir)/magic.mime
++	file -C -m $(srcdir)/magic.mime
+ 
+ magic_FRAGMENTS = \
+ Magdir/acorn \
diff --git a/packages/rpm/files/external-tools.patch b/packages/rpm/files/external-tools.patch
index e967b87..2b2ff70 100644
--- a/packages/rpm/files/external-tools.patch
+++ b/packages/rpm/files/external-tools.patch
@@ -7,7 +7,7 @@ Index: rpm-4.4.2.3/configure.ac
  WITH_MAGIC_LIB=
  
 -if test -d file ; then
-+if test -d file_disabled ; then
++if test -d file  ; then
    WITH_RPMFILE=rpmfile
    WITH_MAGIC_SUBDIR=file
    WITH_MAGIC_INCLUDE="-I\${top_srcdir}/${WITH_MAGIC_SUBDIR}/src"
@@ -16,7 +16,7 @@ Index: rpm-4.4.2.3/configure.ac
  dnl export LIBS INCPATH CONFIG_SITE
  
 -AC_CONFIG_SUBDIRS(popt file db3)
-+AC_CONFIG_SUBDIRS(db/dist)
++AC_CONFIG_SUBDIRS(db/dist file)
  
  AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt
  	rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
diff --git a/packages/rpm/rpm-native_4.4.2.3.bb b/packages/rpm/rpm-native_4.4.2.3.bb
index f122a47..517b571 100644
--- a/packages/rpm/rpm-native_4.4.2.3.bb
+++ b/packages/rpm/rpm-native_4.4.2.3.bb
@@ -1,10 +1,9 @@
 require rpm_${PV}.bb
 inherit native
 
-DEPENDS = "beecrypt-native zlib-native file-native popt-native"
+DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native"
 
 PR = "r2"
 
 export sharedstatedir = "${layout_sharedstatedir}"
 export localstatedir = "${layout_localstatedir}"
-
diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
index a568ea8..7edecbc 100644
--- a/packages/rpm/rpm_4.4.2.3.bb
+++ b/packages/rpm/rpm_4.4.2.3.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
-DEPENDS = "zlib beecrypt file popt"
-PR = "r2"
+DEPENDS = "zlib beecrypt file popt python"
+PR = "r3"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
@@ -14,7 +14,9 @@ S = "${WORKDIR}/rpm-${PV}"
 
 acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
 
-EXTRA_OECONF = "--without-python \
+EXTRA_OECONF = "--with-python=${PYTHONVER} \
+		--with-python-incdir=${STAGING_INCDIR}/python${PYTHONVER} \
+		--with-python-libdir=${STAGING_LIBDIR}/python${PYTHONVER} \
 		--without-apidocs \
 		--without-selinux \
 		--without-lua \
@@ -82,3 +84,13 @@ do_configure () {
 		    --with-pic
 
 }
+
+def rpm_python_version(d):
+	import os, bb
+	staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
+	if os.path.exists( "%s/python2.5" % staging_incdir ): return "2.5"
+	if os.path.exists( "%s/python2.4" % staging_incdir ): return "2.4"
+	if os.path.exists( "%s/python2.3" % staging_incdir ): return "2.3"
+	raise "No Python in STAGING_INCDIR. Forgot to build python/python-native?"
+
+PYTHONVER = "${@rpm_python_version(d)}"
-- 
1.6.1.3

[PATCH 05/70] rpm: Tweak patches to remove popt problem (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5103 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/rpm/files/cross_libpaths.patch |   11 ++++++++++-
 packages/rpm/rpm-native_4.4.2.3.bb      |    2 --
 packages/rpm/rpm_4.4.2.3.bb             |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/rpm/files/cross_libpaths.patch b/packages/rpm/files/cross_libpaths.patch
index 798db15..9e8f7dc 100644
--- a/packages/rpm/files/cross_libpaths.patch
+++ b/packages/rpm/files/cross_libpaths.patch
@@ -117,7 +117,7 @@ Index: rpm-4.4.2.3/rpmio/rpmio_internal.h
 Index: rpm-4.4.2.3/Makefile.am
 ===================================================================
 --- rpm-4.4.2.3.orig/Makefile.am	2008-04-01 08:28:21.000000000 +0100
-+++ rpm-4.4.2.3/Makefile.am	2008-08-23 12:07:29.000000000 +0100
++++ rpm-4.4.2.3/Makefile.am	2008-08-25 23:09:40.000000000 +0100
 @@ -10,7 +10,7 @@
  	po/*.in po/*.po po/rpm.pot \
  	rpm.magic rpmpopt-$(VERSION) rpmqv.c 
@@ -127,6 +127,15 @@ Index: rpm-4.4.2.3/Makefile.am
  
  INCLUDES = \
  	-I$(top_srcdir)/build \
+@@ -93,7 +93,7 @@
+ rpm2cpio_LDFLAGS =	$(myLDFLAGS)
+ rpm2cpio_LDADD =	$(myLDADD) @LIBMISC@
+ 
+-$(PROGRAMS): 		$(myLDADD) @WITH_APIDOCS_TARGET@
++$(PROGRAMS): 		@WITH_APIDOCS_TARGET@
+ 
+ .PHONY:	splint
+ splint:
 Index: rpm-4.4.2.3/rpmdb/Makefile.am
 ===================================================================
 --- rpm-4.4.2.3.orig/rpmdb/Makefile.am	2008-04-01 08:28:22.000000000 +0100
diff --git a/packages/rpm/rpm-native_4.4.2.3.bb b/packages/rpm/rpm-native_4.4.2.3.bb
index 517b571..2e949dc 100644
--- a/packages/rpm/rpm-native_4.4.2.3.bb
+++ b/packages/rpm/rpm-native_4.4.2.3.bb
@@ -3,7 +3,5 @@ inherit native
 
 DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native"
 
-PR = "r2"
-
 export sharedstatedir = "${layout_sharedstatedir}"
 export localstatedir = "${layout_localstatedir}"
diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
index 7edecbc..4e868e3 100644
--- a/packages/rpm/rpm_4.4.2.3.bb
+++ b/packages/rpm/rpm_4.4.2.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
 DEPENDS = "zlib beecrypt file popt python"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
-- 
1.6.1.3

[PATCH 06/70] rpm: Add recommends support from suse rpm patches (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5113 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/rpm/files/tagsbackport.patch |   37 ++++
 packages/rpm/files/weakdeps.patch     |  312 +++++++++++++++++++++++++++++++++
 packages/rpm/rpm_4.4.2.3.bb           |    6 +-
 3 files changed, 353 insertions(+), 2 deletions(-)
 create mode 100644 packages/rpm/files/tagsbackport.patch
 create mode 100644 packages/rpm/files/weakdeps.patch

diff --git a/packages/rpm/files/tagsbackport.patch b/packages/rpm/files/tagsbackport.patch
new file mode 100644
index 0000000..a2a3609
--- /dev/null
+++ b/packages/rpm/files/tagsbackport.patch
@@ -0,0 +1,37 @@
+Backported some new tags and sense values.
+
+Index: lib/rpmlib.h
+===================================================================
+--- lib/rpmlib.h.orig	2008-08-26 17:07:12.000000000 +0100
++++ lib/rpmlib.h	2008-08-26 17:22:21.000000000 +0100
+@@ -447,7 +447,19 @@
+     RPMTAG_PRIORITY		= 1162, /* i   extension placeholder */
+     RPMTAG_CVSID		= 1163, /* s */
+ #define	RPMTAG_SVNID	RPMTAG_CVSID	/* s */
++    RPMTAG_BLINKPKGID		= 1164, /* s[] */
++    RPMTAG_BLINKHDRID		= 1165, /* s[] */
++    RPMTAG_BLINKNEVRA		= 1166, /* s[] */
++    RPMTAG_FLINKPKGID		= 1167, /* s[] */
++    RPMTAG_FLINKHDRID		= 1168, /* s[] */
++    RPMTAG_FLINKNEVRA		= 1169, /* s[] */
++    RPMTAG_PACKAGEORIGIN	= 1170, /* s */
+     RPMTAG_TRIGGERPREIN		= 1171, /*!< internal */
++    RPMTAG_BUILDSUGGESTS	= 1172, /*!< internal */
++    RPMTAG_BUILDENHANCES	= 1173, /*!< internal */
++    RPMTAG_SCRIPTSTATES		= 1174, /*!< i scriptlet exit codes */
++    RPMTAG_SCRIPTMETRICS	= 1175, /*!< i scriptlet execution times */
++    RPMTAG_BUILDCPUCLOCK	= 1176, /*!< i */
+ 
+ /*@-enummemuse@*/
+     RPMTAG_FIRSTFREE_TAG	/*!< internal */
+@@ -531,7 +543,9 @@
+ /*@=enummemuse@*/
+     RPMSENSE_KEYRING	= (1 << 26),
+     RPMSENSE_STRONG	= (1 << 27),
+-    RPMSENSE_CONFIG	= (1 << 28)
++    RPMSENSE_CONFIG	= (1 << 28),
++    RPMSENSE_PROBE	= (1 << 29),
++    RPMSENSE_PACKAGE	= (1 << 30)
+ } rpmsenseFlags;
+ 
+ #define	RPMSENSE_SENSEMASK	15	 /* Mask to get senses, ie serial, */
diff --git a/packages/rpm/files/weakdeps.patch b/packages/rpm/files/weakdeps.patch
new file mode 100644
index 0000000..a013b75
--- /dev/null
+++ b/packages/rpm/files/weakdeps.patch
@@ -0,0 +1,312 @@
+Taken from OpenSUSE 11 rpm source file - RP 26/8/08
+
+Add support for weak dependencies:
+
+A) use RPMTAG_SUGGESTS and RPMTAG_ENHANCES to store them.
+
+   This is different to upstream, which uses RPMSENSE_MISSINGOK
+   and RPMTAG_REQUIRES/RPMTAG_PROVIDES instead. I chose different
+   tags because I wanted to be compatible. The point is that
+   applications that don't know about the new MISSINGOK semantics
+   will mis-interpret the provides/requires otherwise, which
+   I deemed to risky.
+
+B) use RPMSENSE_STRONG to support a "strong" version, "Recommends"
+   instead of "Suggests" and "Supplements" instead of "Enhances".
+
+Needs extcond.diff for query operations.
+
+Index: build/parsePreamble.c
+===================================================================
+--- build/parsePreamble.c.orig	2008-04-01 08:28:21.000000000 +0100
++++ build/parsePreamble.c	2008-08-26 16:58:09.000000000 +0100
+@@ -129,6 +129,8 @@
+     { "post",		RPMSENSE_SCRIPT_POST },
+     { "rpmlib",		RPMSENSE_RPMLIB },
+     { "verify",		RPMSENSE_SCRIPT_VERIFY },
++    { "hint",		RPMSENSE_MISSINGOK },
++    { "strong",		RPMSENSE_STRONG },
+     { NULL, 0 }
+ };
+ 
+@@ -140,6 +142,8 @@
+     { "build",		RPMSENSE_SCRIPT_BUILD },
+     { "install",	RPMSENSE_SCRIPT_INSTALL },
+     { "clean",		RPMSENSE_SCRIPT_CLEAN },
++    { "hint",		RPMSENSE_MISSINGOK },
++    { "strong",		RPMSENSE_STRONG },
+     { NULL, 0 }
+ };
+ 
+@@ -692,6 +696,18 @@
+ 	if ((rc = parseRCPOT(spec, pkg, field, tag, 0, tagflags)))
+ 	    return rc;
+ 	break;
++    case RPMTAG_SUGGESTSFLAGS:
++    case RPMTAG_ENHANCESFLAGS:
++    case RPMTAG_BUILDSUGGESTS:
++    case RPMTAG_BUILDENHANCES:
++	tagflags = RPMSENSE_MISSINGOK;
++	if (macro && (!strcmp(macro, "recommends") || !strcmp(macro, "buildrecommends")))
++	    tagflags |= RPMSENSE_STRONG;
++	if (macro && (!strcmp(macro, "supplements") || !strcmp(macro, "buildsupplements")))
++	    tagflags |= RPMSENSE_STRONG;
++	if ((rc = parseRCPOT(spec, pkg, field, tag, 0, tagflags)))
++	    return rc;
++	break;
+     case RPMTAG_EXCLUDEARCH:
+     case RPMTAG_EXCLUSIVEARCH:
+     case RPMTAG_EXCLUDEOS:
+@@ -783,6 +799,14 @@
+     {RPMTAG_DISTTAG,		0, 0, 0, "disttag"},
+     {RPMTAG_CVSID,		0, 0, 0, "cvsid"},
+     {RPMTAG_SVNID,		0, 0, 0, "svnid"},
++    {RPMTAG_SUGGESTSFLAGS,	0, 0, 0, "recommends"},
++    {RPMTAG_SUGGESTSFLAGS,	0, 0, 0, "suggests"},
++    {RPMTAG_ENHANCESFLAGS,	0, 0, 0, "supplements"},
++    {RPMTAG_ENHANCESFLAGS,	0, 0, 0, "enhances"},
++    {RPMTAG_BUILDSUGGESTS,	0, 0, 0, "buildrecommends"},
++    {RPMTAG_BUILDSUGGESTS,	0, 0, 0, "buildsuggests"},
++    {RPMTAG_BUILDENHANCES,	0, 0, 0, "buildsupplements"},
++    {RPMTAG_BUILDENHANCES,	0, 0, 0, "buildenhances"},
+     /*@-nullassign@*/	/* LCL: can't add null annotation */
+     {0, 0, 0, 0, 0}
+     /*@=nullassign@*/
+Index: build/parseReqs.c
+===================================================================
+--- build/parseReqs.c.orig	2008-04-01 08:28:21.000000000 +0100
++++ build/parseReqs.c	2008-08-26 16:58:09.000000000 +0100
+@@ -85,6 +85,14 @@
+ 	tagflags |= RPMSENSE_ANY;
+ 	h = spec->buildRestrictions;
+ 	break;
++    case RPMTAG_SUGGESTSFLAGS:
++    case RPMTAG_ENHANCESFLAGS:
++	h = pkg->header;
++	break;
++    case RPMTAG_BUILDSUGGESTS:
++    case RPMTAG_BUILDENHANCES:
++        h = spec->buildRestrictions;
++        break;
+     default:
+     case RPMTAG_REQUIREFLAGS:
+ 	tagflags |= RPMSENSE_ANY;
+Index: build/reqprov.c
+===================================================================
+--- build/reqprov.c.orig	2008-04-01 08:28:21.000000000 +0100
++++ build/reqprov.c	2008-08-26 16:58:09.000000000 +0100
+@@ -48,6 +48,16 @@
+ 	flagtag = RPMTAG_TRIGGERFLAGS;
+ 	indextag = RPMTAG_TRIGGERINDEX;
+ 	extra = Flags & RPMSENSE_TRIGGER;
++    } else if (tagN == RPMTAG_SUGGESTSFLAGS || tagN == RPMTAG_BUILDSUGGESTS) {
++	nametag = RPMTAG_SUGGESTSNAME;
++	versiontag = RPMTAG_SUGGESTSVERSION;
++	flagtag = RPMTAG_SUGGESTSFLAGS;
++	extra = Flags & _ALL_REQUIRES_MASK;
++    } else if (tagN == RPMTAG_ENHANCESFLAGS || tagN == RPMTAG_BUILDENHANCES) {
++	nametag = RPMTAG_ENHANCESNAME;
++	versiontag = RPMTAG_ENHANCESVERSION;
++	flagtag = RPMTAG_ENHANCESFLAGS;
++	extra = Flags & _ALL_REQUIRES_MASK;
+     } else {
+ 	nametag = RPMTAG_REQUIRENAME;
+ 	versiontag = RPMTAG_REQUIREVERSION;
+Index: build/rpmfc.c
+===================================================================
+--- build/rpmfc.c.orig	2008-04-01 08:28:21.000000000 +0100
++++ build/rpmfc.c	2008-08-26 16:58:09.000000000 +0100
+@@ -1385,6 +1385,12 @@
+   { "Obsoletes",	{ "%{?__find_obsoletes}", NULL, NULL, NULL },
+ 	RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,
+ 	0, -1 },
++  { "Enhances",		{ "%{?__find_enhances}", NULL, NULL, NULL },
++	RPMTAG_ENHANCESNAME, RPMTAG_ENHANCESVERSION, RPMTAG_ENHANCESFLAGS,
++	RPMSENSE_STRONG, RPMSENSE_STRONG },
++  { "Supplements",	{ "%{?__find_supplements}", NULL, NULL, NULL },
++	RPMTAG_ENHANCESNAME, RPMTAG_ENHANCESVERSION, RPMTAG_ENHANCESFLAGS,
++	RPMSENSE_STRONG, 0 },
+   { NULL,		{ NULL, NULL, NULL, NULL },	0, 0, 0, 0, 0 }
+ };
+ 
+@@ -1480,6 +1486,14 @@
+ 	    failnonzero = 0;
+ 	    tagflags = RPMSENSE_FIND_REQUIRES;
+ 	    /*@switchbreak@*/ break;
++	case RPMTAG_ENHANCESFLAGS:
++	    if (!pkg->autoProv)
++		continue;
++	    failnonzero = 0;
++	    tagflags = RPMSENSE_FIND_REQUIRES | RPMSENSE_MISSINGOK;
++	    if (strcmp(dm->msg, "Supplements") == 0)
++		tagflags |= RPMSENSE_STRONG;
++	    /*@switchbreak@*/ break;
+ 	default:
+ 	    continue;
+ 	    /*@notreached@*/ /*@switchbreak@*/ break;
+Index: lib/rpmlib.h
+===================================================================
+--- lib/rpmlib.h.orig	2008-04-01 08:28:22.000000000 +0100
++++ lib/rpmlib.h	2008-08-26 17:00:37.000000000 +0100
+@@ -530,7 +530,7 @@
+     RPMSENSE_TRIGGERPREIN = (1 << 25),	/*!< @todo Implement %triggerprein. */
+ /*@=enummemuse@*/
+     RPMSENSE_KEYRING	= (1 << 26),
+-    RPMSENSE_PATCHES	= (1 << 27),
++    RPMSENSE_STRONG	= (1 << 27),
+     RPMSENSE_CONFIG	= (1 << 28)
+ } rpmsenseFlags;
+ 
+Index: python/rpmmodule.c
+===================================================================
+--- python/rpmmodule.c.orig	2008-04-01 08:28:22.000000000 +0100
++++ python/rpmmodule.c	2008-08-26 16:58:09.000000000 +0100
+@@ -433,7 +433,7 @@
+     REGISTER_ENUM(RPMSENSE_RPMLIB);
+     REGISTER_ENUM(RPMSENSE_TRIGGERPREIN);
+     REGISTER_ENUM(RPMSENSE_KEYRING);
+-    REGISTER_ENUM(RPMSENSE_PATCHES);
++    REGISTER_ENUM(RPMSENSE_STRONG);
+     REGISTER_ENUM(RPMSENSE_CONFIG);
+ 
+     REGISTER_ENUM(RPMTRANS_FLAG_TEST);
+Index: lib/rpmds.c
+===================================================================
+--- lib/rpmds.c.orig	2008-04-01 08:28:22.000000000 +0100
++++ lib/rpmds.c	2008-08-26 16:58:09.000000000 +0100
+@@ -320,6 +320,11 @@
+ 	tagEVR = RPMTAG_TRIGGERVERSION;
+ 	tagF = RPMTAG_TRIGGERFLAGS;
+     } else
++    if (tagN == RPMTAG_ENHANCESNAME) {
++	Type = "Enhances";
++	tagEVR = RPMTAG_ENHANCESVERSION;
++	tagF = RPMTAG_ENHANCESFLAGS;
++    } else
+ 	goto exit;
+ 
+     /*@-branchstate@*/
+Index: rpmpopt.in
+===================================================================
+--- rpmpopt.in.orig	2008-04-01 08:28:22.000000000 +0100
++++ rpmpopt.in	2008-08-26 16:58:09.000000000 +0100
+@@ -68,6 +68,22 @@
+ 	--POPTdesc=$"list capabilities required by package(s)"
+ rpm	alias -R --requires
+ 
++rpm	alias --suggests	--qf \
++  "[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package suggests"
++
++rpm	alias --recommends	--qf \
++  "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package recommends"
++
++rpm	alias --enhances	--qf \
++  "[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package enhances"
++
++rpm	alias --supplements	--qf \
++  "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package supplements"
++
+ rpm	alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\
+ Version     : %-27{VERSION}       Vendor: %{VENDOR}\n\
+ Release     : %-27{RELEASE}   Build Date: %{BUILDTIME:date}\n\
+@@ -351,6 +367,22 @@
+ 	--POPTdesc=$"list capabilities required by package(s)"
+ rpmq	alias -R --requires
+ 
++rpmq	alias --suggests	--qf \
++  "[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package suggests"
++
++rpmq	alias --recommends	--qf \
++  "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package recommends"
++
++rpmq	alias --enhances	--qf \
++  "[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package enhances"
++
++rpmq	alias --supplements	--qf \
++  "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package supplements"
++
+ rpmq	alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\
+ Version     : %-27{VERSION}       Vendor: %{VENDOR}\n\
+ Release     : %-27{RELEASE}   Build Date: %{BUILDTIME:date}\n\
+@@ -452,6 +484,22 @@
+ 	--POPTdesc=$"list capabilities required by package(s)"
+ rpmquery	alias -R --requires
+ 
++rpmquery	alias --suggests	--qf \
++  "[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package suggests"
++
++rpmquery	alias --recommends	--qf \
++  "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package recommends"
++
++rpmquery	alias --enhances	--qf \
++  "[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package enhances"
++
++rpmquery	alias --supplements	--qf \
++  "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" \
++	--POPTdesc=$"list capabilities this package supplements"
++
+ rpmquery	alias --info --qf 'Name        : %-27{NAME}  Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\
+ Version     : %-27{VERSION}       Vendor: %{VENDOR}\n\
+ Release     : %-27{RELEASE}   Build Date: %{BUILDTIME:date}\n\
+Index: lib/formats.c
+===================================================================
+--- lib/formats.c.orig	2008-04-01 08:28:22.000000000 +0100
++++ lib/formats.c	2008-08-26 16:58:09.000000000 +0100
+@@ -543,6 +543,38 @@
+     return val;
+ }
+ 
++static /*@only@*/ char * depflag_strongFormat(int_32 type, const void * data,
++		char * formatPrefix, int padding, /*@unused@*/ int element)
++	/*@modifies formatPrefix @*/
++	/*@requires maxRead(data) >= 0 @*/
++{
++    char * val;
++    char buf[10];
++    int anint;
++
++    if (type != RPM_INT32_TYPE) {
++	val = xstrdup(_("(not a number)"));
++    } else {
++	anint = *((int_32 *) data);
++	buf[0] = '\0';
++
++/*@-boundswrite@*/
++	if (anint & RPMSENSE_STRONG)
++	    strcat(buf, "strong");
++/*@=boundswrite@*/
++
++	val = xmalloc(7 + padding);
++/*@-boundswrite@*/
++	strcat(formatPrefix, "s");
++/*@=boundswrite@*/
++	/*@-formatconst@*/
++	sprintf(val, formatPrefix, buf);
++	/*@=formatconst@*/
++    }
++
++    return val;
++}
++
+ /**
+  * Retrieve mounted file system paths.
+  * @param h		header
+@@ -1171,6 +1203,7 @@
+     { HEADER_EXT_FORMAT, "base64",		{ base64Format } },
+     { HEADER_EXT_FORMAT, "pgpsig",		{ pgpsigFormat } },
+     { HEADER_EXT_FORMAT, "depflags",		{ depflagsFormat } },
++    { HEADER_EXT_FORMAT, "depflag_strong",	{ depflag_strongFormat } },
+     { HEADER_EXT_FORMAT, "fflags",		{ fflagsFormat } },
+     { HEADER_EXT_FORMAT, "perms",		{ permsFormat } },
+     { HEADER_EXT_FORMAT, "permissions",		{ permsFormat } },
diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
index 4e868e3..1a6e01a 100644
--- a/packages/rpm/rpm_4.4.2.3.bb
+++ b/packages/rpm/rpm_4.4.2.3.bb
@@ -2,11 +2,13 @@ DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
 DEPENDS = "zlib beecrypt file popt python"
-PR = "r4"
+PR = "r6"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
-	   file://cross_libpaths.patch;patch=1"
+	   file://cross_libpaths.patch;patch=1 \
+	   file://weakdeps.patch;patch=1;pnum=0 \
+	   file://tagsbackport.patch;patch=1;pnum=0"
 
 inherit autotools gettext
 
-- 
1.6.1.3

[PATCH 07/70] rpm-native: Set varprefix to get the rpm database in a sane location (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5132 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/rpm/rpm-native_4.4.2.3.bb |    2 +-
 packages/rpm/rpm_4.4.2.3.bb        |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/rpm/rpm-native_4.4.2.3.bb b/packages/rpm/rpm-native_4.4.2.3.bb
index 2e949dc..5ed737e 100644
--- a/packages/rpm/rpm-native_4.4.2.3.bb
+++ b/packages/rpm/rpm-native_4.4.2.3.bb
@@ -3,5 +3,5 @@ inherit native
 
 DEPENDS = "beecrypt-native zlib-native file-native popt-native python-native"
 
-export sharedstatedir = "${layout_sharedstatedir}"
 export localstatedir = "${layout_localstatedir}"
+export varprefix = "${layout_localstatedir}"
diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
index 1a6e01a..6718042 100644
--- a/packages/rpm/rpm_4.4.2.3.bb
+++ b/packages/rpm/rpm_4.4.2.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
 DEPENDS = "zlib beecrypt file popt python"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
@@ -36,6 +36,8 @@ MUTEX_arm = "${ARM_MUTEX}"
 MUTEX_armeb = "${ARM_MUTEX}"
 EXTRA_OECONF += "${MUTEX}"
 
+export varprefix = "${localstatedir}"
+
 do_configure () {
 	rm ${S}/popt/ -Rf
 	rm ${S}/db/dist/configure.in -f
-- 
1.6.1.3

[PATCH 08/70] rpm: Handle PYTHONVER differently in EXTRA_OECONF to stop gettext/uclibc failures during parsing (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5152 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/rpm/rpm_4.4.2.3.bb |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
index 6718042..ef60878 100644
--- a/packages/rpm/rpm_4.4.2.3.bb
+++ b/packages/rpm/rpm_4.4.2.3.bb
@@ -2,13 +2,15 @@ DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
 DEPENDS = "zlib beecrypt file popt python"
-PR = "r7"
+PR = "r9"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
 	   file://cross_libpaths.patch;patch=1 \
 	   file://weakdeps.patch;patch=1;pnum=0 \
-	   file://tagsbackport.patch;patch=1;pnum=0"
+	   file://tagsbackport.patch;patch=1;pnum=0 \
+	   file://missingok.patch;patch=1;pnum=0 \
+	   file://extcond.patch;patch=1;pnum=0"
 
 inherit autotools gettext
 
@@ -16,9 +18,9 @@ S = "${WORKDIR}/rpm-${PV}"
 
 acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
 
-EXTRA_OECONF = "--with-python=${PYTHONVER} \
-		--with-python-incdir=${STAGING_INCDIR}/python${PYTHONVER} \
-		--with-python-libdir=${STAGING_LIBDIR}/python${PYTHONVER} \
+EXTRA_OECONF = "--with-python=$PYTHONVER \
+		--with-python-incdir=${STAGING_INCDIR}/python$PYTHONVER \
+		--with-python-libdir=${STAGING_LIBDIR}/python$PYTHONVER \
 		--without-apidocs \
 		--without-selinux \
 		--without-lua \
@@ -97,4 +99,6 @@ def rpm_python_version(d):
 	if os.path.exists( "%s/python2.3" % staging_incdir ): return "2.3"
 	raise "No Python in STAGING_INCDIR. Forgot to build python/python-native?"
 
-PYTHONVER = "${@rpm_python_version(d)}"
+# Use a shell variable here since otherwise gettext trys to expand this at 
+# parse time when it manipulates EXTRA_OECONF which fails
+export PYTHONVER = "${@rpm_python_version(d)}"
-- 
1.6.1.3

Re: [PATCH 08/70] rpm: Handle PYTHONVER differently in EXTRA_OECONF to stop gettext/uclibc failures during parsing (from Poky)

[Michael 'Mickey' Lauer]

Am Mittwoch, den 04.03.2009, 16:52 +0100 schrieb Marcin Juszkiewicz:
> From: Richard Purdie <richard@openedhand.com>
> 
> git-svn-id: https://svn.o-hand.com/repos/poky@5152 311d38ba-8fff-0310-9ca6-ca027cbcb966
> ---
>  packages/rpm/rpm_4.4.2.3.bb |   16 ++++++++++------
>  1 files changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
> index 6718042..ef60878 100644
> --- a/packages/rpm/rpm_4.4.2.3.bb
> +++ b/packages/rpm/rpm_4.4.2.3.bb
> @@ -2,13 +2,15 @@ DESCRIPTION = "The RPM Package Manager."
>  HOMEPAGE = "http://rpm.org/"
>  LICENSE = "LGPL GPL"
>  DEPENDS = "zlib beecrypt file popt python"
> -PR = "r7"
> +PR = "r9"
>  
>  SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
>             file://external-tools.patch;patch=1 \
>  	   file://cross_libpaths.patch;patch=1 \
>  	   file://weakdeps.patch;patch=1;pnum=0 \
> -	   file://tagsbackport.patch;patch=1;pnum=0"
> +	   file://tagsbackport.patch;patch=1;pnum=0 \
> +	   file://missingok.patch;patch=1;pnum=0 \
> +	   file://extcond.patch;patch=1;pnum=0"
>  
>  inherit autotools gettext
>  
> @@ -16,9 +18,9 @@ S = "${WORKDIR}/rpm-${PV}"
>  
>  acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
>  
> -EXTRA_OECONF = "--with-python=${PYTHONVER} \
> -		--with-python-incdir=${STAGING_INCDIR}/python${PYTHONVER} \
> -		--with-python-libdir=${STAGING_LIBDIR}/python${PYTHONVER} \
> +EXTRA_OECONF = "--with-python=$PYTHONVER \
> +		--with-python-incdir=${STAGING_INCDIR}/python$PYTHONVER \
> +		--with-python-libdir=${STAGING_LIBDIR}/python$PYTHONVER \
>  		--without-apidocs \
>  		--without-selinux \
>  		--without-lua \
> @@ -97,4 +99,6 @@ def rpm_python_version(d):
>  	if os.path.exists( "%s/python2.3" % staging_incdir ): return "2.3"
>  	raise "No Python in STAGING_INCDIR. Forgot to build python/python-native?"
>  
> -PYTHONVER = "${@rpm_python_version(d)}"
> +# Use a shell variable here since otherwise gettext trys to expand this at 
> +# parse time when it manipulates EXTRA_OECONF which fails
> +export PYTHONVER = "${@rpm_python_version(d)}"

No. Better inherit distutils_base and use its PYTHON_DIR here.

-- 
:M:

Re: [PATCH 08/70] rpm: Handle PYTHONVER differently in EXTRA_OECONF to stop gettext/uclibc failures during parsing (from Poky)

[Marcin Juszkiewicz]

On Wednesday 04 of March 2009 18:11:46 Michael 'Mickey' Lauer wrote:
>>  packages/rpm/rpm_4.4.2.3.bb |   16 ++++++++++------

> No. Better inherit distutils_base and use its PYTHON_DIR here.

done

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

[PATCH 09/70] rpm: Add missing patches (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5154 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/rpm/files/extcond.patch   |   78 ++++++++++++++++++++++++++++++++++++
 packages/rpm/files/missingok.patch |   44 ++++++++++++++++++++
 2 files changed, 122 insertions(+), 0 deletions(-)
 create mode 100644 packages/rpm/files/extcond.patch
 create mode 100644 packages/rpm/files/missingok.patch

diff --git a/packages/rpm/files/extcond.patch b/packages/rpm/files/extcond.patch
new file mode 100644
index 0000000..6963b86
--- /dev/null
+++ b/packages/rpm/files/extcond.patch
@@ -0,0 +1,78 @@
+This patch supports an extension in the condition evaluation.
+If the condition is a format and returns an nonempty string, it is
+assumed to be true.
+This mechanism is used by the weakdeps patch to filter the
+"RPMSENSE_STRONG" flag.
+
+--- ./rpmdb/header.c.orig	2005-06-06 23:33:54.000000000 +0000
++++ ./rpmdb/header.c	2006-03-17 18:08:02.000000000 +0000
+@@ -2980,8 +2980,12 @@ static int parseExpression(headerSprintf
+ 
+     *endPtr = chptr;
+ 
++    token->u.cond.tag.type = NULL;
++    token->u.cond.tag.format = "";
+     token->type = PTOK_COND;
+ 
++    if ((token->u.cond.tag.type = strchr(str, ':')) != 0)
++	*token->u.cond.tag.type++ = 0;
+     (void) findTag(hsa, token, str);
+ 
+     return 0;
+@@ -3239,6 +3243,7 @@ static char * singleSprintf(headerSprint
+     int_32 type;
+     int_32 count;
+     sprintfToken spft;
++    sprintfTag stag;
+     int condNumFormats;
+     size_t need;
+ 
+@@ -3270,6 +3275,18 @@ static char * singleSprintf(headerSprint
+ 	if (token->u.cond.tag.ext || headerIsEntry(hsa->h, token->u.cond.tag.tag)) {
+ 	    spft = token->u.cond.ifFormat;
+ 	    condNumFormats = token->u.cond.numIfTokens;
++	    if (token->u.cond.tag.fmt) {
++		/* check if format creates output */
++		size_t vallen = hsa->vallen;
++		formatValue(hsa, &token->u.cond.tag, element);
++		if (hsa->vallen == vallen) {
++		    spft = token->u.cond.elseFormat;
++		    condNumFormats = token->u.cond.numElseTokens;
++		} else {
++		    hsa->vallen = vallen;
++		    hsa->val[hsa->vallen] = 0;
++		}
++	    }
+ 	} else {
+ 	    spft = token->u.cond.elseFormat;
+ 	    condNumFormats = token->u.cond.numElseTokens;
+@@ -3291,19 +3308,22 @@ static char * singleSprintf(headerSprint
+ 	spft = token->u.array.format;
+ 	for (i = 0; i < token->u.array.numTokens; i++, spft++)
+ 	{
+-	    if (spft->type != PTOK_TAG ||
+-		spft->u.tag.arrayCount ||
+-		spft->u.tag.justOne) continue;
++	    if (spft->type != PTOK_TAG && spft->type != PTOK_COND)
++		continue;
++
++	    stag = (spft->type == PTOK_COND ? &spft->u.cond.tag : &spft->u.tag);
++	    if (stag->arrayCount || stag->justOne)
++		continue;
+ 
+-	    if (spft->u.tag.ext) {
++	    if (stag->ext) {
+ /*@-boundswrite@*/
+-		if (getExtension(hsa, spft->u.tag.ext, &type, NULL, &count, 
+-				 hsa->ec + spft->u.tag.extNum))
++		if (getExtension(hsa, stag->ext, &type, NULL, &count, 
++				 hsa->ec + stag->extNum))
+ 		     continue;
+ /*@=boundswrite@*/
+ 	    } else {
+ /*@-boundswrite@*/
+-		if (!headerGetEntry(hsa->h, spft->u.tag.tag, &type, NULL, &count))
++		if (!headerGetEntry(hsa->h, stag->tag, &type, NULL, &count))
+ 		    continue;
+ /*@=boundswrite@*/
+ 	    } 
diff --git a/packages/rpm/files/missingok.patch b/packages/rpm/files/missingok.patch
new file mode 100644
index 0000000..b008c9a
--- /dev/null
+++ b/packages/rpm/files/missingok.patch
@@ -0,0 +1,44 @@
+Obey MISSINGOK flag for dependencies. Backport from rpm-4.4.7.
+
+Index: lib/depends.c
+===================================================================
+--- lib/depends.c.orig	2008-04-01 08:28:22.000000000 +0100
++++ lib/depends.c	2008-09-04 14:09:58.000000000 +0100
+@@ -593,8 +593,13 @@
+ /*@=boundsread@*/
+ 
+ unsatisfied:
+-    rc = 1;	/* dependency is unsatisfied */
+-    rpmdsNotify(dep, NULL, rc);
++    if (rpmdsFlags(dep) & RPMSENSE_MISSINGOK) {
++	rc = 0; /* dependency is unsatisfied, but just a hint. */
++	rpmdsNotify(dep, _("(hint skipped)"), rc);
++    } else {
++	rc = 1;	/* dependency is unsatisfied */
++	rpmdsNotify(dep, NULL, rc);
++    }
+ 
+ exit:
+     /*
+@@ -963,6 +968,8 @@
+ 	return "Requires(postun):";
+     if (f & RPMSENSE_SCRIPT_VERIFY)
+ 	return "Requires(verify):";
++    if (f & RPMSENSE_MISSINGOK)
++	return "Requires(hint):";
+     if (f & RPMSENSE_FIND_REQUIRES)
+ 	return "Requires(auto):";
+     return "Requires:";
+Index: lib/rpmlib.h
+===================================================================
+--- lib/rpmlib.h.orig	2008-09-03 22:22:43.000000000 +0100
++++ lib/rpmlib.h	2008-09-04 15:17:17.000000000 +0100
+@@ -562,6 +562,8 @@
+     RPMSENSE_SCRIPT_POSTUN | \
+     RPMSENSE_SCRIPT_VERIFY | \
+     RPMSENSE_FIND_REQUIRES | \
++    RPMSENSE_MISSINGOK | \
++    RPMSENSE_STRONG | \
+     RPMSENSE_SCRIPT_PREP | \
+     RPMSENSE_SCRIPT_BUILD | \
+     RPMSENSE_SCRIPT_INSTALL | \
-- 
1.6.1.3

[PATCH 10/70] rpm: Add python module packaging (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5423 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/rpm/rpm_4.4.2.3.bb |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
index ef60878..3083387 100644
--- a/packages/rpm/rpm_4.4.2.3.bb
+++ b/packages/rpm/rpm_4.4.2.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager."
 HOMEPAGE = "http://rpm.org/"
 LICENSE = "LGPL GPL"
 DEPENDS = "zlib beecrypt file popt python"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
            file://external-tools.patch;patch=1 \
@@ -20,13 +20,16 @@ acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
 
 EXTRA_OECONF = "--with-python=$PYTHONVER \
 		--with-python-incdir=${STAGING_INCDIR}/python$PYTHONVER \
-		--with-python-libdir=${STAGING_LIBDIR}/python$PYTHONVER \
+		--with-python-libdir=${libdir}/python$PYTHONVER \
 		--without-apidocs \
 		--without-selinux \
 		--without-lua \
 		--without-dmalloc \
 		--without-efence"
 
+PACKAGES += "python-rpm"
+FILES_python-rpm = "${libdir}/python*/site-packages/rpm/_*"
+
 # Handle the db MUTEX settings here, the POSIX library is
 # the default - "POSIX/pthreads/library".
 # Don't ignore the nice SWP instruction on the ARM:
-- 
1.6.1.3

[PATCH 11/70] beecrypt: get patch from Poky to fix building on 64bit machines

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5068 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/beecrypt/beecrypt_3.1.0.bb  |   16 ++++------------
 packages/beecrypt/files/x64fix.patch |   20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 packages/beecrypt/files/x64fix.patch

diff --git a/packages/beecrypt/beecrypt_3.1.0.bb b/packages/beecrypt/beecrypt_3.1.0.bb
index f9a45e7..720d99a 100644
--- a/packages/beecrypt/beecrypt_3.1.0.bb
+++ b/packages/beecrypt/beecrypt_3.1.0.bb
@@ -4,9 +4,10 @@
 
 DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
-SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz"
+SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
+         file://x64fix.patch;patch=1"
 
-PR = "r2"
+PR = "r3"
 
 inherit autotools
 acpaths=""
@@ -14,15 +15,6 @@ acpaths=""
 EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static"
 
 do_stage() {
-
-#	oe_libinstall  -a  -C .libs libbeecrypt  ${STAGING_LIBDIR}
-	cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/
-	install -d ${STAGING_INCDIR}/beecrypt
-	for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h
-	do
-		install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X}
-	done
-
+    autotools_stage_all
 }
 
diff --git a/packages/beecrypt/files/x64fix.patch b/packages/beecrypt/files/x64fix.patch
new file mode 100644
index 0000000..9ee75c1
--- /dev/null
+++ b/packages/beecrypt/files/x64fix.patch
@@ -0,0 +1,20 @@
+Index: beecrypt-3.1.0/configure.ac
+===================================================================
+--- beecrypt-3.1.0.orig/configure.ac	2008-08-16 12:08:02.000000000 +0100
++++ beecrypt-3.1.0/configure.ac	2008-08-16 12:08:26.000000000 +0100
+@@ -754,15 +754,6 @@
+ 
+ # Check where to install the libraries
+ bc_libalt=
+-case $target_os in
+-linux*)
+-  case $bc_target_arch in
+-  alpha* | powerpc64 | s390x | x86_64)
+-    bc_libalt="64"
+-    ;;
+-  esac
+-  ;;
+-esac
+ AC_SUBST(LIBALT,$bc_libalt)
+ 
+ # Generate output files.
-- 
1.6.1.3

[PATCH 12/70] Drop pointless rpm_core class. (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

---
 classes/rpm_core.bbclass |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)
 delete mode 100644 classes/rpm_core.bbclass

diff --git a/classes/rpm_core.bbclass b/classes/rpm_core.bbclass
deleted file mode 100644
index f28abbb..0000000
--- a/classes/rpm_core.bbclass
+++ /dev/null
@@ -1,16 +0,0 @@
-RPMBUILDPATH="${WORKDIR}/rpm"
-
-RPMOPTS="--rcfile=${WORKDIR}/rpmrc"
-RPMOPTS="--rcfile=${WORKDIR}/rpmrc --target ${TARGET_SYS}"
-RPM="rpm ${RPMOPTS}"
-RPMBUILD="rpmbuild --buildroot ${D} --short-circuit ${RPMOPTS}"
-
-rpm_core_do_preprpm() {
-	mkdir -p ${RPMBUILDPATH}/{SPECS,RPMS/{i386,i586,i686,noarch,ppc,mips,mipsel,arm},SRPMS,SOURCES,BUILD}
-	echo 'macrofiles:/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
-	echo '%_topdir ${RPMBUILDPATH}' > ${WORKDIR}/macros
-	echo '%_repackage_dir ${WORKDIR}' >> ${WORKDIR}/macros
-}
-
-EXPORT_FUNCTIONS do_preprpm
-addtask preprpm before do_fetch
-- 
1.6.1.3

[PATCH 13/70] Add python-urlgrabber, python-iniparser, yum-metadata-parser and native varients (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5097 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/python/python-iniparse-native_0.2.3.bb    |    9 +++++++++
 packages/python/python-iniparse_0.2.3.bb           |   11 +++++++++++
 packages/python/python-urlgrabber-native_3.1.0.bb  |    9 +++++++++
 packages/python/python-urlgrabber_3.1.0.bb         |   11 +++++++++++
 .../python/yum-metadata-parser-native_1.1.2.bb     |   11 +++++++++++
 packages/python/yum-metadata-parser_1.1.2.bb       |   13 +++++++++++++
 6 files changed, 64 insertions(+), 0 deletions(-)
 create mode 100644 packages/python/python-iniparse-native_0.2.3.bb
 create mode 100644 packages/python/python-iniparse_0.2.3.bb
 create mode 100644 packages/python/python-urlgrabber-native_3.1.0.bb
 create mode 100644 packages/python/python-urlgrabber_3.1.0.bb
 create mode 100644 packages/python/yum-metadata-parser-native_1.1.2.bb
 create mode 100644 packages/python/yum-metadata-parser_1.1.2.bb

diff --git a/packages/python/python-iniparse-native_0.2.3.bb b/packages/python/python-iniparse-native_0.2.3.bb
new file mode 100644
index 0000000..ab799db
--- /dev/null
+++ b/packages/python/python-iniparse-native_0.2.3.bb
@@ -0,0 +1,9 @@
+require python-iniparse_${PV}.bb
+inherit native
+DEPENDS = "python-native"
+RDEPENDS = ""
+
+do_stage() {
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
+}
diff --git a/packages/python/python-iniparse_0.2.3.bb b/packages/python/python-iniparse_0.2.3.bb
new file mode 100644
index 0000000..27a38f4
--- /dev/null
+++ b/packages/python/python-iniparse_0.2.3.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "iniparse is a INI parser for Python"
+HOMEPAGE = "http://code.google.com/p/iniparse/"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://iniparse.googlecode.com/files/iniparse-${PV}.tar.gz"
+S = "${WORKDIR}/iniparse-${PV}"
+
+inherit distutils
diff --git a/packages/python/python-urlgrabber-native_3.1.0.bb b/packages/python/python-urlgrabber-native_3.1.0.bb
new file mode 100644
index 0000000..01aebee
--- /dev/null
+++ b/packages/python/python-urlgrabber-native_3.1.0.bb
@@ -0,0 +1,9 @@
+require python-urlgrabber_${PV}.bb
+inherit native
+DEPENDS = "python-native"
+RDEPENDS = ""
+
+do_stage() {
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
+}
diff --git a/packages/python/python-urlgrabber_3.1.0.bb b/packages/python/python-urlgrabber_3.1.0.bb
new file mode 100644
index 0000000..a8ccf8a
--- /dev/null
+++ b/packages/python/python-urlgrabber_3.1.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "urlgrabber is a pure python package that drastically simplifies the fetching of files."
+HOMEPAGE = "http://linux.duke.edu/projects/urlgrabber/"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://linux.duke.edu/projects/urlgrabber/download/urlgrabber-${PV}.tar.gz"
+S = "${WORKDIR}/urlgrabber-${PV}"
+
+inherit distutils
diff --git a/packages/python/yum-metadata-parser-native_1.1.2.bb b/packages/python/yum-metadata-parser-native_1.1.2.bb
new file mode 100644
index 0000000..4e4ab9f
--- /dev/null
+++ b/packages/python/yum-metadata-parser-native_1.1.2.bb
@@ -0,0 +1,11 @@
+require yum-metadata-parser_${PV}.bb
+inherit native
+DEPENDS = "python-native sqlite3-native"
+RDEPENDS = ""
+
+#BUILD_CFLAGS += "-I${STAGING_LIBDIR}/glib-2.0"
+
+do_stage() {
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
+}
diff --git a/packages/python/yum-metadata-parser_1.1.2.bb b/packages/python/yum-metadata-parser_1.1.2.bb
new file mode 100644
index 0000000..0f9ed80
--- /dev/null
+++ b/packages/python/yum-metadata-parser_1.1.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "C-based metadata parser to quickly parse xml metadata into sqlite databases."
+HOMEPAGE = "http://linux.duke.edu/projects/yum/download.ptml"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://linux.duke.edu/projects/yum/download/yum-metadata-parser/yum-metadata-parser-${PV}.tar.gz"
+S = "${WORKDIR}/yum-metadata-parser-${PV}"
+
+TARGET_CFLAGS += "-I${STAGING_LIBDIR}/glib-2.0"
+
+inherit distutils
-- 
1.6.1.3

Re: [PATCH 13/70] Add python-urlgrabber, python-iniparser, yum-metadata-parser and native varients (from Poky)

[Michael 'Mickey' Lauer]

Better use distutils_stage_headers or distutils_stage_all here, if they
do the job.

-- 
:M:

Re: [PATCH 13/70] Add python-urlgrabber, python-iniparser, yum-metadata-parser and native varients (from Poky)

[Marcin Juszkiewicz]

On Wednesday 04 of March 2009 18:14:07 Michael 'Mickey' Lauer wrote:

> Better use distutils_stage_headers or distutils_stage_all here, if
> they do the job.

This would need to wait then as I am not so Python expert to check it 
properly.

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

[PATCH 14/70] Add yum-native and createrepo (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5098 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/createrepo-native/pathfix.patch |   81 ++++++++++++++++++++++++++
 packages/yum/createrepo-native_0.9.bb        |   13 ++++
 packages/yum/yum-native_3.2.18.bb            |   14 +++++
 3 files changed, 108 insertions(+), 0 deletions(-)
 create mode 100644 packages/yum/createrepo-native/pathfix.patch
 create mode 100644 packages/yum/createrepo-native_0.9.bb
 create mode 100644 packages/yum/yum-native_3.2.18.bb

diff --git a/packages/yum/createrepo-native/pathfix.patch b/packages/yum/createrepo-native/pathfix.patch
new file mode 100644
index 0000000..a09a51c
--- /dev/null
+++ b/packages/yum/createrepo-native/pathfix.patch
@@ -0,0 +1,81 @@
+Index: createrepo-0.9/Makefile
+===================================================================
+--- createrepo-0.9.orig/Makefile	2008-08-23 17:49:24.000000000 +0100
++++ createrepo-0.9/Makefile	2008-08-23 17:52:01.000000000 +0100
+@@ -10,22 +10,6 @@
+ SHELL = /bin/sh
+ top_srcdir = .
+ srcdir = .
+-prefix = /usr
+-exec_prefix = ${prefix}
+-
+-bindir = ${exec_prefix}/bin
+-sbindir = ${exec_prefix}/sbin
+-libexecdir = ${exec_prefix}/libexec
+-datadir = ${prefix}/share
+-sysconfdir = ${prefix}/etc
+-sharedstatedir = ${prefix}/com
+-localstatedir = ${prefix}/var
+-libdir = ${exec_prefix}/lib
+-infodir = ${prefix}/info
+-docdir = 
+-includedir = ${prefix}/include
+-oldincludedir = /usr/include
+-mandir = ${prefix}/share/man
+ 
+ pkgdatadir = $(datadir)/$(PKGNAME)
+ pkglibdir = $(libdir)/$(PKGNAME)
+Index: createrepo-0.9/bin/Makefile
+===================================================================
+--- createrepo-0.9.orig/bin/Makefile	2008-08-23 17:50:13.000000000 +0100
++++ createrepo-0.9/bin/Makefile	2008-08-23 17:50:23.000000000 +0100
+@@ -1,22 +1,6 @@
+ SHELL = /bin/sh
+ top_srcdir = ..
+ srcdir = ../bin
+-prefix = /usr
+-exec_prefix = ${prefix}
+-
+-bindir = ${exec_prefix}/bin
+-sbindir = ${exec_prefix}/sbin
+-libexecdir = ${exec_prefix}/libexec
+-datadir = ${prefix}/share
+-sysconfdir = ${prefix}/etc
+-sharedstatedir = ${prefix}/com
+-localstatedir = ${prefix}/var
+-libdir = ${exec_prefix}/lib
+-infodir = ${prefix}/info
+-docdir = 
+-includedir = ${prefix}/include
+-oldincludedir = /usr/include
+-mandir = ${prefix}/man
+ 
+ pkgdatadir = $(datadir)/$(PKGNAME)
+ pkglibdir = $(libdir)/$(PKGNAME)
+Index: createrepo-0.9/docs/Makefile
+===================================================================
+--- createrepo-0.9.orig/docs/Makefile	2008-08-23 17:52:42.000000000 +0100
++++ createrepo-0.9/docs/Makefile	2008-08-23 17:52:50.000000000 +0100
+@@ -1,22 +1,6 @@
+ SHELL = /bin/sh
+ top_srcdir = ..
+ srcdir = ../docs
+-prefix = /usr
+-exec_prefix = ${prefix}
+-
+-bindir = ${exec_prefix}/bin
+-sbindir = ${exec_prefix}/sbin
+-libexecdir = ${exec_prefix}/libexec
+-datadir = ${prefix}/share
+-sysconfdir = ${prefix}/etc
+-sharedstatedir = ${prefix}/com
+-localstatedir = ${prefix}/var
+-libdir = ${exec_prefix}/lib
+-infodir = ${prefix}/info
+-docdir = 
+-includedir = ${prefix}/include
+-oldincludedir = /usr/include
+-mandir = ${datadir}/man
+ 
+ pkgdatadir = $(datadir)/$(PKGNAME)
+ pkglibdir = $(libdir)/$(PKGNAME)
diff --git a/packages/yum/createrepo-native_0.9.bb b/packages/yum/createrepo-native_0.9.bb
new file mode 100644
index 0000000..e682667
--- /dev/null
+++ b/packages/yum/createrepo-native_0.9.bb
@@ -0,0 +1,13 @@
+SRC_URI = "http://linux.duke.edu/projects/metadata/generate/createrepo-${PV}.tar.gz \
+           file://pathfix.patch;patch=1 "
+
+inherit autotools native
+
+S = "${WORKDIR}/createrepo-${PV}"
+
+do_compile_append () {
+	sed -e 's#exec /usr/share#exec ${datadir}#' -i ${S}/bin/createrepo
+	sed -e 's#exec /usr/share#exec ${datadir}#' -i ${S}/bin/modifyrepo
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -i ${S}/genpkgmetadata.py
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -i ${S}/modifyrepo.py
+}
diff --git a/packages/yum/yum-native_3.2.18.bb b/packages/yum/yum-native_3.2.18.bb
new file mode 100644
index 0000000..6657c52
--- /dev/null
+++ b/packages/yum/yum-native_3.2.18.bb
@@ -0,0 +1,14 @@
+HOMEPAGE = "http://linux.duke.edu/projects/yum/"
+
+SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz"
+
+DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native"
+
+S = "${WORKDIR}/yum-${PV}"
+
+inherit autotools native
+
+do_compile_append () {
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum.py
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum-updatesd.py
+}
-- 
1.6.1.3

Re: [PATCH 14/70] Add yum-native and createrepo (from Poky)

[Tom Rini]

On Wed, Mar 04, 2009 at 04:52:29PM +0100, Marcin Juszkiewicz wrote:

> From: Richard Purdie <richard@openedhand.com>
> 
> git-svn-id: https://svn.o-hand.com/repos/poky@5098 311d38ba-8fff-0310-9ca6-ca027cbcb966
[snip]
> --- /dev/null
> +++ b/packages/yum/createrepo-native_0.9.bb
> @@ -0,0 +1,13 @@
> +SRC_URI = "http://linux.duke.edu/projects/metadata/generate/createrepo-${PV}.tar.gz \

404.  This is now:
http://createrepo.baseurl.org/download/createrepo-${PV}.tar.gz

Also, 0.9.6 is current.  Didn't poke any further than looking in the new
download dir, however.

-- 
Tom Rini

Re: [PATCH 14/70] Add yum-native and createrepo (from Poky)

[Tom Rini]

On Wed, Mar 04, 2009 at 04:52:29PM +0100, Marcin Juszkiewicz wrote:

> From: Richard Purdie <richard@openedhand.com>
> 
> git-svn-id: https://svn.o-hand.com/repos/poky@5098 311d38ba-8fff-0310-9ca6-ca027cbcb966
[snip]
> --- /dev/null
> +++ b/packages/yum/yum-native_3.2.18.bb

Fails to compile, MACHINE=nokia800 DISTRO=minimal, BB_NUMBER_THREADS=4
PARALLE_MAKE="-j 6".  See http://pastebin.com/m36a992fb

-- 
Tom Rini

Re: [PATCH 14/70] Add yum-native and createrepo (from Poky)

[Tom Rini]

On Wed, Mar 04, 2009 at 12:53:33PM -0700, Tom Rini wrote:
> On Wed, Mar 04, 2009 at 04:52:29PM +0100, Marcin Juszkiewicz wrote:
> 
> > From: Richard Purdie <richard@openedhand.com>
> > 
> > git-svn-id: https://svn.o-hand.com/repos/poky@5098 311d38ba-8fff-0310-9ca6-ca027cbcb966
> [snip]
> > --- /dev/null
> > +++ b/packages/yum/yum-native_3.2.18.bb
> 
> Fails to compile, MACHINE=nokia800 DISTRO=minimal, BB_NUMBER_THREADS=4
> PARALLE_MAKE="-j 6".  See http://pastebin.com/m36a992fb

After talking with Marcin on IRC, we've found that intltool-native needs
to be added to the DEPENDS.

-- 
Tom Rini

Re: [PATCH 14/70] Add yum-native and createrepo (from Poky)

[Marcin Juszkiewicz]

On Wednesday 04 of March 2009 20:53:33 Tom Rini wrote:
> > +++ b/packages/yum/yum-native_3.2.18.bb
>
> Fails to compile, MACHINE=nokia800 DISTRO=minimal,
> BB_NUMBER_THREADS=4 PARALLE_MAKE="-j 6".  See
> http://pastebin.com/m36a992fb

fixed

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

[PATCH 15/70] createrepo-native: Add fix for empty data fields when creating repositories (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5108 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/createrepo-native/fix.patch |   17 +++++++++++++++++
 packages/yum/createrepo-native_0.9.bb    |    2 ++
 2 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 packages/yum/createrepo-native/fix.patch

diff --git a/packages/yum/createrepo-native/fix.patch b/packages/yum/createrepo-native/fix.patch
new file mode 100644
index 0000000..4fe58e3
--- /dev/null
+++ b/packages/yum/createrepo-native/fix.patch
@@ -0,0 +1,17 @@
+---
+ createrepo/yumbased.py |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: createrepo-0.9/createrepo/yumbased.py
+===================================================================
+--- createrepo-0.9.orig/createrepo/yumbased.py	2008-08-26 11:41:13.000000000 +0100
++++ createrepo-0.9/createrepo/yumbased.py	2008-08-26 11:37:01.000000000 +0100
+@@ -37,6 +37,8 @@ class CreateRepoPackage(YumLocalPackage)
+         self._hdrend = None
+         
+     def _xml(self, item):
++        if item == []:
++                return []	
+         return xml.sax.saxutils.escape(item)
+         
+     def _do_checksum(self):
diff --git a/packages/yum/createrepo-native_0.9.bb b/packages/yum/createrepo-native_0.9.bb
index e682667..22b5033 100644
--- a/packages/yum/createrepo-native_0.9.bb
+++ b/packages/yum/createrepo-native_0.9.bb
@@ -1,5 +1,7 @@
 SRC_URI = "http://linux.duke.edu/projects/metadata/generate/createrepo-${PV}.tar.gz \
+           file://fix.patch;patch=1 \
            file://pathfix.patch;patch=1 "
+PR = "r1"
 
 inherit autotools native
 
-- 
1.6.1.3

[PATCH 16/70] createrepo-native: added dependency on Python (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5142 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/createrepo-native_0.9.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/packages/yum/createrepo-native_0.9.bb b/packages/yum/createrepo-native_0.9.bb
index 22b5033..80bf95d 100644
--- a/packages/yum/createrepo-native_0.9.bb
+++ b/packages/yum/createrepo-native_0.9.bb
@@ -1,3 +1,5 @@
+DEPENDS = "python-native"
+
 SRC_URI = "http://linux.duke.edu/projects/metadata/generate/createrepo-${PV}.tar.gz \
            file://fix.patch;patch=1 \
            file://pathfix.patch;patch=1 "
-- 
1.6.1.3

[PATCH 17/70] yum-native: Add patch to fix install paths (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5109 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/yum-native/paths.patch |   88 +++++++++++++++++++++++++++++++++++
 packages/yum/yum-native_3.2.18.bb   |    4 +-
 2 files changed, 91 insertions(+), 1 deletions(-)
 create mode 100644 packages/yum/yum-native/paths.patch

diff --git a/packages/yum/yum-native/paths.patch b/packages/yum/yum-native/paths.patch
new file mode 100644
index 0000000..ee5c999
--- /dev/null
+++ b/packages/yum/yum-native/paths.patch
@@ -0,0 +1,88 @@
+Index: yum-3.2.18/Makefile
+===================================================================
+--- yum-3.2.18.orig/Makefile	2008-08-23 09:13:56.000000000 +0100
++++ yum-3.2.18/Makefile	2008-08-23 09:18:09.000000000 +0100
+@@ -18,19 +18,19 @@
+ 	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done
+ 
+ install:
+-	mkdir -p $(DESTDIR)/usr/share/yum-cli
++	mkdir -p $(DESTDIR)$(datadir)/yum-cli
+ 	for p in $(PYFILES) ; do \
+-		install -m 644 $$p $(DESTDIR)/usr/share/yum-cli/$$p; \
++		install -m 644 $$p $(DESTDIR)$(datadir)/yum-cli/$$p; \
+ 	done
+-	mv $(DESTDIR)/usr/share/yum-cli/yum-updatesd.py $(DESTDIR)/usr/share/yum-cli/yumupd.py
+-	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '$(PYDIR)', 1)"
++	mv $(DESTDIR)$(datadir)/yum-cli/yum-updatesd.py $(DESTDIR)$(datadir)/yum-cli/yumupd.py
++	$(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)$(datadir)/yum-cli', 1, '$(PYDIR)', 1)"
+ 
+-	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin
+-	install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum
+-	install -m 755 bin/yum-updatesd.py $(DESTDIR)/usr/sbin/yum-updatesd
++	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
++	install -m 755 bin/yum.py $(DESTDIR)$(bindir)/yum
++	install -m 755 bin/yum-updatesd.py $(DESTDIR)$(sbindir)/yum-updatesd
+ 
+-	mkdir -p $(DESTDIR)/var/cache/yum
+-	mkdir -p $(DESTDIR)/var/lib/yum	
++	mkdir -p $(DESTDIR)$(localstatedir)/cache/yum
++	mkdir -p $(DESTDIR)$(localstatedir)/lib/yum	
+ 
+ 	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
+ 
+Index: yum-3.2.18/docs/Makefile
+===================================================================
+--- yum-3.2.18.orig/docs/Makefile	2008-08-23 09:19:07.000000000 +0100
++++ yum-3.2.18/docs/Makefile	2008-08-23 09:19:37.000000000 +0100
+@@ -6,9 +6,9 @@
+ 	rm -fr epydoc
+ 
+ install:
+-	mkdir -p $(DESTDIR)/usr/share/man/man{5,8}
+-	install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
+-	install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
+-	install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
+-	install -m 644 yum-updatesd.8 $(DESTDIR)/usr/share/man/man8/yum-updatesd.8
+-	install -m 644 yum-updatesd.conf.5 $(DESTDIR)/usr/share/man/man5/yum-updatesd.conf.5
++	mkdir -p $(DESTDIR)$(mandir)/man{5,8}
++	install -m 644 yum.8 $(DESTDIR)$(mandir)/man8/yum.8
++	install -m 644 yum-shell.8 $(DESTDIR)$(mandir)/man8/yum-shell.8
++	install -m 644 yum.conf.5 $(DESTDIR)$(mandir)/man5/yum.conf.5
++	install -m 644 yum-updatesd.8 $(DESTDIR)$(mandir)/man8/yum-updatesd.8
++	install -m 644 yum-updatesd.conf.5 $(DESTDIR)$(mandir)/man5/yum-updatesd.conf.5
+Index: yum-3.2.18/etc/Makefile
+===================================================================
+--- yum-3.2.18.orig/etc/Makefile	2008-08-23 09:19:51.000000000 +0100
++++ yum-3.2.18/etc/Makefile	2008-08-23 09:20:28.000000000 +0100
+@@ -5,20 +5,20 @@
+ 	rm -f *.pyc *.pyo *~
+ 
+ install:
+-	mkdir -p $(DESTDIR)/etc/yum/
+-	mkdir -p $(DESTDIR)/etc/yum/repos.d
++	mkdir -p $(DESTDIR)$(sysconfdir)/yum/
++	mkdir -p $(DESTDIR)$(sysconfdir)/yum/repos.d
+ 
+-	install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf
++	install -m 644 yum.conf $(DESTDIR)$(sysconfdir)/yum/yum.conf
+ 
+-	mkdir -p $(DESTDIR)/etc/logrotate.d
+-	install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum
++	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
++	install -m 644 yum.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/yum
+ 
+-	mkdir -p $(DESTDIR)/etc/rc.d/init.d
+-	install -m 755 yum-updatesd.init $(DESTDIR)/etc/rc.d/init.d/yum-updatesd
++	mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
++	install -m 755 yum-updatesd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/yum-updatesd
+ 
+-	mkdir -p $(DESTDIR)/etc/dbus-1/system.d/
+-	install -m 755 yum-updatesd-dbus.conf $(DESTDIR)/etc/dbus-1/system.d/yum-updatesd.conf
++	mkdir -p $(DESTDIR)$(sysconfdir)/dbus-1/system.d/
++	install -m 755 yum-updatesd-dbus.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/yum-updatesd.conf
+ 
+-	install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
++	install -m 755 yum-updatesd.conf $(DESTDIR)$(sysconfdir)/yum/yum-updatesd.conf
+ 
+ 
diff --git a/packages/yum/yum-native_3.2.18.bb b/packages/yum/yum-native_3.2.18.bb
index 6657c52..d3098cc 100644
--- a/packages/yum/yum-native_3.2.18.bb
+++ b/packages/yum/yum-native_3.2.18.bb
@@ -1,6 +1,8 @@
 HOMEPAGE = "http://linux.duke.edu/projects/yum/"
 
-SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz"
+SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
+           file://paths.patch;patch=1"
+PR = "r1"
 
 DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native"
 
-- 
1.6.1.3

Re: [PATCH 17/70] yum-native: Add patch to fix install paths (from Poky)

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 5838 bytes --]

On Wednesday 04 March 2009 07:52:32 Marcin Juszkiewicz wrote:
> From: Richard Purdie <richard@openedhand.com>
>
> git-svn-id: https://svn.o-hand.com/repos/poky@5109
> 311d38ba-8fff-0310-9ca6-ca027cbcb966 ---
>  packages/yum/yum-native/paths.patch |   88
> +++++++++++++++++++++++++++++++++++ packages/yum/yum-native_3.2.18.bb   |  
>  4 +-
>  2 files changed, 91 insertions(+), 1 deletions(-)
>  create mode 100644 packages/yum/yum-native/paths.patch
>
> diff --git a/packages/yum/yum-native/paths.patch
> b/packages/yum/yum-native/paths.patch new file mode 100644
> index 0000000..ee5c999
> --- /dev/null
> +++ b/packages/yum/yum-native/paths.patch
> @@ -0,0 +1,88 @@
> +Index: yum-3.2.18/Makefile
> +===================================================================
> +--- yum-3.2.18.orig/Makefile	2008-08-23 09:13:56.000000000 +0100
> ++++ yum-3.2.18/Makefile	2008-08-23 09:18:09.000000000 +0100
> +@@ -18,19 +18,19 @@
> + 	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] ||
> exit 1 ; done +
> + install:
> +-	mkdir -p $(DESTDIR)/usr/share/yum-cli
> ++	mkdir -p $(DESTDIR)$(datadir)/yum-cli
> + 	for p in $(PYFILES) ; do \
> +-		install -m 644 $$p $(DESTDIR)/usr/share/yum-cli/$$p; \
> ++		install -m 644 $$p $(DESTDIR)$(datadir)/yum-cli/$$p; \
> + 	done
> +-	mv $(DESTDIR)/usr/share/yum-cli/yum-updatesd.py
> $(DESTDIR)/usr/share/yum-cli/yumupd.py +-	$(PYTHON) -c "import compileall;
> compileall.compile_dir('$(DESTDIR)/usr/share/yum-cli', 1, '$(PYDIR)', 1)"
> ++	mv $(DESTDIR)$(datadir)/yum-cli/yum-updatesd.py
> $(DESTDIR)$(datadir)/yum-cli/yumupd.py ++	$(PYTHON) -c "import compileall;
> compileall.compile_dir('$(DESTDIR)$(datadir)/yum-cli', 1, '$(PYDIR)', 1)" +
> +-	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin
> +-	install -m 755 bin/yum.py $(DESTDIR)/usr/bin/yum
> +-	install -m 755 bin/yum-updatesd.py $(DESTDIR)/usr/sbin/yum-updatesd
> ++	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
> ++	install -m 755 bin/yum.py $(DESTDIR)$(bindir)/yum
> ++	install -m 755 bin/yum-updatesd.py $(DESTDIR)$(sbindir)/yum-updatesd
> +
> +-	mkdir -p $(DESTDIR)/var/cache/yum
> +-	mkdir -p $(DESTDIR)/var/lib/yum
> ++	mkdir -p $(DESTDIR)$(localstatedir)/cache/yum
> ++	mkdir -p $(DESTDIR)$(localstatedir)/lib/yum
> +
> + 	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR);
> pwd` -C $$d install; [ $$? = 0 ] || exit 1; done +
> +Index: yum-3.2.18/docs/Makefile
> +===================================================================
> +--- yum-3.2.18.orig/docs/Makefile	2008-08-23 09:19:07.000000000 +0100
> ++++ yum-3.2.18/docs/Makefile	2008-08-23 09:19:37.000000000 +0100
> +@@ -6,9 +6,9 @@
> + 	rm -fr epydoc
> +
> + install:
> +-	mkdir -p $(DESTDIR)/usr/share/man/man{5,8}
> +-	install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
> +-	install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
> +-	install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
> +-	install -m 644 yum-updatesd.8
> $(DESTDIR)/usr/share/man/man8/yum-updatesd.8 +-	install -m 644
> yum-updatesd.conf.5 $(DESTDIR)/usr/share/man/man5/yum-updatesd.conf.5
> ++	mkdir -p $(DESTDIR)$(mandir)/man{5,8}
> ++	install -m 644 yum.8 $(DESTDIR)$(mandir)/man8/yum.8
> ++	install -m 644 yum-shell.8 $(DESTDIR)$(mandir)/man8/yum-shell.8
> ++	install -m 644 yum.conf.5 $(DESTDIR)$(mandir)/man5/yum.conf.5
> ++	install -m 644 yum-updatesd.8 $(DESTDIR)$(mandir)/man8/yum-updatesd.8
> ++	install -m 644 yum-updatesd.conf.5
> $(DESTDIR)$(mandir)/man5/yum-updatesd.conf.5 +Index:
> yum-3.2.18/etc/Makefile
> +===================================================================
> +--- yum-3.2.18.orig/etc/Makefile	2008-08-23 09:19:51.000000000 +0100
> ++++ yum-3.2.18/etc/Makefile	2008-08-23 09:20:28.000000000 +0100
> +@@ -5,20 +5,20 @@
> + 	rm -f *.pyc *.pyo *~
> +
> + install:
> +-	mkdir -p $(DESTDIR)/etc/yum/
> +-	mkdir -p $(DESTDIR)/etc/yum/repos.d
> ++	mkdir -p $(DESTDIR)$(sysconfdir)/yum/
> ++	mkdir -p $(DESTDIR)$(sysconfdir)/yum/repos.d
> +
> +-	install -m 644 yum.conf $(DESTDIR)/etc/yum/yum.conf
> ++	install -m 644 yum.conf $(DESTDIR)$(sysconfdir)/yum/yum.conf
> +
> +-	mkdir -p $(DESTDIR)/etc/logrotate.d
> +-	install -m 644 yum.logrotate $(DESTDIR)/etc/logrotate.d/yum
> ++	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
> ++	install -m 644 yum.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/yum
> +
> +-	mkdir -p $(DESTDIR)/etc/rc.d/init.d
> +-	install -m 755 yum-updatesd.init $(DESTDIR)/etc/rc.d/init.d/yum-updatesd
> ++	mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
> ++	install -m 755 yum-updatesd.init
> $(DESTDIR)$(sysconfdir)/rc.d/init.d/yum-updatesd +
> +-	mkdir -p $(DESTDIR)/etc/dbus-1/system.d/
> +-	install -m 755 yum-updatesd-dbus.conf
> $(DESTDIR)/etc/dbus-1/system.d/yum-updatesd.conf ++	mkdir -p
> $(DESTDIR)$(sysconfdir)/dbus-1/system.d/
> ++	install -m 755 yum-updatesd-dbus.conf
> $(DESTDIR)$(sysconfdir)/dbus-1/system.d/yum-updatesd.conf +
> +-	install -m 755 yum-updatesd.conf $(DESTDIR)/etc/yum/yum-updatesd.conf
> ++	install -m 755 yum-updatesd.conf
> $(DESTDIR)$(sysconfdir)/yum/yum-updatesd.conf +
> +
> diff --git a/packages/yum/yum-native_3.2.18.bb
> b/packages/yum/yum-native_3.2.18.bb index 6657c52..d3098cc 100644
> --- a/packages/yum/yum-native_3.2.18.bb
> +++ b/packages/yum/yum-native_3.2.18.bb
> @@ -1,6 +1,8 @@
>  HOMEPAGE = "http://linux.duke.edu/projects/yum/"
>
> -SRC_URI =
> "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz" +SRC_URI
> = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \ +    
>       file://paths.patch;patch=1"
> +PR = "r1"
>
>  DEPENDS = "rpm-native python-native python-iniparse-native
> python-urlgrabber-native yum-metadata-parser-native"

This seems ok to me.
-- 
Khem Raj

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 204 bytes --]

[PATCH 18/70] yum-native: Add some hacks to make yum work better in the cross build case (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5110 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/yum-native/hacks.patch |   66 +++++++++++++++++++++++++++++++++++
 packages/yum/yum-native_3.2.18.bb   |    3 +-
 2 files changed, 68 insertions(+), 1 deletions(-)
 create mode 100644 packages/yum/yum-native/hacks.patch

diff --git a/packages/yum/yum-native/hacks.patch b/packages/yum/yum-native/hacks.patch
new file mode 100644
index 0000000..0486b5f
--- /dev/null
+++ b/packages/yum/yum-native/hacks.patch
@@ -0,0 +1,66 @@
+---
+ rpmUtils/arch.py        |    3 +++
+ rpmUtils/transaction.py |    1 +
+ yum/constants.py        |    2 +-
+ yum/depsolve.py         |    2 ++
+ 4 files changed, 7 insertions(+), 1 deletion(-)
+
+Index: yum-3.2.18/rpmUtils/arch.py
+===================================================================
+--- yum-3.2.18.orig/rpmUtils/arch.py	2008-08-26 12:43:14.000000000 +0100
++++ yum-3.2.18/rpmUtils/arch.py	2008-08-26 12:50:11.000000000 +0100
+@@ -275,6 +275,7 @@ def getCanonX86_64Arch(arch):
+     return arch
+         
+ def getCanonArch(skipRpmPlatform = 0):
++    return "arm"
+     if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
+         try:
+             f = open("/etc/rpm/platform", "r")
+@@ -331,6 +332,8 @@ def getBaseArch(myarch=None):
+        base arch is the arch before noarch in the arches dict if myarch is not
+        a key in the multilibArches."""
+ 
++    return "arm"
++
+     if not myarch:
+         myarch = canonArch
+ 
+Index: yum-3.2.18/rpmUtils/transaction.py
+===================================================================
+--- yum-3.2.18.orig/rpmUtils/transaction.py	2008-08-26 13:03:13.000000000 +0100
++++ yum-3.2.18/rpmUtils/transaction.py	2008-08-26 13:10:52.000000000 +0100
+@@ -43,6 +43,7 @@ class TransactionWrapper:
+                          'clean']
+         self.tsflags = []
+         self.open = True
++        self.ts.setProbFilter(rpm.RPMPROB_FILTER_IGNOREOS | rpm.RPMPROB_FILTER_IGNOREARCH)
+ 
+     def __del__(self):
+         # Automatically close the rpm transaction when the reference is lost
+Index: yum-3.2.18/yum/constants.py
+===================================================================
+--- yum-3.2.18.orig/yum/constants.py	2008-08-26 13:12:39.000000000 +0100
++++ yum-3.2.18/yum/constants.py	2008-08-26 13:12:46.000000000 +0100
+@@ -17,7 +17,7 @@ Yum constants. Usually dealing with rpm 
+ """
+ 
+ #Constants
+-YUM_PID_FILE = '/var/run/yum.pid'
++YUM_PID_FILE = '/var/run2/yum.pid'
+ 
+ #transaction set states
+ TS_UPDATE = 10
+Index: yum-3.2.18/yum/depsolve.py
+===================================================================
+--- yum-3.2.18.orig/yum/depsolve.py	2008-08-26 12:44:37.000000000 +0100
++++ yum-3.2.18/yum/depsolve.py	2008-08-26 13:17:45.000000000 +0100
+@@ -144,6 +144,8 @@ class Depsolve(object):
+         probfilter = 0
+         for flag in self.tsInfo.probFilterFlags:
+             probfilter |= flag
++        probfilter |= rpm.RPMPROB_FILTER_IGNOREOS
++        probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH
+         self._ts.setProbFilter(probfilter)
+ 
+     def whatProvides(self, name, flags, version):
diff --git a/packages/yum/yum-native_3.2.18.bb b/packages/yum/yum-native_3.2.18.bb
index d3098cc..03e54d5 100644
--- a/packages/yum/yum-native_3.2.18.bb
+++ b/packages/yum/yum-native_3.2.18.bb
@@ -1,8 +1,9 @@
 HOMEPAGE = "http://linux.duke.edu/projects/yum/"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
+           file://hacks.patch;patch=1 \
            file://paths.patch;patch=1"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native"
 
-- 
1.6.1.3

Re: [PATCH 18/70] yum-native: Add some hacks to make yum work better in the cross build case (from Poky)

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 4256 bytes --]

On Wednesday 04 March 2009 07:52:33 Marcin Juszkiewicz wrote:
> From: Richard Purdie <richard@openedhand.com>
>
> git-svn-id: https://svn.o-hand.com/repos/poky@5110
> 311d38ba-8fff-0310-9ca6-ca027cbcb966 ---
>  packages/yum/yum-native/hacks.patch |   66
> +++++++++++++++++++++++++++++++++++ packages/yum/yum-native_3.2.18.bb   |  
>  3 +-
>  2 files changed, 68 insertions(+), 1 deletions(-)
>  create mode 100644 packages/yum/yum-native/hacks.patch
>
> diff --git a/packages/yum/yum-native/hacks.patch
> b/packages/yum/yum-native/hacks.patch new file mode 100644
> index 0000000..0486b5f
> --- /dev/null
> +++ b/packages/yum/yum-native/hacks.patch
> @@ -0,0 +1,66 @@
> +---
> + rpmUtils/arch.py        |    3 +++
> + rpmUtils/transaction.py |    1 +
> + yum/constants.py        |    2 +-
> + yum/depsolve.py         |    2 ++
> + 4 files changed, 7 insertions(+), 1 deletion(-)
> +
> +Index: yum-3.2.18/rpmUtils/arch.py
> +===================================================================
> +--- yum-3.2.18.orig/rpmUtils/arch.py	2008-08-26 12:43:14.000000000 +0100
> ++++ yum-3.2.18/rpmUtils/arch.py	2008-08-26 12:50:11.000000000 +0100
> +@@ -275,6 +275,7 @@ def getCanonX86_64Arch(arch):
> +     return arch
> +
> + def getCanonArch(skipRpmPlatform = 0):
> ++    return "arm"

Does this mean that it will only work for arm ? It would be nice if it could 
work for other arches too.

> +     if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
> +         try:
> +             f = open("/etc/rpm/platform", "r")
> +@@ -331,6 +332,8 @@ def getBaseArch(myarch=None):
> +        base arch is the arch before noarch in the arches dict if myarch
> is not +        a key in the multilibArches."""
> +
> ++    return "arm"
> ++

Ditto as above.

> +     if not myarch:
> +         myarch = canonArch
> +
> +Index: yum-3.2.18/rpmUtils/transaction.py
> +===================================================================
> +--- yum-3.2.18.orig/rpmUtils/transaction.py	2008-08-26 13:03:13.000000000
> +0100 ++++ yum-3.2.18/rpmUtils/transaction.py	2008-08-26 13:10:52.000000000
> +0100 +@@ -43,6 +43,7 @@ class TransactionWrapper:
> +                          'clean']
> +         self.tsflags = []
> +         self.open = True
> ++        self.ts.setProbFilter(rpm.RPMPROB_FILTER_IGNOREOS |
> rpm.RPMPROB_FILTER_IGNOREARCH) +
> +     def __del__(self):
> +         # Automatically close the rpm transaction when the reference is
> lost +Index: yum-3.2.18/yum/constants.py
> +===================================================================
> +--- yum-3.2.18.orig/yum/constants.py	2008-08-26 13:12:39.000000000 +0100
> ++++ yum-3.2.18/yum/constants.py	2008-08-26 13:12:46.000000000 +0100
> +@@ -17,7 +17,7 @@ Yum constants. Usually dealing with rpm
> + """
> +
> + #Constants
> +-YUM_PID_FILE = '/var/run/yum.pid'
> ++YUM_PID_FILE = '/var/run2/yum.pid'
> +
> + #transaction set states
> + TS_UPDATE = 10
> +Index: yum-3.2.18/yum/depsolve.py
> +===================================================================
> +--- yum-3.2.18.orig/yum/depsolve.py	2008-08-26 12:44:37.000000000 +0100
> ++++ yum-3.2.18/yum/depsolve.py	2008-08-26 13:17:45.000000000 +0100
> +@@ -144,6 +144,8 @@ class Depsolve(object):
> +         probfilter = 0
> +         for flag in self.tsInfo.probFilterFlags:
> +             probfilter |= flag
> ++        probfilter |= rpm.RPMPROB_FILTER_IGNOREOS
> ++        probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH
> +         self._ts.setProbFilter(probfilter)
> +
> +     def whatProvides(self, name, flags, version):
> diff --git a/packages/yum/yum-native_3.2.18.bb
> b/packages/yum/yum-native_3.2.18.bb index d3098cc..03e54d5 100644
> --- a/packages/yum/yum-native_3.2.18.bb
> +++ b/packages/yum/yum-native_3.2.18.bb
> @@ -1,8 +1,9 @@
>  HOMEPAGE = "http://linux.duke.edu/projects/yum/"
>
>  SRC_URI =
> "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \ +      
>     file://hacks.patch;patch=1 \
>             file://paths.patch;patch=1"
> -PR = "r1"
> +PR = "r2"
>
>  DEPENDS = "rpm-native python-native python-iniparse-native
> python-urlgrabber-native yum-metadata-parser-native"

-- 
Khem Raj

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 204 bytes --]

Re: [PATCH 18/70] yum-native: Add some hacks to make yum work better in the cross build case (from Poky)

[Richard Purdie]

On Tue, 2009-03-10 at 00:58 -0700, Khem Raj wrote:
> On Wednesday 04 March 2009 07:52:33 Marcin Juszkiewicz wrote:
> > From: Richard Purdie <richard@openedhand.com>
> >
> > git-svn-id: https://svn.o-hand.com/repos/poky@5110
> > 311d38ba-8fff-0310-9ca6-ca027cbcb966 ---
> >  packages/yum/yum-native/hacks.patch |   66
> > +++++++++++++++++++++++++++++++++++ packages/yum/yum-native_3.2.18.bb   |  
> >  3 +-
> >  2 files changed, 68 insertions(+), 1 deletions(-)
> >  create mode 100644 packages/yum/yum-native/hacks.patch
> >
> > diff --git a/packages/yum/yum-native/hacks.patch
> > b/packages/yum/yum-native/hacks.patch new file mode 100644
> > index 0000000..0486b5f
> > --- /dev/null
> > +++ b/packages/yum/yum-native/hacks.patch
> > @@ -0,0 +1,66 @@
> > +---
> > + rpmUtils/arch.py        |    3 +++
> > + rpmUtils/transaction.py |    1 +
> > + yum/constants.py        |    2 +-
> > + yum/depsolve.py         |    2 ++
> > + 4 files changed, 7 insertions(+), 1 deletion(-)
> > +
> > +Index: yum-3.2.18/rpmUtils/arch.py
> > +===================================================================
> > +--- yum-3.2.18.orig/rpmUtils/arch.py	2008-08-26 12:43:14.000000000 +0100
> > ++++ yum-3.2.18/rpmUtils/arch.py	2008-08-26 12:50:11.000000000 +0100
> > +@@ -275,6 +275,7 @@ def getCanonX86_64Arch(arch):
> > +     return arch
> > +
> > + def getCanonArch(skipRpmPlatform = 0):
> > ++    return "arm"
> 
> Does this mean that it will only work for arm ? It would be nice if it could 
> work for other arches too.

It was tested on arm since I reasoned if I could make that work,
everything else should follow too. You're right, these arm references
need fixing though. The main point is that we at least now know where
the values that need fixing are, making the job much easier!

I developed a strong dislike of rpm and yum when doing this as the
amount that is hardcoded is scary :(

-- 
RP

[PATCH 19/70] yum-native: add depends on libxml2-native (from Poky)

[Marcin Juszkiewicz]

From: Ross Burton <ross@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5118 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/yum-native_3.2.18.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/yum/yum-native_3.2.18.bb b/packages/yum/yum-native_3.2.18.bb
index 03e54d5..fcb5680 100644
--- a/packages/yum/yum-native_3.2.18.bb
+++ b/packages/yum/yum-native_3.2.18.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "http://linux.duke.edu/projects/yum/"
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://hacks.patch;patch=1 \
            file://paths.patch;patch=1"
-PR = "r2"
+PR = "r3"
 
-DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native"
+DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
 
 S = "${WORKDIR}/yum-${PV}"
 
-- 
1.6.1.3

Re: [PATCH 19/70] yum-native: add depends on libxml2-native (from Poky)

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]

On Wednesday 04 March 2009 07:52:34 Marcin Juszkiewicz wrote:
> From: Ross Burton <ross@openedhand.com>
>
> git-svn-id: https://svn.o-hand.com/repos/poky@5118
> 311d38ba-8fff-0310-9ca6-ca027cbcb966 ---
>  packages/yum/yum-native_3.2.18.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/packages/yum/yum-native_3.2.18.bb
> b/packages/yum/yum-native_3.2.18.bb index 03e54d5..fcb5680 100644
> --- a/packages/yum/yum-native_3.2.18.bb
> +++ b/packages/yum/yum-native_3.2.18.bb
> @@ -3,9 +3,9 @@ HOMEPAGE = "http://linux.duke.edu/projects/yum/"
>  SRC_URI =
> "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
> file://hacks.patch;patch=1 \
>             file://paths.patch;patch=1"
> -PR = "r2"
> +PR = "r3"
>
> -DEPENDS = "rpm-native python-native python-iniparse-native
> python-urlgrabber-native yum-metadata-parser-native" +DEPENDS = "rpm-native
> python-native python-iniparse-native python-urlgrabber-native
> yum-metadata-parser-native libxml2-native"
>
>  S = "${WORKDIR}/yum-${PV}"

OK

-- 
Khem Raj

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 204 bytes --]

[PATCH 20/70] yum-native: Add NOPOST and NOTRIGGERS flags when installing packages (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5130 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/yum-native/hacks.patch |   32 +++++++++++++++++++-------------
 packages/yum/yum-native_3.2.18.bb   |    2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/packages/yum/yum-native/hacks.patch b/packages/yum/yum-native/hacks.patch
index 0486b5f..d0232ec 100644
--- a/packages/yum/yum-native/hacks.patch
+++ b/packages/yum/yum-native/hacks.patch
@@ -7,9 +7,9 @@
 
 Index: yum-3.2.18/rpmUtils/arch.py
 ===================================================================
---- yum-3.2.18.orig/rpmUtils/arch.py	2008-08-26 12:43:14.000000000 +0100
-+++ yum-3.2.18/rpmUtils/arch.py	2008-08-26 12:50:11.000000000 +0100
-@@ -275,6 +275,7 @@ def getCanonX86_64Arch(arch):
+--- yum-3.2.18.orig/rpmUtils/arch.py	2008-06-17 14:05:42.000000000 +0100
++++ yum-3.2.18/rpmUtils/arch.py	2008-09-01 15:47:11.000000000 +0100
+@@ -275,6 +275,7 @@
      return arch
          
  def getCanonArch(skipRpmPlatform = 0):
@@ -17,7 +17,7 @@ Index: yum-3.2.18/rpmUtils/arch.py
      if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
          try:
              f = open("/etc/rpm/platform", "r")
-@@ -331,6 +332,8 @@ def getBaseArch(myarch=None):
+@@ -331,6 +332,8 @@
         base arch is the arch before noarch in the arches dict if myarch is not
         a key in the multilibArches."""
  
@@ -28,9 +28,9 @@ Index: yum-3.2.18/rpmUtils/arch.py
  
 Index: yum-3.2.18/rpmUtils/transaction.py
 ===================================================================
---- yum-3.2.18.orig/rpmUtils/transaction.py	2008-08-26 13:03:13.000000000 +0100
-+++ yum-3.2.18/rpmUtils/transaction.py	2008-08-26 13:10:52.000000000 +0100
-@@ -43,6 +43,7 @@ class TransactionWrapper:
+--- yum-3.2.18.orig/rpmUtils/transaction.py	2008-06-17 14:05:42.000000000 +0100
++++ yum-3.2.18/rpmUtils/transaction.py	2008-09-03 17:55:27.000000000 +0100
+@@ -43,6 +43,7 @@
                           'clean']
          self.tsflags = []
          self.open = True
@@ -40,9 +40,9 @@ Index: yum-3.2.18/rpmUtils/transaction.py
          # Automatically close the rpm transaction when the reference is lost
 Index: yum-3.2.18/yum/constants.py
 ===================================================================
---- yum-3.2.18.orig/yum/constants.py	2008-08-26 13:12:39.000000000 +0100
-+++ yum-3.2.18/yum/constants.py	2008-08-26 13:12:46.000000000 +0100
-@@ -17,7 +17,7 @@ Yum constants. Usually dealing with rpm 
+--- yum-3.2.18.orig/yum/constants.py	2008-07-21 16:56:54.000000000 +0100
++++ yum-3.2.18/yum/constants.py	2008-09-01 15:47:11.000000000 +0100
+@@ -17,7 +17,7 @@
  """
  
  #Constants
@@ -53,9 +53,15 @@ Index: yum-3.2.18/yum/constants.py
  TS_UPDATE = 10
 Index: yum-3.2.18/yum/depsolve.py
 ===================================================================
---- yum-3.2.18.orig/yum/depsolve.py	2008-08-26 12:44:37.000000000 +0100
-+++ yum-3.2.18/yum/depsolve.py	2008-08-26 13:17:45.000000000 +0100
-@@ -144,6 +144,8 @@ class Depsolve(object):
+--- yum-3.2.18.orig/yum/depsolve.py	2008-08-06 17:05:16.000000000 +0100
++++ yum-3.2.18/yum/depsolve.py	2008-09-03 21:05:52.000000000 +0100
+@@ -141,9 +141,14 @@
+             else:
+                 self.logger.critical(_('Invalid tsflag in config file: %s'), flag)
+ 
++        self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOPOST)
++        self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOTRIGGERS)
++
          probfilter = 0
          for flag in self.tsInfo.probFilterFlags:
              probfilter |= flag
diff --git a/packages/yum/yum-native_3.2.18.bb b/packages/yum/yum-native_3.2.18.bb
index fcb5680..d90f158 100644
--- a/packages/yum/yum-native_3.2.18.bb
+++ b/packages/yum/yum-native_3.2.18.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://linux.duke.edu/projects/yum/"
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://hacks.patch;patch=1 \
            file://paths.patch;patch=1"
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
 
-- 
1.6.1.3

[PATCH 21/70] yum-native: Add extract-postinst.awk script for use during rootfs generation (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5133 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/yum-native/extract-postinst.awk |   11 +++++++++++
 packages/yum/yum-native_3.2.18.bb            |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
 create mode 100644 packages/yum/yum-native/extract-postinst.awk

diff --git a/packages/yum/yum-native/extract-postinst.awk b/packages/yum/yum-native/extract-postinst.awk
new file mode 100644
index 0000000..8f2836b
--- /dev/null
+++ b/packages/yum/yum-native/extract-postinst.awk
@@ -0,0 +1,11 @@
+/Name:.*/ {
+  package = substr($0, 7)
+  next
+}
+/postinstall.*scriptlet .*/ {
+  next
+}
+{
+  print $0 >> ENVIRON["D"] "/etc/rpm-postinsts/" package ".sh"
+}
+    
diff --git a/packages/yum/yum-native_3.2.18.bb b/packages/yum/yum-native_3.2.18.bb
index d90f158..76e92b3 100644
--- a/packages/yum/yum-native_3.2.18.bb
+++ b/packages/yum/yum-native_3.2.18.bb
@@ -2,7 +2,8 @@ HOMEPAGE = "http://linux.duke.edu/projects/yum/"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://hacks.patch;patch=1 \
-           file://paths.patch;patch=1"
+           file://paths.patch;patch=1 \
+	   file://extract-postinst.awk"
 PR = "r4"
 
 DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
@@ -15,3 +16,8 @@ do_compile_append () {
 	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum.py
 	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum-updatesd.py
 }
+
+do_install_append () {
+	install -d ${STAGING_BINDIR}/
+	install ${WORKDIR}/extract-postinst.awk ${STAGING_BINDIR}/
+}
-- 
1.6.1.3

[PATCH 22/70] yum-metadata-parser-native: depend on GLib 2.0 native (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5140 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../python/yum-metadata-parser-native_1.1.2.bb     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/python/yum-metadata-parser-native_1.1.2.bb b/packages/python/yum-metadata-parser-native_1.1.2.bb
index 4e4ab9f..643d4b8 100644
--- a/packages/python/yum-metadata-parser-native_1.1.2.bb
+++ b/packages/python/yum-metadata-parser-native_1.1.2.bb
@@ -1,6 +1,6 @@
 require yum-metadata-parser_${PV}.bb
 inherit native
-DEPENDS = "python-native sqlite3-native"
+DEPENDS = "python-native sqlite3-native glib-2.0-native"
 RDEPENDS = ""
 
 #BUILD_CFLAGS += "-I${STAGING_LIBDIR}/glib-2.0"
-- 
1.6.1.3

[PATCH 23/70] yum: Add yum-install-recommends.py script to handle installing Recommends (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5157 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/yum-native/yum-install-recommends.py |   39 +++++++++++++++++++++
 packages/yum/yum-native_3.2.18.bb                 |    4 ++-
 2 files changed, 42 insertions(+), 1 deletions(-)
 create mode 100755 packages/yum/yum-native/yum-install-recommends.py

diff --git a/packages/yum/yum-native/yum-install-recommends.py b/packages/yum/yum-native/yum-install-recommends.py
new file mode 100755
index 0000000..64716f2
--- /dev/null
+++ b/packages/yum/yum-native/yum-install-recommends.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+import os, sys
+
+root = sys.argv[1]
+installcmd = sys.argv[2]
+
+#
+# Take an rpm image and look through for Recommends:. For each recommends 
+# found, try and install any matching packages including any Recommends for
+# packages installed by us.
+#
+
+
+def get_recommends():
+    deps = []
+    output = os.popen("rpm --root %s -aq --recommends" % (root))
+    lines = output.readlines()
+    for line in lines:
+        line = line.replace("(none)","")
+        if line:
+            deps.append(line.split()[0])
+    return deps
+
+processed = []
+
+while True:
+    toinstall = []
+    recommends = set(get_recommends())
+    for item in recommends:
+        if item not in processed:
+            toinstall.append(item)
+    if len(toinstall) != 0:
+        print "Installing %s" % " ".join(toinstall)
+        os.system("%s %s" % (installcmd, " ".join(toinstall)))
+    else:
+        break
+    processed.extend(toinstall)
+
+    
diff --git a/packages/yum/yum-native_3.2.18.bb b/packages/yum/yum-native_3.2.18.bb
index 76e92b3..60dafe3 100644
--- a/packages/yum/yum-native_3.2.18.bb
+++ b/packages/yum/yum-native_3.2.18.bb
@@ -3,8 +3,9 @@ HOMEPAGE = "http://linux.duke.edu/projects/yum/"
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://hacks.patch;patch=1 \
            file://paths.patch;patch=1 \
+	   file://yum-install-recommends.py \
 	   file://extract-postinst.awk"
-PR = "r4"
+PR = "r5"
 
 DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
 
@@ -20,4 +21,5 @@ do_compile_append () {
 do_install_append () {
 	install -d ${STAGING_BINDIR}/
 	install ${WORKDIR}/extract-postinst.awk ${STAGING_BINDIR}/
+	install ${WORKDIR}/yum-install-recommends.py ${STAGING_BINDIR}/
 }
-- 
1.6.1.3

[PATCH 24/70] yum: added 3.2.18 (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5379 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../yum/{yum-native => files}/extract-postinst.awk |    0
 packages/yum/{yum-native => files}/hacks.patch     |    0
 packages/yum/{yum-native => files}/paths.patch     |    0
 .../yum-install-recommends.py                      |    0
 packages/yum/yum_3.2.18.bb                         |   24 ++++++++++++++++++++
 5 files changed, 24 insertions(+), 0 deletions(-)
 rename packages/yum/{yum-native => files}/extract-postinst.awk (100%)
 rename packages/yum/{yum-native => files}/hacks.patch (100%)
 rename packages/yum/{yum-native => files}/paths.patch (100%)
 rename packages/yum/{yum-native => files}/yum-install-recommends.py (100%)
 create mode 100644 packages/yum/yum_3.2.18.bb

diff --git a/packages/yum/yum-native/extract-postinst.awk b/packages/yum/files/extract-postinst.awk
similarity index 100%
rename from packages/yum/yum-native/extract-postinst.awk
rename to packages/yum/files/extract-postinst.awk
diff --git a/packages/yum/yum-native/hacks.patch b/packages/yum/files/hacks.patch
similarity index 100%
rename from packages/yum/yum-native/hacks.patch
rename to packages/yum/files/hacks.patch
diff --git a/packages/yum/yum-native/paths.patch b/packages/yum/files/paths.patch
similarity index 100%
rename from packages/yum/yum-native/paths.patch
rename to packages/yum/files/paths.patch
diff --git a/packages/yum/yum-native/yum-install-recommends.py b/packages/yum/files/yum-install-recommends.py
similarity index 100%
rename from packages/yum/yum-native/yum-install-recommends.py
rename to packages/yum/files/yum-install-recommends.py
diff --git a/packages/yum/yum_3.2.18.bb b/packages/yum/yum_3.2.18.bb
new file mode 100644
index 0000000..67e9ad7
--- /dev/null
+++ b/packages/yum/yum_3.2.18.bb
@@ -0,0 +1,24 @@
+HOMEPAGE = "http://linux.duke.edu/projects/yum/"
+
+SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
+           file://hacks.patch;patch=1 \
+           file://paths.patch;patch=1 \
+	   file://yum-install-recommends.py \
+	   file://extract-postinst.awk"
+
+DEPENDS = "rpm python python-iniparse python-urlgrabber yum-metadata-parser libxml2"
+
+S = "${WORKDIR}/yum-${PV}"
+
+inherit autotools
+
+do_compile_append () {
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum.py
+	sed -e 's#!/usr/bin/python#!${bindir}/python#' -e 's#/usr/share#${datadir}#' -i ${S}/bin/yum-updatesd.py
+}
+
+do_install_append () {
+	install -d ${D}${bindir}/
+	install ${WORKDIR}/extract-postinst.awk ${D}${bindir}/
+	install ${WORKDIR}/yum-install-recommends.py ${D}${bindir}/
+}
-- 
1.6.1.3

[PATCH 25/70] yum-metadata-parser: fixed dependencies (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5385 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../python/yum-metadata-parser-native_1.1.2.bb     |    2 +-
 packages/python/yum-metadata-parser_1.1.2.bb       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/python/yum-metadata-parser-native_1.1.2.bb b/packages/python/yum-metadata-parser-native_1.1.2.bb
index 643d4b8..a74488c 100644
--- a/packages/python/yum-metadata-parser-native_1.1.2.bb
+++ b/packages/python/yum-metadata-parser-native_1.1.2.bb
@@ -1,6 +1,6 @@
 require yum-metadata-parser_${PV}.bb
 inherit native
-DEPENDS = "python-native sqlite3-native glib-2.0-native"
+DEPENDS = "python-native sqlite3-native glib-2.0-native libxml2-native"
 RDEPENDS = ""
 
 #BUILD_CFLAGS += "-I${STAGING_LIBDIR}/glib-2.0"
diff --git a/packages/python/yum-metadata-parser_1.1.2.bb b/packages/python/yum-metadata-parser_1.1.2.bb
index 0f9ed80..24de761 100644
--- a/packages/python/yum-metadata-parser_1.1.2.bb
+++ b/packages/python/yum-metadata-parser_1.1.2.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "C-based metadata parser to quickly parse xml metadata into sqlite
 HOMEPAGE = "http://linux.duke.edu/projects/yum/download.ptml"
 SECTION = "devel/python"
 PRIORITY = "optional"
+DEPENDS = "python sqlite3 glib-2.0 libxml2"
 LICENSE = "GPL"
-PR = "r0"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/yum-metadata-parser/yum-metadata-parser-${PV}.tar.gz"
 S = "${WORKDIR}/yum-metadata-parser-${PV}"
-- 
1.6.1.3

[PATCH 26/70] yum: do not hardcode arm architecture - rootfs_rpm provide arch info (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5392 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/files/hacks.patch    |   21 ---------------------
 packages/yum/yum-native_3.2.18.bb |    2 +-
 packages/yum/yum_3.2.18.bb        |    1 +
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/packages/yum/files/hacks.patch b/packages/yum/files/hacks.patch
index d0232ec..ac8445f 100644
--- a/packages/yum/files/hacks.patch
+++ b/packages/yum/files/hacks.patch
@@ -5,27 +5,6 @@
  yum/depsolve.py         |    2 ++
  4 files changed, 7 insertions(+), 1 deletion(-)
 
-Index: yum-3.2.18/rpmUtils/arch.py
-===================================================================
---- yum-3.2.18.orig/rpmUtils/arch.py	2008-06-17 14:05:42.000000000 +0100
-+++ yum-3.2.18/rpmUtils/arch.py	2008-09-01 15:47:11.000000000 +0100
-@@ -275,6 +275,7 @@
-     return arch
-         
- def getCanonArch(skipRpmPlatform = 0):
-+    return "arm"
-     if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
-         try:
-             f = open("/etc/rpm/platform", "r")
-@@ -331,6 +332,8 @@
-        base arch is the arch before noarch in the arches dict if myarch is not
-        a key in the multilibArches."""
- 
-+    return "arm"
-+
-     if not myarch:
-         myarch = canonArch
- 
 Index: yum-3.2.18/rpmUtils/transaction.py
 ===================================================================
 --- yum-3.2.18.orig/rpmUtils/transaction.py	2008-06-17 14:05:42.000000000 +0100
diff --git a/packages/yum/yum-native_3.2.18.bb b/packages/yum/yum-native_3.2.18.bb
index 60dafe3..679f8e9 100644
--- a/packages/yum/yum-native_3.2.18.bb
+++ b/packages/yum/yum-native_3.2.18.bb
@@ -5,7 +5,7 @@ SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://paths.patch;patch=1 \
 	   file://yum-install-recommends.py \
 	   file://extract-postinst.awk"
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
 
diff --git a/packages/yum/yum_3.2.18.bb b/packages/yum/yum_3.2.18.bb
index 67e9ad7..7d34097 100644
--- a/packages/yum/yum_3.2.18.bb
+++ b/packages/yum/yum_3.2.18.bb
@@ -1,4 +1,5 @@
 HOMEPAGE = "http://linux.duke.edu/projects/yum/"
+PR = "r1"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://hacks.patch;patch=1 \
-- 
1.6.1.3

Re: [PATCH 26/70] yum: do not hardcode arm architecture - rootfs_rpm provide arch info (from Poky)

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 2743 bytes --]

On Wednesday 04 March 2009 07:52:41 Marcin Juszkiewicz wrote:
> From: Marcin Juszkiewicz <hrw@openedhand.com>
>
> git-svn-id: https://svn.o-hand.com/repos/poky@5392
> 311d38ba-8fff-0310-9ca6-ca027cbcb966 ---
>  packages/yum/files/hacks.patch    |   21 ---------------------
>  packages/yum/yum-native_3.2.18.bb |    2 +-
>  packages/yum/yum_3.2.18.bb        |    1 +
>  3 files changed, 2 insertions(+), 22 deletions(-)
>
> diff --git a/packages/yum/files/hacks.patch
> b/packages/yum/files/hacks.patch index d0232ec..ac8445f 100644
> --- a/packages/yum/files/hacks.patch
> +++ b/packages/yum/files/hacks.patch
> @@ -5,27 +5,6 @@
>   yum/depsolve.py         |    2 ++
>   4 files changed, 7 insertions(+), 1 deletion(-)
>
> -Index: yum-3.2.18/rpmUtils/arch.py
> -===================================================================
> ---- yum-3.2.18.orig/rpmUtils/arch.py	2008-06-17 14:05:42.000000000 +0100
> -+++ yum-3.2.18/rpmUtils/arch.py	2008-09-01 15:47:11.000000000 +0100
> -@@ -275,6 +275,7 @@
> -     return arch
> -
> - def getCanonArch(skipRpmPlatform = 0):
> -+    return "arm"
> -     if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
> -         try:
> -             f = open("/etc/rpm/platform", "r")
> -@@ -331,6 +332,8 @@
> -        base arch is the arch before noarch in the arches dict if myarch
> is not -        a key in the multilibArches."""
> -
> -+    return "arm"
> -+
> -     if not myarch:
> -         myarch = canonArch
> -
>  Index: yum-3.2.18/rpmUtils/transaction.py
>  ===================================================================
>  --- yum-3.2.18.orig/rpmUtils/transaction.py	2008-06-17 14:05:42.000000000
> +0100 diff --git a/packages/yum/yum-native_3.2.18.bb
> b/packages/yum/yum-native_3.2.18.bb index 60dafe3..679f8e9 100644
> --- a/packages/yum/yum-native_3.2.18.bb
> +++ b/packages/yum/yum-native_3.2.18.bb
> @@ -5,7 +5,7 @@ SRC_URI =
> "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
> file://paths.patch;patch=1 \
>  	   file://yum-install-recommends.py \
>  	   file://extract-postinst.awk"
> -PR = "r5"
> +PR = "r6"
>
>  DEPENDS = "rpm-native python-native python-iniparse-native
> python-urlgrabber-native yum-metadata-parser-native libxml2-native"
>
> diff --git a/packages/yum/yum_3.2.18.bb b/packages/yum/yum_3.2.18.bb
> index 67e9ad7..7d34097 100644
> --- a/packages/yum/yum_3.2.18.bb
> +++ b/packages/yum/yum_3.2.18.bb
> @@ -1,4 +1,5 @@
>  HOMEPAGE = "http://linux.duke.edu/projects/yum/"
> +PR = "r1"
>
>  SRC_URI =
> "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
> file://hacks.patch;patch=1 \

ah this invalidates my comment to patch 18/70
-- 
Khem Raj

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 204 bytes --]

[PATCH 27/70] yum: Don't apply hacks.patch, its only needed for the native version (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5395 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/yum_3.2.18.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/packages/yum/yum_3.2.18.bb b/packages/yum/yum_3.2.18.bb
index 7d34097..9770a4e 100644
--- a/packages/yum/yum_3.2.18.bb
+++ b/packages/yum/yum_3.2.18.bb
@@ -1,8 +1,7 @@
 HOMEPAGE = "http://linux.duke.edu/projects/yum/"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
-           file://hacks.patch;patch=1 \
            file://paths.patch;patch=1 \
 	   file://yum-install-recommends.py \
 	   file://extract-postinst.awk"
-- 
1.6.1.3

[PATCH 28/70] yum-native: Fix hacks.patch to handle architecture detection issues (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5396 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/files/hacks.patch    |   36 +++++++++++++++++++++++++++++++++---
 packages/yum/yum-native_3.2.18.bb |    2 +-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/packages/yum/files/hacks.patch b/packages/yum/files/hacks.patch
index ac8445f..61f4771 100644
--- a/packages/yum/files/hacks.patch
+++ b/packages/yum/files/hacks.patch
@@ -5,10 +5,40 @@
  yum/depsolve.py         |    2 ++
  4 files changed, 7 insertions(+), 1 deletion(-)
 
+Index: yum-3.2.18/rpmUtils/arch.py
+===================================================================
+--- yum-3.2.18.orig/rpmUtils/arch.py	2008-06-17 14:05:42.000000000 +0100
++++ yum-3.2.18/rpmUtils/arch.py	2008-10-02 22:09:19.000000000 +0100
+@@ -275,6 +275,12 @@
+     return arch
+         
+ def getCanonArch(skipRpmPlatform = 0):
++    import os
++    if 'YUM_ARCH_FORCE' in os.environ:
++        return os.environ['YUM_ARCH_FORCE']
++
++    sys.exit(1)
++
+     if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
+         try:
+             f = open("/etc/rpm/platform", "r")
+@@ -331,6 +338,12 @@
+        base arch is the arch before noarch in the arches dict if myarch is not
+        a key in the multilibArches."""
+ 
++    import os
++    if 'YUM_ARCH_FORCE' in os.environ:
++        return os.environ['YUM_ARCH_FORCE']
++
++    sys.exit(1)
++
+     if not myarch:
+         myarch = canonArch
+ 
 Index: yum-3.2.18/rpmUtils/transaction.py
 ===================================================================
 --- yum-3.2.18.orig/rpmUtils/transaction.py	2008-06-17 14:05:42.000000000 +0100
-+++ yum-3.2.18/rpmUtils/transaction.py	2008-09-03 17:55:27.000000000 +0100
++++ yum-3.2.18/rpmUtils/transaction.py	2008-10-02 17:09:57.000000000 +0100
 @@ -43,6 +43,7 @@
                           'clean']
          self.tsflags = []
@@ -20,7 +50,7 @@ Index: yum-3.2.18/rpmUtils/transaction.py
 Index: yum-3.2.18/yum/constants.py
 ===================================================================
 --- yum-3.2.18.orig/yum/constants.py	2008-07-21 16:56:54.000000000 +0100
-+++ yum-3.2.18/yum/constants.py	2008-09-01 15:47:11.000000000 +0100
++++ yum-3.2.18/yum/constants.py	2008-10-02 17:09:57.000000000 +0100
 @@ -17,7 +17,7 @@
  """
  
@@ -33,7 +63,7 @@ Index: yum-3.2.18/yum/constants.py
 Index: yum-3.2.18/yum/depsolve.py
 ===================================================================
 --- yum-3.2.18.orig/yum/depsolve.py	2008-08-06 17:05:16.000000000 +0100
-+++ yum-3.2.18/yum/depsolve.py	2008-09-03 21:05:52.000000000 +0100
++++ yum-3.2.18/yum/depsolve.py	2008-10-02 17:09:57.000000000 +0100
 @@ -141,9 +141,14 @@
              else:
                  self.logger.critical(_('Invalid tsflag in config file: %s'), flag)
diff --git a/packages/yum/yum-native_3.2.18.bb b/packages/yum/yum-native_3.2.18.bb
index 679f8e9..f4dc87e 100644
--- a/packages/yum/yum-native_3.2.18.bb
+++ b/packages/yum/yum-native_3.2.18.bb
@@ -5,7 +5,7 @@ SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://paths.patch;patch=1 \
 	   file://yum-install-recommends.py \
 	   file://extract-postinst.awk"
-PR = "r6"
+PR = "r7"
 
 DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
 
-- 
1.6.1.3

[PATCH 29/70] yum: fixed packaging (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5426 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/files/fix          |   18 +++++++++++++++++
 packages/yum/files/paths.patch  |   40 +++++++++++++++++++++++---------------
 packages/yum/files/paths2.patch |   33 ++++++++++++++++++++++++++++++++
 packages/yum/yum_3.2.18.bb      |    8 +++++-
 4 files changed, 81 insertions(+), 18 deletions(-)
 create mode 100644 packages/yum/files/fix
 create mode 100644 packages/yum/files/paths2.patch

diff --git a/packages/yum/files/fix b/packages/yum/files/fix
new file mode 100644
index 0000000..bcb3301
--- /dev/null
+++ b/packages/yum/files/fix
@@ -0,0 +1,18 @@
+---
+ rpmUtils/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- yum-3.2.18.orig/rpmUtils/Makefile
++++ yum-3.2.18/rpmUtils/Makefile
+@@ -1,10 +1,10 @@
+ PYTHON=python
+ PACKAGE = $(shell basename `pwd`)
+ PYFILES = $(wildcard *.py)
+ PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
+-PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
++PYSYSDIR := /usr
+ PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
+ PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
+ 
+ all: 
+ 	echo "Nothing to do"
diff --git a/packages/yum/files/paths.patch b/packages/yum/files/paths.patch
index ee5c999..55e6a0a 100644
--- a/packages/yum/files/paths.patch
+++ b/packages/yum/files/paths.patch
@@ -1,8 +1,14 @@
-Index: yum-3.2.18/Makefile
-===================================================================
---- yum-3.2.18.orig/Makefile	2008-08-23 09:13:56.000000000 +0100
-+++ yum-3.2.18/Makefile	2008-08-23 09:18:09.000000000 +0100
-@@ -18,19 +18,19 @@
+---
+ Makefile      |   18 +++++++++---------
+ docs/Makefile |   12 ++++++------
+ etc/Makefile  |   20 ++++++++++----------
+ 3 files changed, 25 insertions(+), 25 deletions(-)
+
+--- yum-3.2.18.orig/Makefile
++++ yum-3.2.18/Makefile
+@@ -16,23 +16,23 @@ clean:
+ 
+ subdirs:
  	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) -C $$d; [ $$? = 0 ] || exit 1 ; done
  
  install:
@@ -27,15 +33,17 @@ Index: yum-3.2.18/Makefile
 -	mkdir -p $(DESTDIR)/var/cache/yum
 -	mkdir -p $(DESTDIR)/var/lib/yum	
 +	mkdir -p $(DESTDIR)$(localstatedir)/cache/yum
-+	mkdir -p $(DESTDIR)$(localstatedir)/lib/yum	
++	mkdir -p $(DESTDIR)$(localstatedir)/lib/yum
  
  	for d in $(SUBDIRS); do make PYTHON=$(PYTHON) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
  
-Index: yum-3.2.18/docs/Makefile
-===================================================================
---- yum-3.2.18.orig/docs/Makefile	2008-08-23 09:19:07.000000000 +0100
-+++ yum-3.2.18/docs/Makefile	2008-08-23 09:19:37.000000000 +0100
-@@ -6,9 +6,9 @@
+ .PHONY: docs test
+ 
+--- yum-3.2.18.orig/docs/Makefile
++++ yum-3.2.18/docs/Makefile
+@@ -4,11 +4,11 @@ all:
+ clean:
+ 	rm -f *.pyc *.pyo *~
  	rm -fr epydoc
  
  install:
@@ -51,11 +59,11 @@ Index: yum-3.2.18/docs/Makefile
 +	install -m 644 yum.conf.5 $(DESTDIR)$(mandir)/man5/yum.conf.5
 +	install -m 644 yum-updatesd.8 $(DESTDIR)$(mandir)/man8/yum-updatesd.8
 +	install -m 644 yum-updatesd.conf.5 $(DESTDIR)$(mandir)/man5/yum-updatesd.conf.5
-Index: yum-3.2.18/etc/Makefile
-===================================================================
---- yum-3.2.18.orig/etc/Makefile	2008-08-23 09:19:51.000000000 +0100
-+++ yum-3.2.18/etc/Makefile	2008-08-23 09:20:28.000000000 +0100
-@@ -5,20 +5,20 @@
+--- yum-3.2.18.orig/etc/Makefile
++++ yum-3.2.18/etc/Makefile
+@@ -3,22 +3,22 @@ all:
+ 
+ clean:
  	rm -f *.pyc *.pyo *~
  
  install:
diff --git a/packages/yum/files/paths2.patch b/packages/yum/files/paths2.patch
new file mode 100644
index 0000000..08c9c83
--- /dev/null
+++ b/packages/yum/files/paths2.patch
@@ -0,0 +1,33 @@
+---
+ rpmUtils/Makefile |    2 +-
+ yum/Makefile      |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- yum-3.2.18.orig/rpmUtils/Makefile
++++ yum-3.2.18/rpmUtils/Makefile
+@@ -1,10 +1,10 @@
+ PYTHON=python
+ PACKAGE = $(shell basename `pwd`)
+ PYFILES = $(wildcard *.py)
+ PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
+-PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
++PYSYSDIR = /usr
+ PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
+ PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
+ 
+ all: 
+ 	echo "Nothing to do"
+--- yum-3.2.18.orig/yum/Makefile
++++ yum-3.2.18/yum/Makefile
+@@ -1,10 +1,10 @@
+ PYTHON=python
+ PACKAGE = $(shell basename `pwd`)
+ PYFILES = $(wildcard *.py)
+ PYVER := $(shell $(PYTHON) -c 'import sys; print "%.3s" %(sys.version)')
+-PYSYSDIR := $(shell $(PYTHON) -c 'import sys; print sys.prefix')
++PYSYSDIR = /usr
+ PYLIBDIR = $(PYSYSDIR)/lib/python$(PYVER)
+ PKGDIR = $(PYLIBDIR)/site-packages/$(PACKAGE)
+ 
+ all: 
+ 	echo "Nothing to do"
diff --git a/packages/yum/yum_3.2.18.bb b/packages/yum/yum_3.2.18.bb
index 9770a4e..4c68803 100644
--- a/packages/yum/yum_3.2.18.bb
+++ b/packages/yum/yum_3.2.18.bb
@@ -1,12 +1,14 @@
 HOMEPAGE = "http://linux.duke.edu/projects/yum/"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://paths.patch;patch=1 \
+           file://paths2.patch;patch=1 \
 	   file://yum-install-recommends.py \
 	   file://extract-postinst.awk"
 
-DEPENDS = "rpm python python-iniparse python-urlgrabber yum-metadata-parser libxml2"
+DEPENDS = "python"
+RDEPENDS = "rpm python-core python-iniparse python-urlgrabber yum-metadata-parser"
 
 S = "${WORKDIR}/yum-${PV}"
 
@@ -22,3 +24,5 @@ do_install_append () {
 	install ${WORKDIR}/extract-postinst.awk ${D}${bindir}/
 	install ${WORKDIR}/yum-install-recommends.py ${D}${bindir}/
 }
+
+FILES_${PN} += "${libdir}/python* ${datadir}/yum-cli"
-- 
1.6.1.3

Re: [PATCH 29/70] yum: fixed packaging (from Poky)

[Michael 'Mickey' Lauer]

Am Mittwoch, den 04.03.2009, 16:52 +0100 schrieb Marcin Juszkiewicz:
> ++PYSYSDIR = /usr

Might not want to hardcode that. Compute ${prefix} instead.

-- 
:M:

[PATCH 30/70] yum: added all required Python modules to dependencies (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5427 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/yum/yum_3.2.18.bb |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/yum/yum_3.2.18.bb b/packages/yum/yum_3.2.18.bb
index 4c68803..d8888d0 100644
--- a/packages/yum/yum_3.2.18.bb
+++ b/packages/yum/yum_3.2.18.bb
@@ -1,5 +1,5 @@
 HOMEPAGE = "http://linux.duke.edu/projects/yum/"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://paths.patch;patch=1 \
@@ -7,8 +7,12 @@ SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
 	   file://yum-install-recommends.py \
 	   file://extract-postinst.awk"
 
-DEPENDS = "python"
-RDEPENDS = "rpm python-core python-iniparse python-urlgrabber yum-metadata-parser"
+RDEPENDS = "python-rpm python-core python-iniparse python-urlgrabber \
+            python-shell python-re python-logging python-pickle \
+	    python-netserver python-compression \
+	    python-bzip2 python-unixadmin python-xml python-sqlite3 \
+	    python-textutils python-fcntl python-email \
+	    yum-metadata-parser"
 
 S = "${WORKDIR}/yum-${PV}"
 
-- 
1.6.1.3

[PATCH 31/70] fakechroot: fix duplicated readlink (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5115 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/fakechroot/fakechroot-native_2.5.bb |    2 +-
 packages/fakechroot/fakechroot_2.5.bb        |    3 +-
 packages/fakechroot/files/fix-readlink.patch |   32 ++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 packages/fakechroot/files/fix-readlink.patch

diff --git a/packages/fakechroot/fakechroot-native_2.5.bb b/packages/fakechroot/fakechroot-native_2.5.bb
index efd41c7..8cb88bd 100644
--- a/packages/fakechroot/fakechroot-native_2.5.bb
+++ b/packages/fakechroot/fakechroot-native_2.5.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-PR = "r0"
+PR = "r1"
 require fakechroot_${PV}.bb
 inherit native
 
diff --git a/packages/fakechroot/fakechroot_2.5.bb b/packages/fakechroot/fakechroot_2.5.bb
index c791512..dfe9077 100644
--- a/packages/fakechroot/fakechroot_2.5.bb
+++ b/packages/fakechroot/fakechroot_2.5.bb
@@ -2,6 +2,7 @@ SECTION = "base"
 DESCRIPTION = "Gives a fake root environment which can support chroot"
 LICENSE = "GPL"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/f/fakechroot/fakechroot_${PV}.orig.tar.gz \
+           file://fix-readlink.patch;patch=1"
 
 inherit autotools
diff --git a/packages/fakechroot/files/fix-readlink.patch b/packages/fakechroot/files/fix-readlink.patch
new file mode 100644
index 0000000..f218956
--- /dev/null
+++ b/packages/fakechroot/files/fix-readlink.patch
@@ -0,0 +1,32 @@
+---
+ src/libfakechroot.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- fakechroot-2.5.orig/src/libfakechroot.c
++++ fakechroot-2.5/src/libfakechroot.c
+@@ -596,11 +596,11 @@ void fakechroot_init (void)
+     nextsym(open64, "open64");
+ #if !defined(HAVE___OPENDIR2)
+     nextsym(opendir, "opendir");
+ #endif
+     nextsym(pathconf, "pathconf");
+-    nextsym(readlink, "readlink");
++    nextsym(readlink, "own_readlink");
+     nextsym(realpath, "realpath");
+     nextsym(remove, "remove");
+ #ifdef HAVE_REMOVEXATTR
+     nextsym(removexattr, "removexattr");
+ #endif
+@@ -1864,11 +1864,11 @@ long pathconf (const char *path, int nam
+     return next_pathconf(path, name);
+ }
+ 
+ 
+ /* #include <unistd.h> */
+-int readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
++int own_readlink (const char *path, char *buf, READLINK_TYPE_ARG3)
+ {
+     int status;
+     char tmp[FAKECHROOT_MAXPATH], *tmpptr;
+     char *fakechroot_path, *fakechroot_ptr, fakechroot_buf[FAKECHROOT_MAXPATH];
+ 
-- 
1.6.1.3

[PATCH 32/70] package_rpm.bbclass: Update against recent packaging changes and start to implement dependency handling. (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5067 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |   76 ++++++++++++++++++++++++++++++------------
 1 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index f0055a1..7c69063 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -1,9 +1,14 @@
 inherit package
-inherit rpm_core
 
 RPMBUILD="rpmbuild --short-circuit ${RPMOPTS}"
 IMAGE_PKGTYPE ?= "rpm"
 
+RPMBUILDPATH="${WORKDIR}/rpm"
+
+RPMOPTS="--rcfile=${WORKDIR}/rpmrc"
+RPMOPTS="--rcfile=${WORKDIR}/rpmrc --target ${TARGET_SYS}"
+RPM="rpm ${RPMOPTS}"
+
 python write_specfile() {
 	from bb import data, build
 	import sys
@@ -56,7 +61,13 @@ python write_specfile() {
 	for var in out_vartranslate.keys():
 		if out_vartranslate[var][0] == "%":
 			continue
-		fd.write("%s\t: %s\n" % (out_vartranslate[var], bb.data.getVar(var, d)))
+		val = bb.data.getVar(var, d, 1)
+		if var == "RDEPENDS":
+			val = val.split()[0]
+		fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
+	rdepends = " ".join(bb.utils.explode_deps(bb.data.getVar('RDEPENDS', d, True)))
+	if rdepends:
+		fd.write("Requires: %s\n" % rdepends)
         fd.write("Release\t: %s\n" % bb.data.expand('${PR}${DISTRO_PR}', d, True)
 	fd.write("Summary\t: .\n")
 
@@ -74,6 +85,8 @@ python write_specfile() {
 
 	# call out rpm -bb on the .spec, thereby creating an rpm
 
+	bb.note(bb.data.expand("${RPMBUILD} -bb ${OUTSPECFILE}", d))
+
 	bb.data.setVar('BUILDSPEC', "${RPMBUILD} -bb ${OUTSPECFILE}\n", d)
 	bb.data.setVarFlag('BUILDSPEC', 'func', '1', d)
 	bb.build.exec_func('BUILDSPEC', d)
@@ -84,51 +97,69 @@ python write_specfile() {
 	bb.movefile(rpm, outrpm)
 }
 
+rpm_prep() {
+	if [ ! -e ${WORKDIR}/rpmrc ]; then
+		mkdir -p ${RPMBUILDPATH}/{SPECS,RPMS/{i386,i586,i686,noarch,ppc,mips,mipsel,arm},SRPMS,SOURCES,BUILD}
+		echo 'macrofiles:/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
+		echo '%_topdir ${RPMBUILDPATH}' > ${WORKDIR}/macros
+		echo '%_repackage_dir ${WORKDIR}' >> ${WORKDIR}/macros
+	fi
+}
+
 python do_package_rpm () {
-	workdir = bb.data.getVar('WORKDIR', d)
+	workdir = bb.data.getVar('WORKDIR', d, 1)
 	if not workdir:
-		raise bb.build.FuncFailed("WORKDIR not defined")
-	workdir = bb.data.expand(workdir, d)
+		bb.error("WORKDIR not defined, unable to package")
+		return
 
 	import os # path manipulations
-	outdir = bb.data.getVar('DEPLOY_DIR_RPM', d)
+	outdir = bb.data.getVar('DEPLOY_DIR_RPM', d, 1)
 	if not outdir:
-		raise bb.build.FuncFailed("DEPLOY_DIR_RPM not defined")
-	outdir = bb.data.expand(outdir, d)
+		bb.error("DEPLOY_DIR_RPM not defined, unable to package")
+		return
 	bb.mkdirhier(outdir)
 
-	packages = bb.data.getVar('PACKAGES', d)
+	packages = bb.data.getVar('PACKAGES', d, 1)
 	if not packages:
-		packages = "${PN}"
-		bb.data.setVar('FILES', '', d)
-		ddir = bb.data.expand(bb.data.getVar('D', d), d)
-		bb.mkdirhier(ddir)
-		bb.data.setVar(bb.data.expand('FILES_${PN}', d), ''.join([ "./%s" % x for x in os.listdir(ddir)]), d)
-	packages = bb.data.expand(packages, d)
+		bb.debug(1, "PACKAGES not defined, nothing to package")
+		return
+
+	if packages == []:
+		bb.debug(1, "No packages; nothing to do")
+		return
+
+	# If "rpm" comes into overrides the presence of this function causes problems.
+	# Since we don't need it, remove it for now - hacky.
+	bb.data.delVar("do_package_write_rpm", d)
 
 	for pkg in packages.split():
 		localdata = bb.data.createCopy(d)
-		root = "%s/install/%s" % (workdir, pkg)
+		pkgdest = bb.data.getVar('PKGDEST', d, 1)
+		root = "%s/%s" % (pkgdest, pkg)
+
+		lf = bb.utils.lockfile(root + ".lock")
 
 		bb.data.setVar('ROOT', '', localdata)
 		bb.data.setVar('ROOT_%s' % pkg, root, localdata)
-		bb.data.setVar('PKG', pkg, localdata)
+		pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1)
+		if not pkgname:
+			pkgname = pkg
+		bb.data.setVar('PKG', pkgname, localdata)
 
 		overrides = bb.data.getVar('OVERRIDES', localdata)
 		if not overrides:
 			raise bb.build.FuncFailed('OVERRIDES not defined')
 		overrides = bb.data.expand(overrides, localdata)
-		bb.data.setVar('OVERRIDES', '%s:%s' % (overrides, pkg), localdata)
+		bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
 
 		bb.data.update_data(localdata)
 
-		root = bb.data.getVar('ROOT', localdata)
-		basedir = os.path.dirname(root)
+		basedir = os.path.join(os.path.dirname(root))
 		pkgoutdir = outdir
 		bb.mkdirhier(pkgoutdir)
 		bb.data.setVar('OUTSPECFILE', os.path.join(workdir, "%s.spec" % pkg), localdata)
 		bb.build.exec_func('write_specfile', localdata)
-		del localdata
+		bb.utils.unlockfile(lf)
 }
 
 python () {
@@ -143,7 +174,8 @@ python () {
 
 python do_package_write_rpm () {
 	bb.build.exec_func("read_subpackage_metadata", d)
+	bb.build.exec_func("rpm_prep", d)
 	bb.build.exec_func("do_package_rpm", d)
 }
 do_package_write_rpm[dirs] = "${D}"
-addtask package_write_rpm before do_build after do_package
+addtask package_write_rpm before do_package_write after do_package
-- 
1.6.1.3

[PATCH 33/70] Add rootfs_rpm.bbclass, a start at image generation from rpms. Its not expected to be entirely functional yet. (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5101 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |  148 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 148 insertions(+), 0 deletions(-)
 create mode 100644 classes/rootfs_rpm.bbclass

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
new file mode 100644
index 0000000..83ceccf
--- /dev/null
+++ b/classes/rootfs_rpm.bbclass
@@ -0,0 +1,148 @@
+#
+# Creates a root filesystem out of rpm packages
+#
+
+ROOTFS_PKGMANAGE = "opkg" 
+# "rpm" "yum"
+ROOTFS_PKGMANAGE_BOOTSTRAP  = "run-postinsts"
+
+do_rootfs[depends] += "rpm-native:do_populate_staging yum-native:do_populate_staging createrepo-native:do_populate_staging fakechroot-native:do_populate_staging"
+do_rootfs[recrdeptask] += "do_package_write_rpm"
+
+YUMCONF = "${IMAGE_ROOTFS}/etc/yum.conf"
+YUMARGS = "-c ${YUMCONF} --installroot ${IMAGE_ROOTFS}"
+
+fakeroot rootfs_rpm_do_rootfs () {
+	set -x
+
+	# Update the repository index
+	createrepo ${DEPLOY_DIR_RPM}
+
+	mkdir -p ${IMAGE_ROOTFS}/etc/rpm/
+	#echo "arm" > ${IMAGE_ROOTFS}/etc/rpm/platform
+
+	# Copy the packages into the target image
+	# Ugly ugly ugly but rpm is braindead and can't see outside the chroot 
+	# when installing :(
+	mkdir -p ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}
+	cp -r ${DEPLOY_DIR_RPM}/* ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}/
+
+	# Generate an apprpriate yum.conf
+	rm -rf ${YUMCONF}
+	cat > ${YUMCONF} << EOF
+[main]
+cachedir=/var/cache2/yum
+keepcache=1
+debuglevel=10
+logfile=/var/log2/yum.log
+exactarch=0
+obsoletes=1
+tolerant=1
+arch=arm
+basearch=arm
+
+[poky-feed]
+name = Poky RPM Feed
+baseurl=file://${DEPLOY_DIR_RPM}
+gpgcheck=0
+
+EOF
+	#mkdir -p ${IMAGE_ROOTFS}/var/lib/rpm
+	#rpm --root ${IMAGE_ROOTFS} --initdb
+	#rpm --root ${IMAGE_ROOTFS} --dbpath ${IMAGE_ROOTFS}/var/lib/rpm -ihv --nodeps --ignoreos  
+	#rpm -ihv --root ${IMAGE_ROOTFS} ${PACKAGE_INSTALL}
+
+	#package_update_index_rpm
+	#package_generate_ipkg_conf
+
+	# Uclibc builds don't provide this stuff...
+	if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then 
+		if [ ! -z "${LINGUAS_INSTALL}" ]; then
+			for i in ${LINGUAS_INSTALL}; do
+				fakechroot yum ${YUMARGS} -y install $i 
+			done
+		fi
+	fi
+	if [ ! -z "${PACKAGE_INSTALL}" ]; then
+		fakechroot yum ${YUMARGS} -y install ${PACKAGE_INSTALL}
+	fi
+
+	#export D=${IMAGE_ROOTFS}
+	#export OFFLINE_ROOT=${IMAGE_ROOTFS}
+	#export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
+	#export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT}
+
+	#mkdir -p ${IMAGE_ROOTFS}/etc/opkg/
+	#grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}/etc/opkg/arch.conf
+
+	${ROOTFS_POSTINSTALL_COMMAND}
+	
+	#for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do
+	#	if [ -f $i ] && ! sh $i; then
+	#		opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst`
+	#	fi
+	#done
+	#for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.postinst; do
+	#	if [ -f $i ] && ! sh $i configure; then
+	#		opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
+	#	fi
+	#done
+
+	install -d ${IMAGE_ROOTFS}/${sysconfdir}
+	echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
+
+	${ROOTFS_POSTPROCESS_COMMAND}
+	
+	rm -rf ${IMAGE_ROOTFS}/var/cache2/
+	rm -rf ${IMAGE_ROOTFS}/var/run2/
+	rm -rf ${IMAGE_ROOTFS}/var/log2/
+
+	log_check rootfs 	
+}
+
+rootfs_rpm_log_check() {
+	target="$1"
+        lf_path="$2"
+
+	lf_txt="`cat $lf_path`"
+	for keyword_die in "Cannot find package" "exit 1" ERR Fail
+	do				
+		if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
+		then
+			echo "log_check: There were error messages in the logfile"
+			echo -e "log_check: Matched keyword: [$keyword_die]\n"
+			echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
+			echo ""
+			do_exit=1				
+		fi
+	done
+	test "$do_exit" = 1 && exit 1
+	true
+}
+
+remove_packaging_data_files() {
+	rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg/
+}
+
+install_all_locales() {
+
+    PACKAGES_TO_INSTALL=""
+
+	INSTALLED_PACKAGES=`grep ^Package: ${IMAGE_ROOTFS}${libdir}/opkg/status |sed "s/^Package: //"|egrep -v -- "(-locale-|-dev$|-doc$|^kernel|^glibc|^ttf|^task|^perl|^python)"`
+
+    for pkg in $INSTALLED_PACKAGES
+    do
+        for lang in ${IMAGE_LOCALES}
+        do
+            if [ `opkg-cl ${IPKG_ARGS} info $pkg-locale-$lang | wc -l` -gt 2 ]
+            then
+                    PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL $pkg-locale-$lang"
+            fi
+        done
+    done
+    if [ "$PACKAGES_TO_INSTALL" != "" ]
+    then
+        opkg-cl ${IPKG_ARGS} install $PACKAGES_TO_INSTALL
+    fi
+}
+
-- 
1.6.1.3

Re: [PATCH 33/70] Add rootfs_rpm.bbclass, a start at image generation from rpms. Its not expected to be entirely functional yet. (from Poky)

[Tom Rini]

On Wed, Mar 04, 2009 at 04:52:48PM +0100, Marcin Juszkiewicz wrote:

> From: Richard Purdie <richard@openedhand.com>
> 
> git-svn-id: https://svn.o-hand.com/repos/poky@5101 311d38ba-8fff-0310-9ca6-ca027cbcb966
> ---
>  classes/rootfs_rpm.bbclass |  148 ++++++++++++++++++++++++++++++++++++++++++++

There's a 'poky' references here that should either be dropped or made
into ${DISTRO}:

[snip]
> +[poky-feed]
> +name = Poky RPM Feed

-- 
Tom Rini

Re: [PATCH 33/70] Add rootfs_rpm.bbclass, a start at image generation from rpms. Its not expected to be entirely functional yet. (from Poky)

[Tom Rini]

On Wed, Mar 04, 2009 at 04:52:48PM +0100, Marcin Juszkiewicz wrote:

[snip]
> +	#mkdir -p ${IMAGE_ROOTFS}/var/lib/rpm
> +	#rpm --root ${IMAGE_ROOTFS} --initdb
> +	#rpm --root ${IMAGE_ROOTFS} --dbpath ${IMAGE_ROOTFS}/var/lib/rpm -ihv --nodeps --ignoreos  
> +	#rpm -ihv --root ${IMAGE_ROOTFS} ${PACKAGE_INSTALL}
> +
> +	#package_update_index_rpm
> +	#package_generate_ipkg_conf
[snip]
> +	#export D=${IMAGE_ROOTFS}
> +	#export OFFLINE_ROOT=${IMAGE_ROOTFS}
> +	#export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
> +	#export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT}
> +
> +	#mkdir -p ${IMAGE_ROOTFS}/etc/opkg/
> +	#grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}/etc/opkg/arch.conf

These commented out items are never deleted, but seem like they should
be.

-- 
Tom Rini

[PATCH 34/70] rootfs_rpm.bbclass: ship rpm and yum in target images (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5380 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index 83ceccf..7e969a7 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -2,8 +2,8 @@
 # Creates a root filesystem out of rpm packages
 #
 
-ROOTFS_PKGMANAGE = "opkg" 
-# "rpm" "yum"
+ROOTFS_PKGMANAGE = "rpm yum" 
+
 ROOTFS_PKGMANAGE_BOOTSTRAP  = "run-postinsts"
 
 do_rootfs[depends] += "rpm-native:do_populate_staging yum-native:do_populate_staging createrepo-native:do_populate_staging fakechroot-native:do_populate_staging"
-- 
1.6.1.3

[PATCH 35/70] package_rpm.bbclass: Fix empty package handling, handle package dependency renaming by adding a missing function call and expand RPMBUILD before changing the dictonary so local PV/PR changes don't break the WORKDIR variable expansion (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5100 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 7c69063..0b93266 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -43,7 +43,7 @@ python write_specfile() {
 			del files[files.index(r)]
 		except ValueError:
 			pass
-	if not files:
+	if not files and bb.data.getVar('ALLOW_EMPTY', d) != "1":
 		from bb import note
 		note("Not creating empty archive for %s" % (bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}', d, True))
 		return
@@ -62,10 +62,11 @@ python write_specfile() {
 		if out_vartranslate[var][0] == "%":
 			continue
 		val = bb.data.getVar(var, d, 1)
-		if var == "RDEPENDS":
-			val = val.split()[0]
 		fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
-	rdepends = " ".join(bb.utils.explode_deps(bb.data.getVar('RDEPENDS', d, True)))
+
+	bb.build.exec_func("mapping_rename_hook", d)
+	rdepends = " ".join(bb.utils.explode_deps(bb.data.getVar('RDEPENDS', d, True) or ""))
+
 	if rdepends:
 		fd.write("Requires: %s\n" % rdepends)
         fd.write("Release\t: %s\n" % bb.data.expand('${PR}${DISTRO_PR}', d, True)
@@ -158,6 +159,9 @@ python do_package_rpm () {
 		pkgoutdir = outdir
 		bb.mkdirhier(pkgoutdir)
 		bb.data.setVar('OUTSPECFILE', os.path.join(workdir, "%s.spec" % pkg), localdata)
+		# Save the value of RPMBUILD expanded into the new dictonary so any 
+		# changes in the compoents that make up workdir don't break packaging
+		bb.data.setVar('RPMBUILD', bb.data.getVar("RPMBUILD", d, True), localdata)
 		bb.build.exec_func('write_specfile', localdata)
 		bb.utils.unlockfile(lf)
 }
-- 
1.6.1.3

[PATCH 36/70] package_rpm.bbclass: Stop autogenerated dependencies for now, its not functioning correctly (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5111 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 0b93266..fad02f5 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -64,6 +64,8 @@ python write_specfile() {
 		val = bb.data.getVar(var, d, 1)
 		fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
 
+	fd.write("AutoReqProv: no\n")
+
 	bb.build.exec_func("mapping_rename_hook", d)
 	rdepends = " ".join(bb.utils.explode_deps(bb.data.getVar('RDEPENDS', d, True) or ""))
 
-- 
1.6.1.3

Re: [PATCH 36/70] package_rpm.bbclass: Stop autogenerated dependencies for now, its not functioning correctly (from Poky)

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 898 bytes --]

On Wednesday 04 March 2009 07:52:51 Marcin Juszkiewicz wrote:
> From: Richard Purdie <richard@openedhand.com>
>
> git-svn-id: https://svn.o-hand.com/repos/poky@5111
> 311d38ba-8fff-0310-9ca6-ca027cbcb966 ---
>  classes/package_rpm.bbclass |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
> index 0b93266..fad02f5 100644
> --- a/classes/package_rpm.bbclass
> +++ b/classes/package_rpm.bbclass
> @@ -64,6 +64,8 @@ python write_specfile() {
>  		val = bb.data.getVar(var, d, 1)
>  		fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
>
> +	fd.write("AutoReqProv: no\n")
> +

may be a comment stating reason would be nice here.

>  	bb.build.exec_func("mapping_rename_hook", d)
>  	rdepends = " ".join(bb.utils.explode_deps(bb.data.getVar('RDEPENDS', d,
> True) or ""))

-- 
Khem Raj

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 204 bytes --]

[PATCH 37/70] package_rpm.bbclass: files needs to start from / (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5116 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index fad02f5..e1398d2 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -82,6 +82,8 @@ python write_specfile() {
 
 	fd.write("%files\n")
 	for file in files:
+		if file[0] != '/':
+			fd.write('/')
 		fd.write("%s\n" % file)
 
 	fd.close()
-- 
1.6.1.3

[PATCH 38/70] package_rpm.bbclass: Fix problems with package version with '-' in the version (replace with '+'), improve the Requires and Recommends generation code (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5129 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index e1398d2..040d8b8 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -12,9 +12,14 @@ RPM="rpm ${RPMOPTS}"
 python write_specfile() {
 	from bb import data, build
 	import sys
+
+	version = bb.data.getVar('PV', d, 1)
+	version = version.replace('-', '+')
+	bb.data.setVar('RPMPV', version, d)
+
 	out_vartranslate = {
 		"PKG": "Name",
-		"PV": "Version",
+		"RPMPV": "Version",
 		"DESCRIPTION": "%description",
 		"ROOT": "BuildRoot",
 		"LICENSE": "License",
@@ -67,10 +72,24 @@ python write_specfile() {
 	fd.write("AutoReqProv: no\n")
 
 	bb.build.exec_func("mapping_rename_hook", d)
-	rdepends = " ".join(bb.utils.explode_deps(bb.data.getVar('RDEPENDS', d, True) or ""))
+	rdepends = bb.utils.explode_dep_versions(bb.data.getVar('RDEPENDS', d, True) or "")
+	for dep in rdepends:
+		ver = rdepends[dep]
+		if dep and ver:
+			ver = ver.replace('-', '+')
+			fd.write("Requires: %s %s\n" % (dep, ver))
+		elif dep:
+			fd.write("Requires: %s\n" % (dep))
+
+	rdepends = bb.utils.explode_dep_versions(bb.data.getVar('RRECOMMENDS', d, True) or "")
+	for dep in rdepends:
+		ver = rdepends[dep]
+		if dep and ver:
+			ver = ver.replace('-', '+')
+			fd.write("Recommends: %s %s\n" % (dep, ver))
+		elif dep:
+			fd.write("Recommends: %s\n" % (dep))
 
-	if rdepends:
-		fd.write("Requires: %s\n" % rdepends)
         fd.write("Release\t: %s\n" % bb.data.expand('${PR}${DISTRO_PR}', d, True)
 	fd.write("Summary\t: .\n")
 
@@ -82,8 +101,6 @@ python write_specfile() {
 
 	fd.write("%files\n")
 	for file in files:
-		if file[0] != '/':
-			fd.write('/')
 		fd.write("%s\n" % file)
 
 	fd.close()
@@ -97,8 +114,8 @@ python write_specfile() {
 	bb.build.exec_func('BUILDSPEC', d)
 
 	# move the rpm into the pkgoutdir
-	rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${PV}-${PR}${DISTRO_PR}.${TARGET_ARCH}.rpm', d)
-	outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PKG}-${PV}-${PR}${DISTRO_PR}.${TARGET_ARCH}.rpm', d)
+	rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d)
+	outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d)
 	bb.movefile(rpm, outrpm)
 }
 
-- 
1.6.1.3

[PATCH 39/70] package_rpm.bbclass: Add support for postinst and preinst scripts (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5131 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 040d8b8..47fbb38 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -24,6 +24,8 @@ python write_specfile() {
 		"ROOT": "BuildRoot",
 		"LICENSE": "License",
 		"SECTION": "Group",
+		"pkg_postinst": "%post",
+		"pkg_preinst": "%pre",
 	}
 
 	root = bb.data.getVar('ROOT', d)
@@ -67,7 +69,8 @@ python write_specfile() {
 		if out_vartranslate[var][0] == "%":
 			continue
 		val = bb.data.getVar(var, d, 1)
-		fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
+		if val:
+			fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
 
 	fd.write("AutoReqProv: no\n")
 
@@ -96,8 +99,10 @@ python write_specfile() {
 	for var in out_vartranslate.keys():
 		if out_vartranslate[var][0] != "%":
 			continue
-		fd.write(out_vartranslate[var] + "\n")
-		fd.write(bb.data.getVar(var, d) + "\n\n")
+		val = bb.data.getVar(var, d)
+		if val:
+			fd.write(out_vartranslate[var] + "\n")
+			fd.write(val + "\n\n")
 
 	fd.write("%files\n")
 	for file in files:
-- 
1.6.1.3

[PATCH 40/70] package_rpm.bbclass: Improve handling of '-' characters in Requires and Recommends fields (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5390 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |   46 +++++++++++++++++++-----------------------
 1 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 47fbb38..084d8de 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -24,8 +24,6 @@ python write_specfile() {
 		"ROOT": "BuildRoot",
 		"LICENSE": "License",
 		"SECTION": "Group",
-		"pkg_postinst": "%post",
-		"pkg_preinst": "%pre",
 	}
 
 	root = bb.data.getVar('ROOT', d)
@@ -69,29 +67,29 @@ python write_specfile() {
 		if out_vartranslate[var][0] == "%":
 			continue
 		val = bb.data.getVar(var, d, 1)
-		if val:
-			fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
+		fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
 
 	fd.write("AutoReqProv: no\n")
 
 	bb.build.exec_func("mapping_rename_hook", d)
-	rdepends = bb.utils.explode_dep_versions(bb.data.getVar('RDEPENDS', d, True) or "")
-	for dep in rdepends:
-		ver = rdepends[dep]
-		if dep and ver:
-			ver = ver.replace('-', '+')
-			fd.write("Requires: %s %s\n" % (dep, ver))
-		elif dep:
-			fd.write("Requires: %s\n" % (dep))
-
-	rdepends = bb.utils.explode_dep_versions(bb.data.getVar('RRECOMMENDS', d, True) or "")
-	for dep in rdepends:
-		ver = rdepends[dep]
-		if dep and ver:
-			ver = ver.replace('-', '+')
-			fd.write("Recommends: %s %s\n" % (dep, ver))
-		elif dep:
-			fd.write("Recommends: %s\n" % (dep))
+
+	def write_dep_field(varname, outstring):
+		depends = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "")
+		for dep in depends:
+			ver = depends[dep]
+			if dep and ver:
+				if '-' in ver:
+					subd = read_subpkgdata_dict(dep, d)
+					pv = subd['PV']
+					reppv = pv.replace('-', '+')
+					ver = ver.replace(pv, reppv)
+				fd.write("%s: %s %s\n" % (outstring, dep, ver))
+			elif dep:
+				fd.write("%s: %s\n" % (outstring, dep))
+
+
+	write_dep_field('RDEPENDS', 'Requires')
+	write_dep_field('RRECOMMENDS', 'Recommends')
 
         fd.write("Release\t: %s\n" % bb.data.expand('${PR}${DISTRO_PR}', d, True)
 	fd.write("Summary\t: .\n")
@@ -99,10 +97,8 @@ python write_specfile() {
 	for var in out_vartranslate.keys():
 		if out_vartranslate[var][0] != "%":
 			continue
-		val = bb.data.getVar(var, d)
-		if val:
-			fd.write(out_vartranslate[var] + "\n")
-			fd.write(val + "\n\n")
+		fd.write(out_vartranslate[var] + "\n")
+		fd.write(bb.data.getVar(var, d) + "\n\n")
 
 	fd.write("%files\n")
 	for file in files:
-- 
1.6.1.3

[PATCH 41/70] package_rpm.bbclass: Fix package version fixing for PKG renamed packages (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5393 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 084d8de..de4d898 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -71,10 +71,9 @@ python write_specfile() {
 
 	fd.write("AutoReqProv: no\n")
 
-	bb.build.exec_func("mapping_rename_hook", d)
-
-	def write_dep_field(varname, outstring):
+	def fix_dep_versions(varname):
 		depends = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "")
+		newdeps = []
 		for dep in depends:
 			ver = depends[dep]
 			if dep and ver:
@@ -83,11 +82,25 @@ python write_specfile() {
 					pv = subd['PV']
 					reppv = pv.replace('-', '+')
 					ver = ver.replace(pv, reppv)
+				newdeps.append("%s (%s)" % (dep, ver))
+			elif dep:
+				newdeps.append(dep)
+		bb.data.setVar(varname, ", ".join(newdeps), d)
+
+	fix_dep_versions('RDEPENDS')
+	fix_dep_versions('RRECOMMENDS')
+
+	bb.build.exec_func("mapping_rename_hook", d)
+
+	def write_dep_field(varname, outstring):
+		depends = bb.utils.explode_dep_versions(bb.data.getVar(varname, d, True) or "")
+		for dep in depends:
+			ver = depends[dep]
+			if dep and ver:
 				fd.write("%s: %s %s\n" % (outstring, dep, ver))
 			elif dep:
 				fd.write("%s: %s\n" % (outstring, dep))
 
-
 	write_dep_field('RDEPENDS', 'Requires')
 	write_dep_field('RRECOMMENDS', 'Recommends')
 
-- 
1.6.1.3

[PATCH 42/70] package_rpm.bbclass: Fix dependency rebuilding bug (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5397 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index de4d898..93cfd35 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -85,7 +85,7 @@ python write_specfile() {
 				newdeps.append("%s (%s)" % (dep, ver))
 			elif dep:
 				newdeps.append(dep)
-		bb.data.setVar(varname, ", ".join(newdeps), d)
+		bb.data.setVar(varname, " ".join(newdeps), d)
 
 	fix_dep_versions('RDEPENDS')
 	fix_dep_versions('RRECOMMENDS')
-- 
1.6.1.3

[PATCH 43/70] package_rpm.bbclass: save value of RPMBUILDPATH as it is needed for packaging (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5413 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 93cfd35..eb39834 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -197,6 +197,7 @@ python do_package_rpm () {
 		# Save the value of RPMBUILD expanded into the new dictonary so any 
 		# changes in the compoents that make up workdir don't break packaging
 		bb.data.setVar('RPMBUILD', bb.data.getVar("RPMBUILD", d, True), localdata)
+		bb.data.setVar('RPMBUILDPATH', bb.data.getVar("RPMBUILDPATH", d, True), localdata)
 		bb.build.exec_func('write_specfile', localdata)
 		bb.utils.unlockfile(lf)
 }
-- 
1.6.1.3

[PATCH 44/70] rootfs_rpm.bbclass: Remove the feed directory before packaging the image (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5112 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index 7e969a7..8da7f3a 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -96,6 +96,7 @@ EOF
 	rm -rf ${IMAGE_ROOTFS}/var/cache2/
 	rm -rf ${IMAGE_ROOTFS}/var/run2/
 	rm -rf ${IMAGE_ROOTFS}/var/log2/
+	rm -rf ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}/
 
 	log_check rootfs 	
 }
-- 
1.6.1.3

[PATCH 45/70] rootfs_rpm.bbclass: Add basic postinstall handling during image creation (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5134 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index 8da7f3a..b2d6762 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -12,6 +12,8 @@ do_rootfs[recrdeptask] += "do_package_write_rpm"
 YUMCONF = "${IMAGE_ROOTFS}/etc/yum.conf"
 YUMARGS = "-c ${YUMCONF} --installroot ${IMAGE_ROOTFS}"
 
+AWKPOSTINSTSCRIPT = "${STAGING_BINDIR_NATIVE}/extract-postinst.awk"
+
 fakeroot rootfs_rpm_do_rootfs () {
 	set -x
 
@@ -67,26 +69,26 @@ EOF
 		fakechroot yum ${YUMARGS} -y install ${PACKAGE_INSTALL}
 	fi
 
-	#export D=${IMAGE_ROOTFS}
-	#export OFFLINE_ROOT=${IMAGE_ROOTFS}
-	#export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
-	#export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT}
+	export D=${IMAGE_ROOTFS}
+	export OFFLINE_ROOT=${IMAGE_ROOTFS}
+	export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
+	export OPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
 
 	#mkdir -p ${IMAGE_ROOTFS}/etc/opkg/
 	#grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}/etc/opkg/arch.conf
 
 	${ROOTFS_POSTINSTALL_COMMAND}
-	
-	#for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do
-	#	if [ -f $i ] && ! sh $i; then
-	#		opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .preinst`
-	#	fi
-	#done
-	#for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.postinst; do
-	#	if [ -f $i ] && ! sh $i configure; then
-	#		opkg-cl ${IPKG_ARGS} flag unpacked `basename $i .postinst`
-	#	fi
-	#done
+
+	mkdir -p ${IMAGE_ROOTFS}/etc/rpm-postinsts/
+	rpm --root ${IMAGE_ROOTFS} -aq --queryformat 'Name: %{NAME}\n' --scripts > ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined
+	awk -f ${AWKPOSTINSTSCRIPT} < ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined
+	rm ${IMAGE_ROOTFS}/etc/rpm-postinsts/combined	
+
+	for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*.sh; do
+		if [ -f $i ] && sh $i; then
+			rm $i
+		fi
+	done
 
 	install -d ${IMAGE_ROOTFS}/${sysconfdir}
 	echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
-- 
1.6.1.3

[PATCH 46/70] rootfs_rpm.bbclass: Fixup broken symlinks due to fakechroot and run any leftover postinstalls on real hardware at first boot (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5143 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index b2d6762..acd7a06 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -69,6 +69,15 @@ EOF
 		fakechroot yum ${YUMARGS} -y install ${PACKAGE_INSTALL}
 	fi
 
+	# Symlinks created under fakeroot are wrong, now we have to fix them...
+	cd ${IMAGE_ROOTFS}
+	for f in `find . -type l -print`
+	do
+		link=`readlink $f | sed -e 's#${IMAGE_ROOTFS}##'`
+		rm $f
+		ln -s $link $f
+	done
+
 	export D=${IMAGE_ROOTFS}
 	export OFFLINE_ROOT=${IMAGE_ROOTFS}
 	export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
@@ -86,10 +95,29 @@ EOF
 
 	for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*.sh; do
 		if [ -f $i ] && sh $i; then
-			rm $i
+			# rm $i
+			mv $i $i.done
 		fi
 	done
 
+	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+	# Stop $i getting expanded below...
+	i=\$i
+	cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S98configure << EOF
+#!/bin/sh
+for i in /etc/rpm-postinsts/*.sh; do
+	echo "Running postinst $i..."
+	if [ -f $i ] && sh $i; then
+		# rm $i
+		mv $i $i.done
+	else
+		echo "ERROR: postinst $i failed."
+	fi
+done
+rm -f ${sysconfdir}/rcS.d/S98configure
+EOF
+	chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S98configure
+
 	install -d ${IMAGE_ROOTFS}/${sysconfdir}
 	echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
 
-- 
1.6.1.3

[PATCH 47/70] rootfs_rpm.bbclass: Add recommends handling (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5158 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index acd7a06..533efb0 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -69,6 +69,10 @@ EOF
 		fakechroot yum ${YUMARGS} -y install ${PACKAGE_INSTALL}
 	fi
 
+	# Add any recommended packages to the image
+	# (added as an extra script since yum itself doesn't support this)
+	yum-install-recommends.py ${IMAGE_ROOTFS} "fakechroot yum ${YUMARGS} -y install"
+
 	# Symlinks created under fakeroot are wrong, now we have to fix them...
 	cd ${IMAGE_ROOTFS}
 	for f in `find . -type l -print`
-- 
1.6.1.3

[PATCH 48/70] rootfs_rpm.bbclass: Set YUM_ARCH_FORCE (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5398 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index 533efb0..9b0dba7 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -11,6 +11,7 @@ do_rootfs[recrdeptask] += "do_package_write_rpm"
 
 YUMCONF = "${IMAGE_ROOTFS}/etc/yum.conf"
 YUMARGS = "-c ${YUMCONF} --installroot ${IMAGE_ROOTFS}"
+export YUM_ARCH_FORCE = "${TARGET_ARCH}"
 
 AWKPOSTINSTSCRIPT = "${STAGING_BINDIR_NATIVE}/extract-postinst.awk"
 
-- 
1.6.1.3

[PATCH 49/70] rootfs_rpm.bbclass: remove lock files to get rpm working on device (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5412 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index 9b0dba7..ed3cb8c 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -133,6 +133,9 @@ EOF
 	rm -rf ${IMAGE_ROOTFS}/var/log2/
 	rm -rf ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}/
 
+	# remove lock files
+	rm -f ${IMAGE_ROOTFS}/var/lib/rpm/__db.*
+
 	log_check rootfs 	
 }
 
-- 
1.6.1.3

[PATCH 50/70] rootfs_rpm.bbclass: remove temporary yum config - rootfs has one from yum package (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5433 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index ed3cb8c..450880d 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -136,6 +136,9 @@ EOF
 	# remove lock files
 	rm -f ${IMAGE_ROOTFS}/var/lib/rpm/__db.*
 
+	# remove no longer used yum.conf
+	rm -f ${IMAGE_ROOTFS}/etc/yum.conf
+
 	log_check rootfs 	
 }
 
-- 
1.6.1.3

[PATCH 51/70] rootfs_rpm.bbclass: added generation of feed entries (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5434 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index 450880d..b3d2b78 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -15,6 +15,31 @@ export YUM_ARCH_FORCE = "${TARGET_ARCH}"
 
 AWKPOSTINSTSCRIPT = "${STAGING_BINDIR_NATIVE}/extract-postinst.awk"
 
+RPM_POSTPROCESS_COMMANDS = "rpm_insert_feeds_uris"
+
+rpm_insert_feeds_uris () {
+
+        echo "Building from feeds activated!"
+
+	mkdir -p ${IMAGE_ROOTFS}/etc/yum/repos.d/
+        for line in ${RPM_FEED_URIS}
+        do
+                # strip leading and trailing spaces/tabs, then split into name and uri
+                line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
+                feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
+                feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
+
+                echo "Added $feed_name feed with URL $feed_uri"
+
+		FEED_FILE=${IMAGE_ROOTFS}/etc/yum/repos.d/$feed_name
+
+		echo "[poky-feed-$feed_name]" >> $FEED_FILE
+		echo "name = $feed_name" >> $FEED_FILE
+		echo "baseurl = $feed_uri" >> $FEED_FILE
+		echo "gpgcheck = 0" >> $FEED_FILE
+        done
+}
+
 fakeroot rootfs_rpm_do_rootfs () {
 	set -x
 
@@ -126,6 +151,7 @@ EOF
 	install -d ${IMAGE_ROOTFS}/${sysconfdir}
 	echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
 
+	${RPM_POSTPROCESS_COMMANDS}
 	${ROOTFS_POSTPROCESS_COMMAND}
 	
 	rm -rf ${IMAGE_ROOTFS}/var/cache2/
-- 
1.6.1.3

Re: [PATCH 51/70] rootfs_rpm.bbclass: added generation of feed entries (from Poky)

[Tom Rini]

On Wed, Mar 04, 2009 at 04:53:06PM +0100, Marcin Juszkiewicz wrote:

> From: Marcin Juszkiewicz <hrw@openedhand.com>
> 
> git-svn-id: https://svn.o-hand.com/repos/poky@5434 311d38ba-8fff-0310-9ca6-ca027cbcb966
> ---
>  classes/rootfs_rpm.bbclass |   26 ++++++++++++++++++++++++++
>  1 files changed, 26 insertions(+), 0 deletions(-)

Same comments as 33/70

-- 
Tom Rini

[PATCH 52/70] classes: Split rpm feeds by PACKAGE_ARCH (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5381 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index eb39834..32e5f82 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -129,7 +129,7 @@ python write_specfile() {
 
 	# move the rpm into the pkgoutdir
 	rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d)
-	outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d)
+	outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PACKAGE_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d)
 	bb.movefile(rpm, outrpm)
 }
 
@@ -191,7 +191,7 @@ python do_package_rpm () {
 		bb.data.update_data(localdata)
 
 		basedir = os.path.join(os.path.dirname(root))
-		pkgoutdir = outdir
+        pkgoutdir = os.path.join(outdir, bb.data.getVar('PACKAGE_ARCH', localdata, 1))
 		bb.mkdirhier(pkgoutdir)
 		bb.data.setVar('OUTSPECFILE', os.path.join(workdir, "%s.spec" % pkg), localdata)
 		# Save the value of RPMBUILD expanded into the new dictonary so any 
-- 
1.6.1.3

[PATCH 53/70] packaged-staging.bbclass: Add rpm package coverage (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5382 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/packaged-staging.bbclass |   14 ++++++++++++++
 classes/rootfs_rpm.bbclass       |   36 ++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index d6272b8..849f60c 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -361,6 +361,8 @@ python do_package_stage () {
             ipkpath = bb.data.getVar('DEPLOY_DIR_IPK', d, True).replace(tmpdir, stagepath)
         if bb.data.inherits_class('package_deb', d):
             debpath = bb.data.getVar('DEPLOY_DIR_DEB', d, True).replace(tmpdir, stagepath)
+        if bb.data.inherits_class('package_rpm', d):
+            rpmpath = bb.data.getVar('DEPLOY_DIR_RPM', d, True).replace(tmpdir, stagepath)
 
         for pkg in packages:
             pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1)
@@ -393,6 +395,18 @@ python do_package_stage () {
                     bb.mkdirhier(destpath)
                     bb.copyfile(srcfile, destpath + srcname)
 
+            if bb.data.inherits_class('package_rpm', d):
+		version = bb.data.getVar('PV', d, 1)
+		version = version.replace('-', '+')
+		bb.data.setVar('RPMPV', version, d)
+                srcname = bb.data.expand(pkgname + "-${RPMPV}-" + pr + ".${TARGET_ARCH}.rpm", d)
+                srcfile = bb.data.expand("${DEPLOY_DIR_RPM}/" + arch + "/" + srcname, d)
+                if os.path.exists(srcfile):
+                    destpath = rpmpath + "/" + arch + "/" 
+                    bb.mkdirhier(destpath)
+                    bb.copyfile(srcfile, destpath + srcname)
+
+
     #
     # Handle stamps/ files
     #
diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index b3d2b78..509aceb 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -43,18 +43,9 @@ rpm_insert_feeds_uris () {
 fakeroot rootfs_rpm_do_rootfs () {
 	set -x
 
-	# Update the repository index
-	createrepo ${DEPLOY_DIR_RPM}
-
 	mkdir -p ${IMAGE_ROOTFS}/etc/rpm/
 	#echo "arm" > ${IMAGE_ROOTFS}/etc/rpm/platform
 
-	# Copy the packages into the target image
-	# Ugly ugly ugly but rpm is braindead and can't see outside the chroot 
-	# when installing :(
-	mkdir -p ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}
-	cp -r ${DEPLOY_DIR_RPM}/* ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}/
-
 	# Generate an apprpriate yum.conf
 	rm -rf ${YUMCONF}
 	cat > ${YUMCONF} << EOF
@@ -69,12 +60,29 @@ tolerant=1
 arch=arm
 basearch=arm
 
-[poky-feed]
-name = Poky RPM Feed
-baseurl=file://${DEPLOY_DIR_RPM}
-gpgcheck=0
-
 EOF
+
+	#priority=1
+	for arch in ${PACKAGE_ARCHS}; do
+		if [ ! -d ${DEPLOY_DIR_RPM}/$arch ]; then
+			continue;
+		fi
+		createrepo ${DEPLOY_DIR_RPM}/$arch
+
+		echo "[poky-feed-$arch]" >> ${YUMCONF}
+		echo "name = Poky RPM $arch Feed" >> ${YUMCONF}
+		echo "baseurl=file://${DEPLOY_DIR_RPM}/$arch" >> ${YUMCONF}
+		echo "gpgcheck=0" >> ${YUMCONF}
+		echo "" >> ${YUMCONF}
+		#priority=$(expr $priority + 5)
+	done
+
+	# Copy the packages into the target image
+	# Ugly ugly ugly but rpm is braindead and can't see outside the chroot 
+	# when installing :(
+	mkdir -p ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}
+	cp -r ${DEPLOY_DIR_RPM}/* ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}/
+
 	#mkdir -p ${IMAGE_ROOTFS}/var/lib/rpm
 	#rpm --root ${IMAGE_ROOTFS} --initdb
 	#rpm --root ${IMAGE_ROOTFS} --dbpath ${IMAGE_ROOTFS}/var/lib/rpm -ihv --nodeps --ignoreos  
-- 
1.6.1.3

[PATCH 54/70] rootfs_rpm.bbclass: use more efficient way to copy packages (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5386 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index 509aceb..97f0a9e 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -63,6 +63,8 @@ basearch=arm
 EOF
 
 	#priority=1
+	mkdir -p ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}
+
 	for arch in ${PACKAGE_ARCHS}; do
 		if [ ! -d ${DEPLOY_DIR_RPM}/$arch ]; then
 			continue;
@@ -75,13 +77,13 @@ EOF
 		echo "gpgcheck=0" >> ${YUMCONF}
 		echo "" >> ${YUMCONF}
 		#priority=$(expr $priority + 5)
+		
+		# Copy the packages into the target image
+		# Ugly ugly ugly but rpm is braindead and can't see outside the chroot 
+		# when installing :(
+		cp -r ${DEPLOY_DIR_RPM}/$arch ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}/
 	done
 
-	# Copy the packages into the target image
-	# Ugly ugly ugly but rpm is braindead and can't see outside the chroot 
-	# when installing :(
-	mkdir -p ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}
-	cp -r ${DEPLOY_DIR_RPM}/* ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}/
 
 	#mkdir -p ${IMAGE_ROOTFS}/var/lib/rpm
 	#rpm --root ${IMAGE_ROOTFS} --initdb
-- 
1.6.1.3

[PATCH 55/70] rootfs_rpm: set target architecture and do not tell yum which arch we will use (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5391 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index 97f0a9e..bedd71c 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -44,7 +44,7 @@ fakeroot rootfs_rpm_do_rootfs () {
 	set -x
 
 	mkdir -p ${IMAGE_ROOTFS}/etc/rpm/
-	#echo "arm" > ${IMAGE_ROOTFS}/etc/rpm/platform
+	echo ${TARGET_ARCH} >${IMAGE_ROOTFS}/etc/rpm/platform
 
 	# Generate an apprpriate yum.conf
 	rm -rf ${YUMCONF}
@@ -57,8 +57,6 @@ logfile=/var/log2/yum.log
 exactarch=0
 obsoletes=1
 tolerant=1
-arch=arm
-basearch=arm
 
 EOF
 
-- 
1.6.1.3

[PATCH 56/70] rootfs_rpm.bbclass: fix platform so rpm will be usable on device (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5432 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index bedd71c..292e3bb 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -44,7 +44,7 @@ fakeroot rootfs_rpm_do_rootfs () {
 	set -x
 
 	mkdir -p ${IMAGE_ROOTFS}/etc/rpm/
-	echo ${TARGET_ARCH} >${IMAGE_ROOTFS}/etc/rpm/platform
+	echo "${TARGET_ARCH}-linux" >${IMAGE_ROOTFS}/etc/rpm/platform
 
 	# Generate an apprpriate yum.conf
 	rm -rf ${YUMCONF}
-- 
1.6.1.3

[PATCH 57/70] rootfs_rpm.bbclass: added code to generate images from feeds (from Poky)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5436 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/rootfs_rpm.bbclass |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index 292e3bb..733736a 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -15,6 +15,7 @@ export YUM_ARCH_FORCE = "${TARGET_ARCH}"
 
 AWKPOSTINSTSCRIPT = "${STAGING_BINDIR_NATIVE}/extract-postinst.awk"
 
+RPM_PREPROCESS_COMMANDS = ""
 RPM_POSTPROCESS_COMMANDS = "rpm_insert_feeds_uris"
 
 rpm_insert_feeds_uris () {
@@ -42,6 +43,8 @@ rpm_insert_feeds_uris () {
 
 fakeroot rootfs_rpm_do_rootfs () {
 	set -x
+	
+	${RPM_PREPROCESS_COMMANDS}
 
 	mkdir -p ${IMAGE_ROOTFS}/etc/rpm/
 	echo "${TARGET_ARCH}-linux" >${IMAGE_ROOTFS}/etc/rpm/platform
@@ -222,3 +225,14 @@ install_all_locales() {
     fi
 }
 
+python () {
+    import bb
+    if bb.data.getVar('BUILD_IMAGES_FROM_FEEDS', d, True):
+        flags = bb.data.getVarFlag('do_rootfs', 'recrdeptask', d)
+        flags = flags.replace("do_package_write_rpm", "")
+        flags = flags.replace("do_deploy", "")
+        flags = flags.replace("do_populate_staging", "")
+        bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d)
+        bb.data.setVar('RPM_PREPROCESS_COMMANDS', "rpm_insert_feed_uris", d)
+        bb.data.setVar('RPM_POSTPROCESS_COMMANDS', '', d)
+}
-- 
1.6.1.3

[PATCH 58/70] python: Fix -native package staging functions (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5104 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 packages/python/python-iniparse-native_0.2.3.bb    |    1 +
 packages/python/python-urlgrabber-native_3.1.0.bb  |    1 +
 .../python/yum-metadata-parser-native_1.1.2.bb     |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/packages/python/python-iniparse-native_0.2.3.bb b/packages/python/python-iniparse-native_0.2.3.bb
index ab799db..c2d633c 100644
--- a/packages/python/python-iniparse-native_0.2.3.bb
+++ b/packages/python/python-iniparse-native_0.2.3.bb
@@ -5,5 +5,6 @@ RDEPENDS = ""
 
 do_stage() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+	STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \    
         ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
 }
diff --git a/packages/python/python-urlgrabber-native_3.1.0.bb b/packages/python/python-urlgrabber-native_3.1.0.bb
index 01aebee..5e43ca2 100644
--- a/packages/python/python-urlgrabber-native_3.1.0.bb
+++ b/packages/python/python-urlgrabber-native_3.1.0.bb
@@ -5,5 +5,6 @@ RDEPENDS = ""
 
 do_stage() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+	STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
         ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
 }
diff --git a/packages/python/yum-metadata-parser-native_1.1.2.bb b/packages/python/yum-metadata-parser-native_1.1.2.bb
index a74488c..8a43ec4 100644
--- a/packages/python/yum-metadata-parser-native_1.1.2.bb
+++ b/packages/python/yum-metadata-parser-native_1.1.2.bb
@@ -7,5 +7,6 @@ RDEPENDS = ""
 
 do_stage() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+	STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
         ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
 }
-- 
1.6.1.3

Re: [PATCH 58/70] python: Fix -native package staging functions (from Poky)

[Michael 'Mickey' Lauer]

Am Mittwoch, den 04.03.2009, 16:53 +0100 schrieb Marcin Juszkiewicz:
> From: Richard Purdie <richard@openedhand.com>
> 
> git-svn-id: https://svn.o-hand.com/repos/poky@5104 311d38ba-8fff-0310-9ca6-ca027cbcb966
> ---
>  packages/python/python-iniparse-native_0.2.3.bb    |    1 +
>  packages/python/python-urlgrabber-native_3.1.0.bb  |    1 +
>  .../python/yum-metadata-parser-native_1.1.2.bb     |    1 +
>  3 files changed, 3 insertions(+), 0 deletions(-)

Comments to 13/70 apply here.

:M:

[PATCH 59/70] package_rpm.bbclass: Don't use the system wide RPM macros. (from Poky)

[Marcin Juszkiewicz]

From: Rob Bradford <rob@openedhand.com>

This fixes the build on Fedora 10 where the RPM system macros obliterate
the value of BuildRoot that is set in the spec file.
---
 classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 32e5f82..f6cb2c6 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -136,7 +136,7 @@ python write_specfile() {
 rpm_prep() {
 	if [ ! -e ${WORKDIR}/rpmrc ]; then
 		mkdir -p ${RPMBUILDPATH}/{SPECS,RPMS/{i386,i586,i686,noarch,ppc,mips,mipsel,arm},SRPMS,SOURCES,BUILD}
-		echo 'macrofiles:/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
+		echo 'macrofiles:${STAGING_DIR_NATIVE}/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
 		echo '%_topdir ${RPMBUILDPATH}' > ${WORKDIR}/macros
 		echo '%_repackage_dir ${WORKDIR}' >> ${WORKDIR}/macros
 	fi
-- 
1.6.1.3

[PATCH 60/70] package_rpm.bbclass: Add support for postinst and preinst scripts (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5131 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package_rpm.bbclass |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index f6cb2c6..93429ea 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -24,6 +24,8 @@ python write_specfile() {
 		"ROOT": "BuildRoot",
 		"LICENSE": "License",
 		"SECTION": "Group",
+		"pkg_postinst": "%post",
+		"pkg_preinst": "%pre",
 	}
 
 	root = bb.data.getVar('ROOT', d)
@@ -67,7 +69,8 @@ python write_specfile() {
 		if out_vartranslate[var][0] == "%":
 			continue
 		val = bb.data.getVar(var, d, 1)
-		fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
+		if val:
+			fd.write("%s\t: %s\n" % (out_vartranslate[var], val))
 
 	fd.write("AutoReqProv: no\n")
 
@@ -110,8 +113,10 @@ python write_specfile() {
 	for var in out_vartranslate.keys():
 		if out_vartranslate[var][0] != "%":
 			continue
-		fd.write(out_vartranslate[var] + "\n")
-		fd.write(bb.data.getVar(var, d) + "\n\n")
+		val = bb.data.getVar(var, d)
+		if val:
+			fd.write(out_vartranslate[var] + "\n")
+			fd.write(val + "\n\n")
 
 	fd.write("%files\n")
 	for file in files:
-- 
1.6.1.3

[PATCH 61/70] openssl-native: make sure that PACKAGES will be empty (proper way)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

---
 packages/openssl/openssl-native_0.9.7g.bb |    1 +
 packages/openssl/openssl-native_0.9.7m.bb |    1 +
 packages/openssl/openssl-native_0.9.8g.bb |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/packages/openssl/openssl-native_0.9.7g.bb b/packages/openssl/openssl-native_0.9.7g.bb
index f48e123..14f6d92 100644
--- a/packages/openssl/openssl-native_0.9.7g.bb
+++ b/packages/openssl/openssl-native_0.9.7g.bb
@@ -14,3 +14,4 @@ do_install() {
 	:
 }
 
+PACKAGES = ""
diff --git a/packages/openssl/openssl-native_0.9.7m.bb b/packages/openssl/openssl-native_0.9.7m.bb
index e7dc7c7..b00dc5e 100644
--- a/packages/openssl/openssl-native_0.9.7m.bb
+++ b/packages/openssl/openssl-native_0.9.7m.bb
@@ -18,3 +18,4 @@ do_install() {
 	:
 }
 
+PACKAGES = ""
diff --git a/packages/openssl/openssl-native_0.9.8g.bb b/packages/openssl/openssl-native_0.9.8g.bb
index 9ae8e39..1ad90a0 100644
--- a/packages/openssl/openssl-native_0.9.8g.bb
+++ b/packages/openssl/openssl-native_0.9.8g.bb
@@ -22,3 +22,4 @@ do_install() {
 	:
 }
 
+PACKAGES = ""
-- 
1.6.1.3

[PATCH 62/70] base.bbclass: Add read_subpkgdata_dict function (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky@5389 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/base.bbclass |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 18afc1a..db57d26 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1061,6 +1061,19 @@ python read_subpackage_metadata () {
 			bb.data.setVar(key, sdata[key], d)
 }
 
+
+#
+# Collapse FOO_pkg variables into FOO
+#
+def read_subpkgdata_dict(pkg, d):
+	import bb
+	ret = {}
+	subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d))
+	for var in subd:
+		newvar = var.replace("_" + pkg, "")
+		ret[newvar] = subd[var]
+	return ret
+
 # Make sure MACHINE isn't exported
 # (breaks binutils at least)
 MACHINE[unexport] = "1"
-- 
1.6.1.3

[PATCH 63/70] package.bbclass: Write out extra useful data into the pkgdata files (from Poky)

[Marcin Juszkiewicz]

From: Richard Purdie <richard@openedhand.com>

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5388 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 classes/package.bbclass |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 5559592..7a61c5a 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -483,6 +483,11 @@ python emit_pkgdata() {
 		val = bb.data.getVar('%s_%s' % (var, pkg), d, 1)
 		if val:
 			f.write('%s_%s: %s\n' % (var, pkg, encode(val)))
+ 			return
+ 		val = bb.data.getVar('%s' % (var), d, 1)
+ 		if val:
+ 			f.write('%s: %s\n' % (var, encode(val)))
+ 		return
 
 	packages = bb.data.getVar('PACKAGES', d, True)
 	pkgdatadir = bb.data.getVar('PKGDATA_DIR', d, True)
@@ -503,6 +508,7 @@ python emit_pkgdata() {
 		subdata_file = pkgdatadir + "/runtime/%s" % pkg
 		sf = open(subdata_file, 'w')
 		write_if_exists(sf, pkg, 'PN')
+		write_if_exists(sf, pkg, 'PV')
 		write_if_exists(sf, pkg, 'PR')
 		write_if_exists(sf, pkg, 'DESCRIPTION')
 		write_if_exists(sf, pkg, 'RDEPENDS')
-- 
1.6.1.3

[PATCH 64/70] package_rpm.bbclass: fix indentation

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

---
 classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 93429ea..c86455c 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -196,7 +196,7 @@ python do_package_rpm () {
 		bb.data.update_data(localdata)
 
 		basedir = os.path.join(os.path.dirname(root))
-        pkgoutdir = os.path.join(outdir, bb.data.getVar('PACKAGE_ARCH', localdata, 1))
+		pkgoutdir = os.path.join(outdir, bb.data.getVar('PACKAGE_ARCH', localdata, 1))
 		bb.mkdirhier(pkgoutdir)
 		bb.data.setVar('OUTSPECFILE', os.path.join(workdir, "%s.spec" % pkg), localdata)
 		# Save the value of RPMBUILD expanded into the new dictonary so any 
-- 
1.6.1.3

[PATCH 65/70] rpm-native: add Python 2.6

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

---
 packages/rpm/rpm_4.4.2.3.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
index 3083387..248a9f2 100644
--- a/packages/rpm/rpm_4.4.2.3.bb
+++ b/packages/rpm/rpm_4.4.2.3.bb
@@ -97,6 +97,7 @@ do_configure () {
 def rpm_python_version(d):
 	import os, bb
 	staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
+	if os.path.exists( "%s/python2.6" % staging_incdir ): return "2.6"
 	if os.path.exists( "%s/python2.5" % staging_incdir ): return "2.5"
 	if os.path.exists( "%s/python2.4" % staging_incdir ): return "2.4"
 	if os.path.exists( "%s/python2.3" % staging_incdir ): return "2.3"
-- 
1.6.1.3

Re: [PATCH 65/70] rpm-native: add Python 2.6

[Michael 'Mickey' Lauer]

Am Mittwoch, den 04.03.2009, 16:53 +0100 schrieb Marcin Juszkiewicz:
> From: Marcin Juszkiewicz <hrw@openembedded.org>
> 
> ---
>  packages/rpm/rpm_4.4.2.3.bb |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/packages/rpm/rpm_4.4.2.3.bb b/packages/rpm/rpm_4.4.2.3.bb
> index 3083387..248a9f2 100644
> --- a/packages/rpm/rpm_4.4.2.3.bb
> +++ b/packages/rpm/rpm_4.4.2.3.bb
> @@ -97,6 +97,7 @@ do_configure () {
>  def rpm_python_version(d):
>  	import os, bb
>  	staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
> +	if os.path.exists( "%s/python2.6" % staging_incdir ): return "2.6"
>  	if os.path.exists( "%s/python2.5" % staging_incdir ): return "2.5"
>  	if os.path.exists( "%s/python2.4" % staging_incdir ): return "2.4"
>  	if os.path.exists( "%s/python2.3" % staging_incdir ): return "2.3"

Comment to 08/70 applies here.

-- 
:M:

Re: [PATCH 65/70] rpm-native: add Python 2.6

[Marcin Juszkiewicz]

On Wednesday 04 of March 2009 18:20:09 Michael 'Mickey' Lauer wrote:
> >  packages/rpm/rpm_4.4.2.3.bb |    1 +

> Comment to 08/70 applies here.

done

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

[PATCH 66/70] package_rpm.bbclass: fix syntax errors

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

---
 classes/package_rpm.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index c86455c..aeb4126 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -52,7 +52,7 @@ python write_specfile() {
 			pass
 	if not files and bb.data.getVar('ALLOW_EMPTY', d) != "1":
 		from bb import note
-		note("Not creating empty archive for %s" % (bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}', d, True))
+		note("Not creating empty archive for %s" % (bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}', d, True)))
 		return
 
 	# output .spec using this metadata store
@@ -107,7 +107,7 @@ python write_specfile() {
 	write_dep_field('RDEPENDS', 'Requires')
 	write_dep_field('RRECOMMENDS', 'Recommends')
 
-        fd.write("Release\t: %s\n" % bb.data.expand('${PR}${DISTRO_PR}', d, True)
+	fd.write("Release\t: %s\n" % bb.data.expand('${PR}${DISTRO_PR}', d, True))
 	fd.write("Summary\t: .\n")
 
 	for var in out_vartranslate.keys():
-- 
1.6.1.3

[PATCH 68/70] libxml2-native: really enable Python extension

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

---
 packages/libxml/libxml2-native.inc      |    5 ++---
 packages/libxml/libxml2-native_2.7.2.bb |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/libxml/libxml2-native.inc b/packages/libxml/libxml2-native.inc
index 603f48d..b819f95 100644
--- a/packages/libxml/libxml2-native.inc
+++ b/packages/libxml/libxml2-native.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "GNOME XML library"
 DEPENDS = "python-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
-PR = "r3"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
 S = "${WORKDIR}/libxml2-${PV}"
@@ -9,10 +8,10 @@ S = "${WORKDIR}/libxml2-${PV}"
 inherit distutils-base autotools native pkgconfig
 
 EXTRA_OECONF = "\
-  --with-python=${STAGING_INCDIR}/${PYTHON_MAJMIN} \
+  --with-python=${PYTHON_DIR} \
   --without-debug \
   --without-legacy \
-  --without-catalog \
+  --with-catalog \
   --without-docbook \
   --with-c14n \
 "
diff --git a/packages/libxml/libxml2-native_2.7.2.bb b/packages/libxml/libxml2-native_2.7.2.bb
index 48e3598..bcbfb66 100644
--- a/packages/libxml/libxml2-native_2.7.2.bb
+++ b/packages/libxml/libxml2-native_2.7.2.bb
@@ -1,2 +1,2 @@
 require libxml2-native.inc
-PR = "r0"
+PR = "r1"
-- 
1.6.1.3

[PATCH 69/70] package_rpm.bbclass: save RPROVIDES in packages

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

---
 classes/package_rpm.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index aeb4126..7f55e38 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -106,6 +106,7 @@ python write_specfile() {
 
 	write_dep_field('RDEPENDS', 'Requires')
 	write_dep_field('RRECOMMENDS', 'Recommends')
+	write_dep_field('RPROVIDES', 'Provides')
 
 	fd.write("Release\t: %s\n" % bb.data.expand('${PR}${DISTRO_PR}', d, True))
 	fd.write("Summary\t: .\n")
-- 
1.6.1.3

[PATCH 70/70] rootfs_rpm.bbclass: remove two functions (need rewrite for RPM)

[Marcin Juszkiewicz]

From: Marcin Juszkiewicz <hrw@openembedded.org>

install_all_locales and remove_packaging_data_files functions were from
rootfs_ipk.bbclass and need to be rewritten for RPM rootfs.
---
 classes/package_rpm.bbclass |    2 +-
 classes/rootfs_rpm.bbclass  |   40 +++++++++++-----------------------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 7f55e38..e9e52d2 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -200,7 +200,7 @@ python do_package_rpm () {
 		pkgoutdir = os.path.join(outdir, bb.data.getVar('PACKAGE_ARCH', localdata, 1))
 		bb.mkdirhier(pkgoutdir)
 		bb.data.setVar('OUTSPECFILE', os.path.join(workdir, "%s.spec" % pkg), localdata)
-		# Save the value of RPMBUILD expanded into the new dictonary so any 
+		# Save the value of RPMBUILD expanded into the new dictonary so any
 		# changes in the compoents that make up workdir don't break packaging
 		bb.data.setVar('RPMBUILD', bb.data.getVar("RPMBUILD", d, True), localdata)
 		bb.data.setVar('RPMBUILDPATH', bb.data.getVar("RPMBUILDPATH", d, True), localdata)
diff --git a/classes/rootfs_rpm.bbclass b/classes/rootfs_rpm.bbclass
index 733736a..12cd349 100644
--- a/classes/rootfs_rpm.bbclass
+++ b/classes/rootfs_rpm.bbclass
@@ -2,7 +2,7 @@
 # Creates a root filesystem out of rpm packages
 #
 
-ROOTFS_PKGMANAGE = "rpm yum" 
+ROOTFS_PKGMANAGE = "rpm yum"
 
 ROOTFS_PKGMANAGE_BOOTSTRAP  = "run-postinsts"
 
@@ -43,7 +43,7 @@ rpm_insert_feeds_uris () {
 
 fakeroot rootfs_rpm_do_rootfs () {
 	set -x
-	
+
 	${RPM_PREPROCESS_COMMANDS}
 
 	mkdir -p ${IMAGE_ROOTFS}/etc/rpm/
@@ -78,9 +78,9 @@ EOF
 		echo "gpgcheck=0" >> ${YUMCONF}
 		echo "" >> ${YUMCONF}
 		#priority=$(expr $priority + 5)
-		
+
 		# Copy the packages into the target image
-		# Ugly ugly ugly but rpm is braindead and can't see outside the chroot 
+		# Ugly ugly ugly but rpm is braindead and can't see outside the chroot
 		# when installing :(
 		cp -r ${DEPLOY_DIR_RPM}/$arch ${IMAGE_ROOTFS}${DEPLOY_DIR_RPM}/
 	done
@@ -88,7 +88,7 @@ EOF
 
 	#mkdir -p ${IMAGE_ROOTFS}/var/lib/rpm
 	#rpm --root ${IMAGE_ROOTFS} --initdb
-	#rpm --root ${IMAGE_ROOTFS} --dbpath ${IMAGE_ROOTFS}/var/lib/rpm -ihv --nodeps --ignoreos  
+	#rpm --root ${IMAGE_ROOTFS} --dbpath ${IMAGE_ROOTFS}/var/lib/rpm -ihv --nodeps --ignoreos
 	#rpm -ihv --root ${IMAGE_ROOTFS} ${PACKAGE_INSTALL}
 
 	#package_update_index_rpm
@@ -176,7 +176,7 @@ EOF
 	# remove no longer used yum.conf
 	rm -f ${IMAGE_ROOTFS}/etc/yum.conf
 
-	log_check rootfs 	
+	log_check rootfs
 }
 
 rootfs_rpm_log_check() {
@@ -185,44 +185,26 @@ rootfs_rpm_log_check() {
 
 	lf_txt="`cat $lf_path`"
 	for keyword_die in "Cannot find package" "exit 1" ERR Fail
-	do				
+	do
 		if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
 		then
 			echo "log_check: There were error messages in the logfile"
 			echo -e "log_check: Matched keyword: [$keyword_die]\n"
 			echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
 			echo ""
-			do_exit=1				
+			do_exit=1
 		fi
 	done
-	test "$do_exit" = 1 && exit 1
+	test "$do_exit" = 1 && exit
 	true
 }
 
 remove_packaging_data_files() {
-	rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg/
+# empty for now
 }
 
 install_all_locales() {
-
-    PACKAGES_TO_INSTALL=""
-
-	INSTALLED_PACKAGES=`grep ^Package: ${IMAGE_ROOTFS}${libdir}/opkg/status |sed "s/^Package: //"|egrep -v -- "(-locale-|-dev$|-doc$|^kernel|^glibc|^ttf|^task|^perl|^python)"`
-
-    for pkg in $INSTALLED_PACKAGES
-    do
-        for lang in ${IMAGE_LOCALES}
-        do
-            if [ `opkg-cl ${IPKG_ARGS} info $pkg-locale-$lang | wc -l` -gt 2 ]
-            then
-                    PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL $pkg-locale-$lang"
-            fi
-        done
-    done
-    if [ "$PACKAGES_TO_INSTALL" != "" ]
-    then
-        opkg-cl ${IPKG_ARGS} install $PACKAGES_TO_INSTALL
-    fi
+# empty for now
 }
 
 python () {
-- 
1.6.1.3

I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Mike (mwester)]

70 patches on the list????

I presume somebody is making a point with this.  Yes, ok, _I_ get it  -
reading the emails on the list using a cell phone and gprs connection
and tiny screen REALLY REALLY Reallly SUCKS when the mailing list also
used as a patch review list.

Got it.

Deleted the lot; I can't read them on a cell phone, even if I had the
patience to struggle through 120+ emails on THIS list alone today!

Let's split this list.  I can't be the only person trying to keep up on
a poor connection via a cell phone.

-Mike (mwester)

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Tom Rini]

On Wed, Mar 04, 2009 at 10:06:21PM -0600, Mike (mwester) wrote:

> 70 patches on the list????
> 
> I presume somebody is making a point with this.  Yes, ok, _I_ get it  -
> reading the emails on the list using a cell phone and gprs connection
> and tiny screen REALLY REALLY Reallly SUCKS when the mailing list also
> used as a patch review list.

Actually, the point is the opposite.  Spamming the list where everyone
is means bugs get caught and working-but-incorrect things get pointed
out.

> Got it.
> 
> Deleted the lot; I can't read them on a cell phone, even if I had the
> patience to struggle through 120+ emails on THIS list alone today!
> 
> Let's split this list.  I can't be the only person trying to keep up on
> a poor connection via a cell phone.

Nothing personal, really, but when I'm on a limited connection I simply
ignore certain lists.

-- 
Tom Rini

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Andrea Adami]

Wasn't suggested/agreed to post patches for review on 'openembedded-commits' ?
One could just forward the cover-letter to this ML to get attention...

My 2 cents

Andrea

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Yuri Bushmelev]

Hello!

> Wasn't suggested/agreed to post patches for review on
> 'openembedded-commits' ? One could just forward the cover-letter to this
> ML to get attention...

... and subscribe all users of oe-devel to oe-commits then.

-- 
Yuri Bushmelev

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Koen Kooi]

On 05-03-09 09:45, Andrea Adami wrote:
> Wasn't suggested/agreed to post patches for review on 'openembedded-commits' ?

No, patches are human generated and need to get posted to *all* developers.

regards,

Koen

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Philip Balister]

[-- Attachment #1: Type: text/plain, Size: 525 bytes --]

Andrea Adami wrote:
> Wasn't suggested/agreed to post patches for review on 'openembedded-commits' ?
> One could just forward the cover-letter to this ML to get attention...

The problem with this is not many people will sign up for the list. We 
really do need every pair of eyes looking at stuff. Even if you do not 
feel like you really know the stuff, looking it over is a good way to 
learn. I even caught a very small mistake in one of Mickey's submission 
that was far from what I know a lot about.

Philip

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3303 bytes --]

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Mike (mwester)]

Tom Rini wrote:
> On Wed, Mar 04, 2009 at 10:06:21PM -0600, Mike (mwester) wrote:
> 
>> 70 patches on the list????
>>
>> I presume somebody is making a point with this.  Yes, ok, _I_ get it  -
>> reading the emails on the list using a cell phone and gprs connection
>> and tiny screen REALLY REALLY Reallly SUCKS when the mailing list also
>> used as a patch review list.
> 
> Actually, the point is the opposite.  Spamming the list where everyone
> is means bugs get caught and working-but-incorrect things get pointed
> out.

Yes, in the *NORMAL* case that would be true.  Seven patches - fine,
that would work.  10x more than that? - that's clearly a case where
clear thinking would put the changes on a branch and have it reviewed
there.  (Which is exactly what recent discussions here have been about,
hence my conclusion that this patch-mega-bomb was intended to make a
point about that discussion.)

70 patches?  Come on, who's going to extract and apply 70 patches from
email?  Not likely!

Mike (mwester)

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Koen Kooi]

On 05-03-09 13:33, Mike (mwester) wrote:

> 70 patches?  Come on, who's going to extract and apply 70 patches from
> email?  Not likely!

You're missing the point completely. Patches go to the mailinglist for 
review. You can choose to apply and test them if you wish. If you want 
to test the 69 patches, you pull the branch marcin provided.
This is done so that patches get many eyes on them without people needed 
to use git, and people wanting to test can do one of the following:

* pull the branch

or

* use patchwork to create a bundle

or

* apply patches by hand

regards,

Koen

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Mike (mwester)]

Koen Kooi wrote:
> This is done so that patches get many eyes on them without people needed
> to use git, and people wanting to test can do one of the following:

Yes, fine - but the point being made is that when a single day contains
120+ emails, of which well over 70 are part of the same mega-patch, then
this policy actually does the *opposite* of what is intended --- people
are simply going to look at the sheer magnitude of that, and exercise
their ability to delete the entire inbox.

How does _that_ help with the reviewing?  Wouldn't it have been better
to point to a branch with an email outlining the nature and impact of
the changes?

Or if we really want to have this in everyone's mailbox, wouldn't it be
better to break it up over multiple days?

(And yes, I was one who favored the notion of reviewing patches on the
mailing list -- and I still do -- but I now feel the pain caused by this
policy when it is taken to the extreme, and I admit that my thinking was
perhaps naive.)

-Mike (mwester)

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Koen Kooi]

On 05-03-09 14:20, Mike (mwester) wrote:
> Koen Kooi wrote:
>> This is done so that patches get many eyes on them without people needed
>> to use git, and people wanting to test can do one of the following:
>
> Yes, fine - but the point being made is that when a single day contains
> 120+ emails, of which well over 70 are part of the same mega-patch, then
> this policy actually does the *opposite* of what is intended --- people
> are simply going to look at the sheer magnitude of that, and exercise
> their ability to delete the entire inbox.
>
> How does _that_ help with the reviewing?  Wouldn't it have been better
> to point to a branch with an email outlining the nature and impact of
> the changes?
>
> Or if we really want to have this in everyone's mailbox, wouldn't it be
> better to break it up over multiple days?
>
> (And yes, I was one who favored the notion of reviewing patches on the
> mailing list -- and I still do -- but I now feel the pain caused by this
> policy when it is taken to the extreme, and I admit that my thinking was
> perhaps naive.)

I agree 70 patches is a bit much, but the principle still holds :) But I 
don't think sending 70 patches will be a daily occurrance, and we now 
that in the future patchsets need to be broken up more, or squashed 
together. It's nice that we can track the typos poky developers made and 
how fast they fixed it, but IMO those patches should be squashed 
together when possible.

regards,

Koen

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Philip Balister]

[-- Attachment #1: Type: text/plain, Size: 1416 bytes --]

Mike (mwester) wrote:
> Tom Rini wrote:
>> On Wed, Mar 04, 2009 at 10:06:21PM -0600, Mike (mwester) wrote:
>>
>>> 70 patches on the list????
>>>
>>> I presume somebody is making a point with this.  Yes, ok, _I_ get it  -
>>> reading the emails on the list using a cell phone and gprs connection
>>> and tiny screen REALLY REALLY Reallly SUCKS when the mailing list also
>>> used as a patch review list.
>> Actually, the point is the opposite.  Spamming the list where everyone
>> is means bugs get caught and working-but-incorrect things get pointed
>> out.
> 
> Yes, in the *NORMAL* case that would be true.  Seven patches - fine,
> that would work.  10x more than that? - that's clearly a case where
> clear thinking would put the changes on a branch and have it reviewed
> there.  (Which is exactly what recent discussions here have been about,
> hence my conclusion that this patch-mega-bomb was intended to make a
> point about that discussion.)
> 
> 70 patches?  Come on, who's going to extract and apply 70 patches from
> email?  Not likely!

I would also suggest that before sending large patch sets to the list, 
use git rebase --interactive to combine patches. For review we want to 
see what the changes are, not how you created the changes.

I do know some people do not like to lose their history though.

And I hope that 70 patches is not a regular occurrence.

Philip

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3303 bytes --]

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Frans Meulenbroeks]

Is the policy now to send *all* patches to the list?
Or only the critical ones (e.g. the ones that affect the build system
and core functionality)?

Frans.

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Michael 'Mickey' Lauer]

Am Donnerstag, den 05.03.2009, 16:00 +0100 schrieb Frans Meulenbroeks:
> Is the policy now to send *all* patches to the list?
> Or only the critical ones (e.g. the ones that affect the build system
> and core functionality)?

Only critical ones. Otherwise we might as well stop developing at all.

:M:

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Frans Meulenbroeks]

2009/3/5 Michael 'Mickey' Lauer <mickey@openmoko.org>:
> Am Donnerstag, den 05.03.2009, 16:00 +0100 schrieb Frans Meulenbroeks:
>> Is the policy now to send *all* patches to the list?
>> Or only the critical ones (e.g. the ones that affect the build system
>> and core functionality)?
>
> Only critical ones. Otherwise we might as well stop developing at all.
>

Good. Then we're on the same page.
(and please bear with me if I do something wrong :-) )

Frans

Re: I got the point - did everyone one else? [was: Re: [PATCH 70/70]...]

[Marcin Juszkiewicz]

On Thursday 05 of March 2009 13:33:39 Mike (mwester) wrote:

> Yes, in the NORMAL case that would be true.  Seven patches - fine,
> that would work.  10x more than that? - that's clearly a case where
> clear thinking would put the changes on a branch and have it reviewed
> there. 

I sent hrw/poky-rpm branch for review on 19 November 2008. It contained 
nearly same set of patches but needed some work. **No one** (except 
Koen) looked at it. Thats why I sent whole branch as patchset to ML. 
During first hours it got at least 3 persons who read patches and gave 
ideas how to improve their quality. Tom Rini even started builds to 
check does everything works on his build machine.

And yes - patchset should be squashed but I am tired of that branch 
because I work on it since start of November.

> 70 patches?  Come on, who's going to extract and apply 70 patches
> from email?  Not likely!

And no one has to - whole patchset is available as GIT branch and I 
wrote about it in first mail.

The good thing is that I do not plan any such big merges in near future.

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

Re: Merging RPM support from Poky

[Koen Kooi]

On 04-03-09 16:52, Marcin Juszkiewicz wrote:
> As some of you know Poky has RPM support written. It consists few parts:
>
> - creating RPM packages
> - creating rootfs from RPM packages
> - using RPM/YUM on device to managing packages (installing from local and
>    remote packages
>
> I had one attempt to get it merged before but it had some bugs so I started
> from scratch. Extracting required patches from pile of 1800 Poky changsets
> took me some time.
>
> With this patchset I managed to build 'minimal-image' for AT91SAM9263-EK
> machine. As distribution I used 'minimal' to get something other then
> Angstrom.
>
> So please review it (patch 67 is already merged in .dev tree).

patch 1 thru 30 look OK to go in. The python recipes aren't up to date 
with the current state of distutils.bbclass, but the effect is harmless.
I'll try to have a look at 31-70 later.

regards,

Koen

Re: Merging RPM support from Poky

[Michael 'Mickey' Lauer]

Impressive work, both from the original author and you.

I don't know much about rpm or yum so I can't really comment on that. I
didn't see any particular problems other than commented on.

-- 
:M:

Re: Merging RPM support from Poky

[Marcin Juszkiewicz]

On Wednesday 04 of March 2009 18:21:44 Michael 'Mickey' Lauer wrote:
> Impressive work, both from the original author and you.

Most of work was done by Richard Purdie, then I had to check how it 
works and make it work also on device. Some changes were done by other 
OpenedHand guys. My patchset was result of digging in over thousand of 
Poky changes and some of them were tweaked a bit to apply to current OE.

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz

Re: Merging RPM support from Poky

[Philip Balister]

[-- Attachment #1: Type: text/plain, Size: 531 bytes --]

Marcin Juszkiewicz wrote:
> On Wednesday 04 of March 2009 18:21:44 Michael 'Mickey' Lauer wrote:
>> Impressive work, both from the original author and you.
> 
> Most of work was done by Richard Purdie, then I had to check how it 
> works and make it work also on device. Some changes were done by other 
> OpenedHand guys. My patchset was result of digging in over thousand of 
> Poky changes and some of them were tweaked a bit to apply to current OE.

My only suggestion is git rebase --interactive origin :)

Philip

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3303 bytes --]

Re: Merging RPM support from Poky

[Tom Rini]

On Wed, Mar 04, 2009 at 04:52:15PM +0100, Marcin Juszkiewicz wrote:

> As some of you know Poky has RPM support written. It consists few parts:
> 
> - creating RPM packages
> - creating rootfs from RPM packages
> - using RPM/YUM on device to managing packages (installing from local and
>   remote packages
> 
> I had one attempt to get it merged before but it had some bugs so I started
> from scratch. Extracting required patches from pile of 1800 Poky changsets
> took me some time.
> 
> With this patchset I managed to build 'minimal-image' for AT91SAM9263-EK
> machine. As distribution I used 'minimal' to get something other then
> Angstrom.
> 
> So please review it (patch 67 is already merged in .dev tree).
> 
> It is also visible on Web: http://cgit.openembedded.net/cgit.cgi?url=openembedded/log/&h=hrw/poky-merge/add-rpm-packages-support
> 
> Fetch via: git pull hrw/poky-merge/add-rpm-packages-support

OK.  I got a failure that I'm not quite sure where it's from, other than
rootfs_rpm.bbclass.  Log is http://pastebin.com/d64e6cd01
MACHINE=nokia800 DISTRO=minimal and unrelated to BB_NUMBER_THREADS /
PARALLEL_MAKE.

-- 
Tom Rini

Re: Merging RPM support from Poky

[Tom Rini]

On Wed, Mar 04, 2009 at 04:00:42PM -0700, Tom Rini wrote:
> On Wed, Mar 04, 2009 at 04:52:15PM +0100, Marcin Juszkiewicz wrote:
> 
> > As some of you know Poky has RPM support written. It consists few parts:
> > 
> > - creating RPM packages
> > - creating rootfs from RPM packages
> > - using RPM/YUM on device to managing packages (installing from local and
> >   remote packages
> > 
> > I had one attempt to get it merged before but it had some bugs so I started
> > from scratch. Extracting required patches from pile of 1800 Poky changsets
> > took me some time.
> > 
> > With this patchset I managed to build 'minimal-image' for AT91SAM9263-EK
> > machine. As distribution I used 'minimal' to get something other then
> > Angstrom.
> > 
> > So please review it (patch 67 is already merged in .dev tree).
> > 
> > It is also visible on Web: http://cgit.openembedded.net/cgit.cgi?url=openembedded/log/&h=hrw/poky-merge/add-rpm-packages-support
> > 
> > Fetch via: git pull hrw/poky-merge/add-rpm-packages-support
> 
> OK.  I got a failure that I'm not quite sure where it's from, other than
> rootfs_rpm.bbclass.  Log is http://pastebin.com/d64e6cd01
> MACHINE=nokia800 DISTRO=minimal and unrelated to BB_NUMBER_THREADS /
> PARALLEL_MAKE. 

The problem is that python-sqlite-native doesn't exist and I don't have
that installed on my system.

-- 
Tom Rini

Re: Merging RPM support from Poky

[Marcin Juszkiewicz]

Rebased, squashed and pushed into org.openembedded.dev.

Now I can forget that RPM packages exists :)

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz