From: Paul Eggleton <paul.eggle...@linux.intel.com>
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.eggle...@linux.intel.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
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.9.5
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
