From patchwork Tue Jan 14 12:29:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 310591 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 852EB2C00B0 for ; Tue, 14 Jan 2014 23:29:20 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id DBB843FDC0 for ; Tue, 14 Jan 2014 13:29:16 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id 8C9A53FC02 for ; Tue, 14 Jan 2014 13:29:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1892; q=dns/txt; s=ironport2; t=1389702551; x=1421238551; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=3DJtrzuiutWmHPHCAn+XObVkl4e23F7a4IkL9WMW4ZQ=; b=ShCVpgODaSCH/yY2cXzDTLOQdKfu5zCn9t/cwpaVT4urx3rlK2Czpt2i X6wqw29praQedCEuZ9QulMJ2kE5A3VZ7asa9h8Cj7Va35rlmjLLS7Ewcl epHZzQwOjG9YtvFqkUTRQjoFta7KnevhzpHkwXYMz7G5z66T8CdwFedmW k=; X-IronPort-AV: E=Sophos;i="4.95,658,1384297200"; d="scan'208";a="196285" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 14 Jan 2014 13:29:11 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Tue, 14 Jan 2014 13:29:11 +0100 Received: by localhost (Postfix, from userid 30007) id 34EB868153B; Tue, 14 Jan 2014 12:29:11 +0000 (UTC) From: To: Subject: [PATCH 6/9] auto-package-libs: Allow for setting LIBRARY_VERSION Date: Tue, 14 Jan 2014 12:29:04 +0000 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen Signed-off-by: Christian Sørensen --- classes/auto-package-libs.oeclass | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/classes/auto-package-libs.oeclass b/classes/auto-package-libs.oeclass index 74fd155..4522743 100644 --- a/classes/auto-package-libs.oeclass +++ b/classes/auto-package-libs.oeclass @@ -14,6 +14,9 @@ ## the list ## @var AUTO_PACKAGE_LIBDIR If having libraries an uncommen place, ensure that ## path is in this variable. +## @var LIBRARY_VERSION Set the version of the library (foobar.so.2 has +## library version 2). May also be set for a specific package within a +## recipe using LIBRARY_VERSION_pkgname. PACKAGES =+ "${LIBS_AUTO_PACKAGES}" PACKAGES[expand] = 3 @@ -139,10 +142,20 @@ def auto_package_libs (d): pkg_provides = (d.get("PROVIDES_" + pkg) or "").split() pkg_provides.append("%s%s"%(provideprefix, lib.replace("_", "-").lower())) + library_version = d.get("LIBRARY_VERSION") + library_version_pkg = d.get("LIBRARY_VERSION_" + pkg) + if library_version: + if library_version_pkg: + pkg_provides.append(provideprefix + lib.replace("_","-").lower() \ + + '-' + library_version_pkg) + else: + pkg_provides.append(provideprefix + lib.replace("_","-").lower() \ + + '-' + library_version) d.set("PROVIDES_" + pkg, " ".join(pkg_provides)) qaflags = (d.get_flag("PROVIDES_" + pkg,"qa") or "").split() qaflags.append("is-library") + qaflags.append("allow-missing-soname:" + pkg) d.set_flag("PROVIDES_" + pkg, "qa", " ".join(qaflags)) devpkg_provides = (d.get("PROVIDES_" + devpkg) or "").split()