]> code.ossystems Code Review - openembedded-core.git/commitdiff
debian.bbclass: call auto_libname in reverse sorted AUTO_LIBNAME_PKGS
authorMartin Jansa <martin.jansa@gmail.com>
Thu, 3 Mar 2011 22:46:09 +0000 (22:46 +0000)
committerKhem Raj <raj.khem@gmail.com>
Wed, 9 Mar 2011 04:43:53 +0000 (20:43 -0800)
* 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@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
meta/classes/debian.bbclass

index d35882fa4449c5e3f9ae98e10486c4d4665ff567..46a9d089c27786ee0836919c5620f64c71203bc9 100644 (file)
@@ -107,7 +107,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)
 }