Commit Graph

12 Commits

Author SHA1 Message Date
Mark Hatle 41efbe13cb Fix integration of zypper and sat-solver
Adjust the integration of zypper and sat-solver to ensure that all of the
defined architectures for a given machine are defined identically to Poky.

(From OE-Core rev: b2996efc015bc5ae0b8246924083e76fb5129cea)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-31 22:02:46 +01:00
Mark Hatle 133f7e8cdd Fix sat-solver & RPM5 integration issue
From Michael Schroeder, fix the configuration of how RPM5 handles obsoletes
within the sat-solver.

(From OE-Core rev: 7178a540b35a4a5e4a5e0546eb0c2207d2033cdf)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-31 22:02:45 +01:00
Mark Hatle 275241ea68 sat-solver: Fix solution DB generation and general cleanup
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.)

(From OE-Core rev: 89a5ad96eef411dccea817a6c37cb1e24840fdc1)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-17 00:18:14 +00:00
Mark Hatle 439740063f sat-solver: Add workaround for RPM 5 db 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 <mls@suse.de>:
> 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.

(From OE-Core rev: 3db47b9c2a40db8e94c30dca601b0ab82920c14f)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-16 16:45:01 +00:00
Mark Hatle 5485746914 sat-solver: uprev to the latest version
Upgrade to the latest git version.  Also update the cmake.patch to enable
debugging in all configurations.

(From OE-Core rev: 04da04e371da12815e176c96d852e6bd6afc2b34)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-16 16:45:00 +00:00
Qing He 023c43b98c sat-solver: add machine arch support
(From OE-Core rev: ca758fa404fa447689ff205ee3b4b76bd3f1068a)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-14 21:08:32 +00:00
Mark Hatle 2c32f494cc sat-solver: upgrade to newer git version
This works with rpm 5.4.0

Signed-off-by: Qing He <qing.he@intel.com>

Update the CMAKE configuration file to find the proper DB library as used
by RPM5 within Poky.

Disable checking for Fedora and Debian, as this might lead to incorrect
results.

Merge the dso_linking_change_build_fix with the other cmake changes.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2011-01-30 12:09:52 -08:00
Saul Wold ffd12fc476 sat-solver: Add db as DEPENDS and bump PR
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-01-29 07:16:44 -08:00
Nitin A Kamble 59986bd748 sat-solver: fix the build failure caused by gcc dso linkcing change
The libraries for linking are not determined automatically now. All
the needed libraries must be specified explicitly.

This patch fixes the issue for missing librpmmisc library in the linker
script.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
2011-01-20 21:37:02 +00:00
Kevin Tian 7892add2de sat-solver: change /usr/lib64 to /usr/lib
we use /usr/lib for x86-64 target, but sat-solver will use /usr/lib64 if 64bit
target arch is detected. This finally causes libzypp failed to find libsatsolver.a.
use "-DLIB=lib" to explicitly enforce the requirement

fix [BUGID #286]

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
2010-09-08 14:38:37 +01:00
Richard Purdie 95b2d9395e poky-default-revisions.inc: Move SRCREVs to correct locations, fix whitespace
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-06 14:56:57 +01:00
Qing He 1fb94b77f8 sat-solver: added new package
Signed-off-by: Saul Wold <saul.wold@intel.com>
Signed-off-by: Qing He <qing.he@intel.com>
2010-09-03 18:30:16 -07:00