Fix a number of rpm/zypper issues and related

index a7a5894..ac30cbe 100644
@@ -233,9 +233,10 @@ def splitfile2(debugsrcdir, d):
        processdebugsrc =  "LC_ALL=C ; sort -z -u '%s' | egrep -v -z '(<internal>|<built-in>)$' | "
        # We need to ignore files that are not actually ours
        # we do this by only paying attention to items from this package
-       processdebugsrc += "egrep -z '%s' | "
+       processdebugsrc += "fgrep -z '%s' | "
        processdebugsrc += "(cd '%s' ; cpio -pd0mL '%s%s' 2>/dev/null)"
 
+       bb.note(processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir))
        os.system(processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir))
 
        # The copy by cpio may have resulted in some empty directories!  Remove these

index caafbdc..04ccabd 100644
@@ -46,6 +46,32 @@ fakeroot rootfs_rpm_do_rootfs () {
 	# Setup base system configuration
 	mkdir -p ${IMAGE_ROOTFS}/etc/rpm/
 
+	mkdir -p ${IMAGE_ROOTFS}${rpmlibdir}
+	mkdir -p ${IMAGE_ROOTFS}${rpmlibdir}/log
+	cat > ${IMAGE_ROOTFS}${rpmlibdir}/DB_CONFIG << EOF
+# ================ Environment
+set_data_dir            .
+set_create_dir          .
+set_lg_dir              ./log
+set_tmp_dir             ./tmp
+
+# -- thread_count must be >= 8
+set_thread_count        64
+
+# ================ Logging
+
+# ================ Memory Pool
+set_mp_mmapsize         268435456
+
+# ================ Locking
+set_lk_max_locks        16384
+set_lk_max_lockers      16384
+set_lk_max_objects      16384
+mutex_set_max           163840
+
+# ================ Replication
+EOF
+
 	#install pacakges
 	export INSTALL_ROOTFS_RPM="${IMAGE_ROOTFS}"
 	export INSTALL_PLATFORM_RPM="${TARGET_ARCH}"

new file mode 100644
index 0000000..9128237
@@ -0,0 +1,21 @@
+Configure distro version package
+
+We need to configure a package that the system can use to determine the
+system distribution version.
+
+Hack: for now set to task-poky-rpm.
+
+Signed-off-by: Mark Hatle <[email protected]>
+
+diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
+--- git.orig/zypp/ZConfig.cc	2011-03-14 16:30:07.492786134 -0500
++++ git/zypp/ZConfig.cc	2011-03-15 11:39:15.396801927 -0500
+@@ -821,7 +821,7 @@
+   ///////////////////////////////////////////////////////////////////
+ 
+   std::string ZConfig::distroverpkg() const
+-  { return "redhat-release"; }
++  { return "task-poky-rpm"; }
+ 
+   ///////////////////////////////////////////////////////////////////
+ 

index 825339d..621ce45 100644
@@ -13,7 +13,7 @@ RDEPENDS_${PN} = "sat-solver"
 
 S = "${WORKDIR}/git"
 PV = "0.0-git${SRCPV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
            file://no-doc.patch \

@@ -22,6 +22,7 @@ SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
            file://builtin-arch.patch;apply=no \
            file://no-builtin-arch.patch;apply=no \
            file://archconf.patch;apply=no \
+	   file://config-release.patch \
           "
 
 SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"

index c08545c..cc1e188 100644
@@ -165,7 +165,7 @@ SRCREV_pn-qemu-nativesdk ??= "${QEMUSRCREV}"
 SRCREV_pn-qemu ??= "${QEMUSRCREV}"
 SRCREV_pn-qemugl ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
 SRCREV_pn-qemugl-nativesdk ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
-SRCREV_pn-sat-solver = "9e1f2a097965debebc69cebf8ed73c6ff31a5220"
+SRCREV_pn-sat-solver = "20212ccd92c6b3a5a93a83da5d7d60e9c305e75c"
 SRCREV_pn-screenshot ??= "292"
 SRCREV_pn-settings-daemon ??= "0f174f463dfed500b65533e249cd22942e439c77"
 SRCREV_pn-swabber-native ??= "a0792390c5d6d5a5bade7ab155c80eef3f30fa52"

index d7b80b0..854bd40 100644
@@ -3,9 +3,11 @@ not building docs (need oxygen)
 
 8/19/2010 - created by Qing He <[email protected]>
 1/24/2011 - Disable Fedora/Debian checking/settings by Mark Hatle <[email protected]>
+3/15/2011 - Updated to newer version of sat-solver by Mark Hatle <[email protected]>
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+diff -ur git.orig/CMakeLists.txt git/CMakeLists.txt
+--- git.orig/CMakeLists.txt	2011-03-15 17:14:22.000000000 -0500
++++ git/CMakeLists.txt	2011-03-15 17:20:09.648880770 -0500
 @@ -35,22 +35,15 @@
  FIND_PACKAGE(Check REQUIRED)
  FIND_PACKAGE(ZLIB REQUIRED)

@@ -49,28 +51,22 @@ not building docs (need oxygen)
 -ENDIF ( FEDORA )
 -ENDIF ( NOT DEBIAN )
  
- SET( PACKAGE "satsolver" )
- SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" )
-@@ -159,22 +153,7 @@
- ADD_SUBDIRECTORY(applayer)
+ INCLUDE ( CheckFunctionExists )
+ INCLUDE ( TestBigEndian )
+@@ -164,7 +158,7 @@
+ 
+ MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}")
+ 
+-set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Werror -Wall" )
++set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Werror -Wall -g" )
+ set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" )
+ set ( CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS} -g3 -O0" )
+ 
+@@ -173,7 +167,7 @@
+ ADD_SUBDIRECTORY(tools)
  ADD_SUBDIRECTORY(tests)
  ADD_SUBDIRECTORY(examples)
 -ADD_SUBDIRECTORY(doc)
