Fix buildhistory depgraphs with ipk/deb

PATCH Applied Paul Eggleton 2 participants 3 messages May 13, 2012 – May 16, 2012

lore

Share & tools

lore

Paul Eggleton

author

2012-05-13 09:02 UTC #0 lore raw

cover Fix buildhistory depgraphs with ipk/deb

This fix should also go into 1.2.1.

The following change since commit cab85fd0b481cdbf36477348de75352be3f38ca2:

gdk-pixbuf: Drop unneeded RPROVIDES (2012-05-12 11:23:27 +0100)

is available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/buildhistory-depgraph-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/buildhistory-depgraph-fix

Paul Eggleton (1):
classes/rootfs_*: fix splitting package dependency strings

 meta/classes/rootfs_deb.bbclass |    4 ++--
 meta/classes/rootfs_ipk.bbclass |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Signature · 1 line

1.7.5.4

Paul Eggleton

author

2012-05-13 09:03 UTC #1 lore raw

PATCH 1/1 classes/rootfs_*: fix splitting package dependency strings

If a + character appears in a version specification within the list of package dependencies, the version will not be removed from the list in list_package_depends/recommends leading to garbage appearing in the dependency graphs generated by buildhistory. To avoid any future problems due to unusual characters appearing in versions, change the regex to match almost any character.

Fixes [YOCTO #2451].

Signed-off-by Paul Eggleton <[email protected]>

---
 meta/classes/rootfs_deb.bbclass |    4 ++--
 meta/classes/rootfs_ipk.bbclass |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

meta/classes/rootfs_deb.bbclass +2 -2

index b6c706c..6c9767f 100644
@@ -101,11 +101,11 @@ get_package_filename() {
 }
 
 list_package_depends() {
-	${DPKG_QUERY_COMMAND} -s $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+	${DPKG_QUERY_COMMAND} -s $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
 }
 
 list_package_recommends() {
-	${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+	${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
 }
 
 rootfs_check_package_exists() {

meta/classes/rootfs_ipk.bbclass +2 -2

index cbc63f0..1580086 100644
@@ -143,11 +143,11 @@ get_package_filename() {
 }
 
 list_package_depends() {
-	opkg-cl ${IPKG_ARGS} info $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+	opkg-cl ${IPKG_ARGS} info $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
 }
 
 list_package_recommends() {
-	opkg-cl ${IPKG_ARGS} info $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+	opkg-cl ${IPKG_ARGS} info $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
 }
 
 rootfs_check_package_exists() {

Signature · 1 line

1.7.5.4

Saul Wold

Applied

2012-05-16 18:28 UTC #2 lore raw

Re: [PATCH 1/1] classes/rootfs_*: fix splitting package dependency strings

Quoted 41 lines · Paul Eggleton

If a + character appears in a version specification within the list of package dependencies, the version will not be removed from the list in list_package_depends/recommends leading to garbage appearing in the dependency graphs generated by buildhistory. To avoid any future problems due to unusual characters appearing in versions, change the regex to match almost any character.
Fixes [YOCTO #2451].
Signed-off-by Paul Eggleton<[email protected]>
---
  meta/classes/rootfs_deb.bbclass |    4 ++--
  meta/classes/rootfs_ipk.bbclass |    4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
meta/classes/rootfs_deb.bbclass +2 -2
index b6c706c..6c9767f 100644
@@ -101,11 +101,11 @@ get_package_filename() {
  }
 
  list_package_depends() {
-	${DPKG_QUERY_COMMAND} -s $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+	${DPKG_QUERY_COMMAND} -s $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
  }
 
  list_package_recommends() {
-	${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+	${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
  }
 
  rootfs_check_package_exists() {
meta/classes/rootfs_ipk.bbclass +0 -0
index cbc63f0..1580086 100644
@@ -143,11 +143,11 @@ get_package_filename() {
  }
 
  list_package_depends() {

meta/classes/rootfs_ipk.bbclass get_package_filename() { · line 153

Quoted 10 lines

meta/classes/rootfs_ipk.bbclass +2 -2

-	opkg-cl ${IPKG_ARGS} info $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+	opkg-cl ${IPKG_ARGS} info $1 | grep ^Depends | sed -e 's/^Depends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
  }
 
  list_package_recommends() {
-	opkg-cl ${IPKG_ARGS} info $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+	opkg-cl ${IPKG_ARGS} info $1 | grep ^Recommends | sed -e 's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
  }
 
  rootfs_check_package_exists() {

Merged into OE-Core

Thanks
Sau!