[PATCH 0/1] Fix buildhistory depgraphs with ipk/deb

[PATCH 0/1] Fix buildhistory depgraphs with ipk/deb

[Paul Eggleton]

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(-)

-- 
1.7.5.4

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

[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 <paul.eggleton@linux.intel.com>
---
 meta/classes/rootfs_deb.bbclass |    4 ++--
 meta/classes/rootfs_ipk.bbclass |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index b6c706c..6c9767f 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -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() {
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index cbc63f0..1580086 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -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() {
-- 
1.7.5.4

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

[Saul Wold]

On 05/13/2012 11:52 AM, Paul Eggleton wrote:
> 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<paul.eggleton@linux.intel.com>
> ---
>   meta/classes/rootfs_deb.bbclass |    4 ++--
>   meta/classes/rootfs_ipk.bbclass |    4 ++--
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
> index b6c706c..6c9767f 100644
> --- a/meta/classes/rootfs_deb.bbclass
> +++ b/meta/classes/rootfs_deb.bbclass
> @@ -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() {
> diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
> index cbc63f0..1580086 100644
> --- a/meta/classes/rootfs_ipk.bbclass
> +++ b/meta/classes/rootfs_ipk.bbclass
> @@ -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() {

Merged into OE-Core

Thanks
	Sau!