[oe-commits] Martin Jansa : debian.bbclass: call auto_libname in reverse sorted AUTO_LIBNAME_PKGS

git version control git at git.openembedded.org
Tue Feb 22 01:33:26 UTC 2011


Module: openembedded.git
Branch: trini/simplify-target-flags
Commit: 2eca738f47bbb86144b40373e0fa1359e9c79185
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2eca738f47bbb86144b40373e0fa1359e9c79185

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Feb 15 10:35:58 2011 +0100

debian.bbclass: call auto_libname in reverse sorted AUTO_LIBNAME_PKGS

* see comment for reason why we need this
* more info:
  http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-February/029877.html

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 classes/debian.bbclass |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/classes/debian.bbclass b/classes/debian.bbclass
index 1a2c7da..7cdb6d2 100644
--- a/classes/debian.bbclass
+++ b/classes/debian.bbclass
@@ -101,7 +101,13 @@ python debian_package_name_hook () {
 					if newpkg != pkg:
 						bb.data.setVar('PKG_' + pkg, newpkg, d)
 
-	for pkg in (bb.data.getVar('AUTO_LIBNAME_PKGS', d, 1) or "").split():
+	# reversed sort is needed when some package is substring of another
+	# ie in ncurses we get without reverse sort: 
+	# DEBUG: LIBNAMES: pkgname libtic5 devname libtic pkg ncurses-libtic orig_pkg ncurses-libtic debian_pn None newpkg libtic5
+	# and later
+	# DEBUG: LIBNAMES: pkgname libtic5 devname libtic pkg ncurses-libticw orig_pkg ncurses-libtic debian_pn None newpkg libticw
+	# so we need to handle ncurses-libticw->libticw5 before ncurses-libtic->libtic5
+	for pkg in sorted((bb.data.getVar('AUTO_LIBNAME_PKGS', d, 1) or "").split(), reverse=True):
 		auto_libname(packages, pkg)
 }
 





More information about the Openembedded-commits mailing list