From patchwork Thu Oct 2 12:53:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Sean_Nyekj=C3=A6r?= X-Patchwork-Id: 395940 X-Patchwork-Delegate: kiho@prevas.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 0EE9E140097 for ; Thu, 2 Oct 2014 22:53:26 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 669ED401CE for ; Thu, 2 Oct 2014 14:53:23 +0200 (CEST) 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 F21643FCF2 for ; Thu, 2 Oct 2014 14:53:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=4946; q=dns/txt; s=ironport2; t=1412254402; x=1443790402; h=from:to:subject:date:message-id:in-reply-to:references: mime-version; bh=OPn56cmPiO0+epqA9aQOHnIVw12nFVW8sYyVnuHCQYY=; b=fbEPR0p9ng8uXeU5YXwITf4CejjPiyXRJbgzT27VRLkEgDX2RAHGTAci vdDK96EAGhgUnwvCsxYI7qWAbF91beslzK1VetFNRedH4SAG+GZXavuxo sim/QC+7vXNuWC5zkPz3gfHVsnT7x4bCWPfjbV8NnkbQzRxuU61qXS1LG o=; X-IronPort-AV: E=Sophos;i="5.04,638,1406584800"; d="scan'208";a="1124075" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 02 Oct 2014 14:53:21 +0200 Received: from skn.prevas.se (172.16.11.28) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.347.0; Thu, 2 Oct 2014 14:53:21 +0200 From: Sean Nyekjaer To: Subject: [PATCH 1/4] openssl: moved files Date: Thu, 2 Oct 2014 14:53:15 +0200 Message-ID: X-Mailer: git-send-email 2.1.2 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.16.11.28] 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 Patches for minor versions was duplicated in stable branches. Signed-off-by: Sean Nyekjaer --- .../{openssl-1.0.1g => openssl-1.0.1}/fix-pod-errors.patch | 0 recipes/openssl/{openssl-1.0.1g => openssl-1.0.1}/wincrypt.patch | 0 recipes/openssl/openssl.inc | 9 +++++++++ .../engines-install-in-libdir-ssl.patch | 0 recipes/openssl/{openssl-1.0.1g => openssl}/mingw.patch | 0 .../openssl/{openssl-1.0.1g => openssl}/no-librpath-rpath.patch | 0 recipes/openssl/{openssl-1.0.1g => openssl}/oe-ldflags.patch | 0 recipes/openssl/{openssl-1.0.1g => openssl}/shared-libs.patch | 0 recipes/openssl/openssl_1.0.1g.oe | 6 ------ 9 files changed, 9 insertions(+), 6 deletions(-) rename recipes/openssl/{openssl-1.0.1g => openssl-1.0.1}/fix-pod-errors.patch (100%) rename recipes/openssl/{openssl-1.0.1g => openssl-1.0.1}/wincrypt.patch (100%) rename recipes/openssl/{openssl-1.0.1g => openssl}/engines-install-in-libdir-ssl.patch (100%) rename recipes/openssl/{openssl-1.0.1g => openssl}/mingw.patch (100%) rename recipes/openssl/{openssl-1.0.1g => openssl}/no-librpath-rpath.patch (100%) rename recipes/openssl/{openssl-1.0.1g => openssl}/oe-ldflags.patch (100%) rename recipes/openssl/{openssl-1.0.1g => openssl}/shared-libs.patch (100%) diff --git a/recipes/openssl/openssl-1.0.1g/fix-pod-errors.patch b/recipes/openssl/openssl-1.0.1/fix-pod-errors.patch similarity index 100% rename from recipes/openssl/openssl-1.0.1g/fix-pod-errors.patch rename to recipes/openssl/openssl-1.0.1/fix-pod-errors.patch diff --git a/recipes/openssl/openssl-1.0.1g/wincrypt.patch b/recipes/openssl/openssl-1.0.1/wincrypt.patch similarity index 100% rename from recipes/openssl/openssl-1.0.1g/wincrypt.patch rename to recipes/openssl/openssl-1.0.1/wincrypt.patch diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc index 2ee3c25..01ea702 100644 --- a/recipes/openssl/openssl.inc +++ b/recipes/openssl/openssl.inc @@ -6,6 +6,9 @@ LICENSE = "openssl" RECIPE_TYPES = "machine native sdk" +#Remove last letter from openssl minor version +FILESPATHPKG = "${PN}-${@'${PV}'[:-1]}:openssl" + inherit c make pkgconfig SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz" @@ -117,6 +120,12 @@ FILES_${PN}-engines:HOST_KERNEL_darwin = "${libdir}/ssl/engines/*.dylib" FILES_${PN}-dbg =+ "${libdir}/ssl/engines/.debug" FILES_${PN}-doc =+ "${libdir}/ssl/man" +SRC_URI += "file://engines-install-in-libdir-ssl.patch" +SRC_URI += "file://mingw.patch" +SRC_URI += "file://fix-pod-errors.patch" +SRC_URI += "file://oe-ldflags.patch file://shared-libs.patch" +SRC_URI += "file://no-librpath-rpath.patch" + inherit auto-package-libs AUTO_PACKAGE_LIBS = "crypto ssl" AUTO_PACKAGE_LIBS_DEV_DEPENDS = "${PN}-dev_${PV}" diff --git a/recipes/openssl/openssl-1.0.1g/engines-install-in-libdir-ssl.patch b/recipes/openssl/openssl/engines-install-in-libdir-ssl.patch similarity index 100% rename from recipes/openssl/openssl-1.0.1g/engines-install-in-libdir-ssl.patch rename to recipes/openssl/openssl/engines-install-in-libdir-ssl.patch diff --git a/recipes/openssl/openssl-1.0.1g/mingw.patch b/recipes/openssl/openssl/mingw.patch similarity index 100% rename from recipes/openssl/openssl-1.0.1g/mingw.patch rename to recipes/openssl/openssl/mingw.patch diff --git a/recipes/openssl/openssl-1.0.1g/no-librpath-rpath.patch b/recipes/openssl/openssl/no-librpath-rpath.patch similarity index 100% rename from recipes/openssl/openssl-1.0.1g/no-librpath-rpath.patch rename to recipes/openssl/openssl/no-librpath-rpath.patch diff --git a/recipes/openssl/openssl-1.0.1g/oe-ldflags.patch b/recipes/openssl/openssl/oe-ldflags.patch similarity index 100% rename from recipes/openssl/openssl-1.0.1g/oe-ldflags.patch rename to recipes/openssl/openssl/oe-ldflags.patch diff --git a/recipes/openssl/openssl-1.0.1g/shared-libs.patch b/recipes/openssl/openssl/shared-libs.patch similarity index 100% rename from recipes/openssl/openssl-1.0.1g/shared-libs.patch rename to recipes/openssl/openssl/shared-libs.patch diff --git a/recipes/openssl/openssl_1.0.1g.oe b/recipes/openssl/openssl_1.0.1g.oe index 301fbd6..492d649 100644 --- a/recipes/openssl/openssl_1.0.1g.oe +++ b/recipes/openssl/openssl_1.0.1g.oe @@ -1,16 +1,10 @@ require openssl.inc -SRC_URI += "file://engines-install-in-libdir-ssl.patch" -SRC_URI += "file://mingw.patch" -SRC_URI += "file://fix-pod-errors.patch" - # Parallel make is simply broken for now. PARALLEL_MAKE = "" # Fixup to get openssl to respect ${LDFLAGS}. From OpenEmbedded, thanks :-) -SRC_URI += "file://oe-ldflags.patch file://shared-libs.patch" export OE_LDFLAGS="${LDFLAGS}" -SRC_URI += "file://no-librpath-rpath.patch" SRC_URI += "file://wincrypt.patch"