Update the previous request with upstream solution

The upstream maintainer came up with a proper solution to the problem. This solution is brought in by a version uprev of sat-solver, as well as some refactoring of the cmake.patch into two components. One of which will end up being sent to the upstream author for possible inclusion.

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

Thanks,
Mark Hatle <[email protected]>
---

Mark Hatle (7):
package.bbclass: Fix missing debug src files rootfs_rpm.bbclass: Add additional system configuration to RPM space
libzypp: Fix release query
sat-solver: uprev to the latest version
sat-solver: Add workaround for RPM 5 db construction
rpm: Disable repackage on upgrade/erasure by default
sat-solver: Fix solution DB generation and general cleanup

 meta/classes/package.bbclass                       |    3 +-
 meta/classes/rootfs_rpm.bbclass                    |   26 +++++++
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    3 +-
 .../libzypp/libzypp/config-release.patch           |   21 ++++++
 meta/recipes-extended/libzypp/libzypp_git.bb       |    3 +-
 .../sat-solver/sat-solver/cmake.patch              |   76 ++++----------------
 .../sat-solver/sat-solver/rpm5.patch               |   53 --------------
 .../sat-solver/sat-solver/sat-solver_rpm5.patch    |   67 +++++++++++++++++
 meta/recipes-extended/sat-solver/sat-solver_git.bb |    6 +-
 10 files changed, 138 insertions(+), 122 deletions(-)
 create mode 100644 meta/recipes-extended/libzypp/libzypp/config-release.patch
 delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/rpm5.patch
 create mode 100644 meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch

1.7.3.4

Uprev sat-solver to the latest git version. This corrects the solv db generation with RPM5.

Refactor the patches for RPM5 support, cleaning up components of the cmake.patch for submission upstream. (Also fix a problem remaining in the upstream with a mismatched function name.)

---
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 .../sat-solver/sat-solver/cmake.patch              |   58 ++---------------
 .../sat-solver/sat-solver/rpm5-solvdb.patch        |   30 ---------
 .../sat-solver/sat-solver/rpm5.patch               |   53 ---------------
 .../sat-solver/sat-solver/sat-solver_rpm5.patch    |   67 ++++++++++++++++++++
 meta/recipes-extended/sat-solver/sat-solver_git.bb |    7 +-
 6 files changed, 78 insertions(+), 139 deletions(-)
 delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/rpm5-solvdb.patch
 delete mode 100644 meta/recipes-extended/sat-solver/sat-solver/rpm5.patch
 create mode 100644 meta/recipes-extended/sat-solver/sat-solver/sat-solver_rpm5.patch

index cc1e188..9a0a32f 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 = "20212ccd92c6b3a5a93a83da5d7d60e9c305e75c"
+SRCREV_pn-sat-solver = "0a7378d5f482f477a01cf1690d76871ab8bdcc32"
 SRCREV_pn-screenshot ??= "292"
 SRCREV_pn-settings-daemon ??= "0f174f463dfed500b65533e249cd22942e439c77"
 SRCREV_pn-swabber-native ??= "a0792390c5d6d5a5bade7ab155c80eef3f30fa52"

deleted file mode 100644
index 8ce1b15..0000000
@@ -1,30 +0,0 @@
-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 a6519d5..ba5af67 100644
@@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
 DEPENDS = "libcheck rpm zlib expat db"
 
 PV = "0.0-git${SRCPV}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
+           file://sat-solver_rpm5.patch \
            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 \

@@ -20,7 +19,7 @@ SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECMAKE += "-DLIB=lib"
+EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5"
 
 inherit cmake pkgconfig
 

1.7.3.4

Merged to master, thanks.

Richard