--
--FIND_PACKAGE(SWIG)
--
--IF ( SWIG_FOUND )
--  ADD_SUBDIRECTORY(bindings)
--ELSE ( SWIG_FOUND )
-- # for older version of swig/cmake
-- FIND_PROGRAM(SWIG_EXECUTABLE
--   NAMES swig-1.3 swig
--  PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin
-- )
-- IF ( SWIG_EXECUTABLE )
--  ADD_SUBDIRECTORY(bindings)
-- ENDIF ( SWIG_EXECUTABLE )
--ENDIF ( SWIG_FOUND )
 +#ADD_SUBDIRECTORY(doc)
  
  MESSAGE(STATUS "version: ${VERSION}")

new file mode 100644
index 0000000..8ce1b15
@@ -0,0 +1,30 @@
+sat-solver rpmdb based solv database construction
+
+The first time the database is created on an RPM5 system it works 
+correctly.  However any subsequent rebuilds cause an empty database to 
+occur.
+
+The following is from Michael Schroeder <[email protected]>:
+> rpmdb2solv contains a hack that makes it use the unchanged already
+> converted packages. To do this, it needs to get the database id
+> for every installed packages by reading the "Name" index. This
+> somehow doesn't seem to work with rpm5.
+>
+> As a workaround you can add a "ref = 0;" line at the top of the
+> repo_add_rpmdb() function in ext/repo_rpmdb.c.
+
+Signed-off-by: Mark Hatle <[email protected]>
+
+diff -ur git.orig/ext/repo_rpmdb.c git/ext/repo_rpmdb.c
+--- git.orig/ext/repo_rpmdb.c	2011-03-16 09:43:50.470008215 -0500
++++ git/ext/repo_rpmdb.c	2011-03-16 09:47:55.503989694 -0500
+@@ -1344,6 +1344,9 @@
+   memset(&dbkey, 0, sizeof(dbkey));
+   memset(&dbdata, 0, sizeof(dbdata));
+ 
++  /* Workaround for RPM 5 database construction */
++  ref = 0;
++
+   if (!rootdir)
+     rootdir = "";
+ 

index 54420cd..a6519d5 100644
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
 DEPENDS = "libcheck rpm zlib expat db"
 
 PV = "0.0-git${SRCPV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
            file://cmake.patch \
            file://rpm5.patch \
+           file://rpm5-solvdb.patch \
            file://db5.patch \
            file://builtin-arch.patch;apply=no \
            file://no-builtin-arch.patch;apply=no \

index 3704816..dd51c9c 100644
@@ -43,7 +43,7 @@ LICENSE = "LGPL 2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "bzip2 zlib python perl db openssl elfutils expat libpcre attr acl popt"
-PR = "r14"
+PR = "r15"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...

@@ -343,6 +343,7 @@ do_install_append() {
 	sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros
 	sed -i -e 's,%__perl_provides,#%%__perl_provides,' ${D}/${libdir}/rpm/macros
 	sed -i -e 's,%__perl_requires,#%%__perl_requires,' ${D}/${libdir}/rpm/macros
+	sed -i -e 's,%_repackage_all_erasures[^_].*,%_repackage_all_erasures 0,' ${D}/${libdir}/rpm/macros
 
 	# Enable Debian style arbitrary tags...
 	sed -i -e 's,%_arbitrary_tags[^_].*,%_arbitrary_tags %{_arbitrary_tags_debian},' ${D}/${libdir}/rpm/macros