* [PATCH 0/2] Minor fixes
@ 2012-10-03 12:37 Paul Eggleton
2012-10-03 12:37 ` [PATCH 1/2] buildhistory_analysis: update to use explode_dep_versions2() Paul Eggleton
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Paul Eggleton @ 2012-10-03 12:37 UTC (permalink / raw)
To: openembedded-core
The following changes since commit eb96be4db46039752c44dc37ef676eaac04e3dba:
xf86-video-intel: drop libxvmc dependency (2012-10-03 12:41:03 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/fixes2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes2
Paul Eggleton (2):
buildhistory_analysis: update to use explode_dep_versions2()
rpmresolve: fix reporting of multiple matches error
meta/lib/oe/buildhistory_analysis.py | 23 +++++++++++++++++----
meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c | 6 +++---
meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 +-
3 files changed, 23 insertions(+), 8 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/2] buildhistory_analysis: update to use explode_dep_versions2()
2012-10-03 12:37 [PATCH 0/2] Minor fixes Paul Eggleton
@ 2012-10-03 12:37 ` Paul Eggleton
2012-10-03 12:37 ` [PATCH 2/2] rpmresolve: fix reporting of multiple matches error Paul Eggleton
2012-10-05 16:08 ` [PATCH 0/2] Minor fixes Saul Wold
2 siblings, 0 replies; 8+ messages in thread
From: Paul Eggleton @ 2012-10-03 12:37 UTC (permalink / raw)
To: openembedded-core
Handle where multiple version specifications are present for the same
dependency.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/lib/oe/buildhistory_analysis.py | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py
index a5a607e..ad57f00 100644
--- a/meta/lib/oe/buildhistory_analysis.py
+++ b/meta/lib/oe/buildhistory_analysis.py
@@ -262,8 +262,8 @@ def compare_lists(alines, blines):
def compare_pkg_lists(astr, bstr):
- depvera = bb.utils.explode_dep_versions(astr)
- depverb = bb.utils.explode_dep_versions(bstr)
+ depvera = bb.utils.explode_dep_versions2(astr)
+ depverb = bb.utils.explode_dep_versions2(bstr)
# Strip out changes where the version has increased
remove = []
@@ -271,8 +271,23 @@ def compare_pkg_lists(astr, bstr):
if k in depverb:
dva = depvera[k]
dvb = depverb[k]
- if dva and dvb and dva != dvb:
- if bb.utils.vercmp(bb.utils.split_version(dva), bb.utils.split_version(dvb)) < 0:
+ if dva and dvb and len(dva) == len(dvb):
+ # Since length is the same, sort so that prefixes (e.g. >=) will line up
+ dva.sort()
+ dvb.sort()
+ removeit = True
+ for dvai, dvbi in zip(dva, dvb):
+ if dvai != dvbi:
+ aiprefix = dvai.split(' ')[0]
+ biprefix = dvbi.split(' ')[0]
+ if aiprefix == biprefix and aiprefix in ['>=', '=']:
+ if bb.utils.vercmp(bb.utils.split_version(dvai), bb.utils.split_version(dvbi)) > 0:
+ removeit = False
+ break
+ else:
+ removeit = False
+ break
+ if removeit:
remove.append(k)
for k in remove:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/2] rpmresolve: fix reporting of multiple matches error
2012-10-03 12:37 [PATCH 0/2] Minor fixes Paul Eggleton
2012-10-03 12:37 ` [PATCH 1/2] buildhistory_analysis: update to use explode_dep_versions2() Paul Eggleton
@ 2012-10-03 12:37 ` Paul Eggleton
2012-10-05 16:08 ` [PATCH 0/2] Minor fixes Saul Wold
2 siblings, 0 replies; 8+ messages in thread
From: Paul Eggleton @ 2012-10-03 12:37 UTC (permalink / raw)
To: openembedded-core
We were mistakenly writing what was meant to go to stderr into the
output file, so when the "Multiple matches" error showed we weren't
actually seeing the matches printed.
Also change the wording of the "Unable to find package..." to "Unable
to resolve package..." instead so that it makes more sense if it is
printed after the "Multiple matches" error.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c | 6 +++---
meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c b/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
index 3613ee5..4e9d055 100644
--- a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
+++ b/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
@@ -185,7 +185,7 @@ int processPackages(rpmts *ts, int tscount, const char *packagelistfn, int ignor
char *value = NULL;
rc = getPackageStr(ts[i], keys[keyindex], RPMTAG_PACKAGEORIGIN, &value);
if(rc == 0)
- fprintf(outf, " %s\n", value);
+ fprintf(stderr, " %s\n", value);
else
fprintf(stderr, " (%s)\n", keys[keyindex]);
}
@@ -197,10 +197,10 @@ int processPackages(rpmts *ts, int tscount, const char *packagelistfn, int ignor
if( !found ) {
if( ignoremissing ) {
- fprintf(stderr, "unable to find package %s - ignoring\n", line);
+ fprintf(stderr, "Unable to resolve package %s - ignoring\n", line);
}
else {
- fprintf(stderr, "unable to find package %s\n", line);
+ fprintf(stderr, "Unable to resolve package %s\n", line);
missing = 1;
}
}
diff --git a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb b/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
index 3ce4369..ea542e1 100644
--- a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
+++ b/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "OpenEmbedded RPM resolver - performs RPM database lookups in batc
DEPENDS = "rpm"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r1"
+PR = "r2"
SRC_URI = "file://rpmresolve.c"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/2] Minor fixes
2012-10-03 12:37 [PATCH 0/2] Minor fixes Paul Eggleton
2012-10-03 12:37 ` [PATCH 1/2] buildhistory_analysis: update to use explode_dep_versions2() Paul Eggleton
2012-10-03 12:37 ` [PATCH 2/2] rpmresolve: fix reporting of multiple matches error Paul Eggleton
@ 2012-10-05 16:08 ` Saul Wold
2 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2012-10-05 16:08 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
On 10/03/2012 05:37 AM, Paul Eggleton wrote:
> The following changes since commit eb96be4db46039752c44dc37ef676eaac04e3dba:
>
> xf86-video-intel: drop libxvmc dependency (2012-10-03 12:41:03 +0100)
>
> are available in the git repository at:
>
> git://git.openembedded.org/openembedded-core-contrib paule/fixes2
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes2
>
> Paul Eggleton (2):
> buildhistory_analysis: update to use explode_dep_versions2()
> rpmresolve: fix reporting of multiple matches error
>
> meta/lib/oe/buildhistory_analysis.py | 23 +++++++++++++++++----
> meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c | 6 +++---
> meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 +-
> 3 files changed, 23 insertions(+), 8 deletions(-)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] Minor fixes
@ 2012-01-04 1:31 Joshua Lock
2012-01-04 11:25 ` Richard Purdie
0 siblings, 1 reply; 8+ messages in thread
From: Joshua Lock @ 2012-01-04 1:31 UTC (permalink / raw)
To: openembedded-core
A couple of small patches created in the course of putting together a point
release for Yocto 1.1.
Cheers,
Joshua
The following changes since commit de679a3036ebef1c7d7b8ee23f05590c95e498d9:
pseudo: ensure libs are included in package (2012-01-03 12:10:59 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/stuff
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/stuff
Joshua Lock (2):
linux-tools: add binutils to perf DEPENDS
cogl: ensure we can build on armv4
.../clutter/cogl/build_for_armv4t.patch | 23 ++++++++++++++++++++
meta/recipes-graphics/clutter/cogl_1.8.2.bb | 5 +++-
meta/recipes-graphics/clutter/cogl_git.bb | 5 ++-
meta/recipes-kernel/linux/linux-tools.inc | 2 +-
4 files changed, 31 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
--
1.7.7.5
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] Minor fixes
@ 2011-05-16 20:18 Tom Rini
2011-05-17 18:23 ` Saul Wold
0 siblings, 1 reply; 8+ messages in thread
From: Tom Rini @ 2011-05-16 20:18 UTC (permalink / raw)
To: openembedded-core
The following series brings in two minor fixups I've pushed into openembedded
master recently. openssh was being silly and using ${libdir}exec rather
than ${libexecdir} and we weren't wrapping perl${PV} which breaks relocated
caches where perl-native exists and perl doesn't.
Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: trini/minor-fixes-16may2011
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=trini/minor-fixes-16may2011
Thanks,
Tom Rini <tom_rini@mentor.com>
---
Tom Rini (2):
openssh: Don't use ${libdir}exec
perl-native: create_wrapper on perl${PV} too
meta/recipes-connectivity/openssh/openssh_5.6p1.bb | 4 ++--
meta/recipes-devtools/perl/perl-native_5.12.3.bb | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-10-05 16:21 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-03 12:37 [PATCH 0/2] Minor fixes Paul Eggleton
2012-10-03 12:37 ` [PATCH 1/2] buildhistory_analysis: update to use explode_dep_versions2() Paul Eggleton
2012-10-03 12:37 ` [PATCH 2/2] rpmresolve: fix reporting of multiple matches error Paul Eggleton
2012-10-05 16:08 ` [PATCH 0/2] Minor fixes Saul Wold
-- strict thread matches above, loose matches on Subject: below --
2012-01-04 1:31 Joshua Lock
2012-01-04 11:25 ` Richard Purdie
2011-05-16 20:18 Tom Rini
2011-05-17 18:23 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox