[1/4] openssl: moved files

Submitted by Sean Nyekjaer on Oct. 2, 2014, 12:53 p.m.

Details

Message ID fa549834b0cbb3bed9a9a0b789539194e88a12cb.1412253708.git.sean.nyekjaer@prevas.dk
State Under Review
Delegated to: Kim
Headers show

Commit Message

Sean Nyekjaer Oct. 2, 2014, 12:53 p.m.
Patches for minor versions was duplicated in stable branches.

Signed-off-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk>
---
 .../{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%)

Patch hide | download patch | download mbox

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"