Skip to contentSkip to conversation

ocf-linux: extend to provide native and nativesdk recipes

PATCH Applied Khem Raj 3 participants 5 messages Aug 13, 2011 – Aug 15, 2011

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 ocf-linux: extend to provide native and nativesdk recipes

---
 meta-oe/recipes-connectivity/openssl/ocf-linux.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta-oe/recipes-connectivity/openssl/ocf-linux.inc +1 -0
index b98f887..f4ec7c9 100644
@@ -22,3 +22,4 @@ do_install() {
 }
 
 ALLOW_EMPTY = "1"
+BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/2 openssl-1.0.0: Add recipes for openssl_1.0.0d

Delete 1.0.0c recipes
Add patches from debian
Remove recipes for openssl-native use BBCLASSEXTEND instead
Drop libdeps-first.patch it would not let openssl-native build on ubuntu 11.10 Delete debian.patch, all changes in it are now provided by patches under debian dir

---
 .../openssl/openssl-1.0.0c/debian.patch            |  515 ---
 .../openssl/openssl-1.0.0c/libdeps-first.patch     |   27 -
 .../configure-targets.patch                        |    0
 .../openssl-1.0.0d/debian/c_rehash-compat.patch    |   43 +
 .../openssl/openssl-1.0.0d/debian/ca.patch         |   20 +
 .../openssl-1.0.0d/debian/debian-targets.patch     |   52 +
 .../openssl-1.0.0d/debian/make-targets.patch       |   13 +
 .../openssl/openssl-1.0.0d/debian/man-dir.patch    |   13 +
 .../openssl-1.0.0d/debian/man-section.patch        |   32 +
 .../openssl/openssl-1.0.0d/debian/no-rpath.patch   |   13 +
 .../openssl-1.0.0d/debian/no-symbolic.patch        |   13 +
 .../openssl/openssl-1.0.0d/debian/pic.patch        |  240 ++
 .../openssl/openssl-1.0.0d/debian/pkg-config.patch |   34 +
 .../openssl-1.0.0d/debian/version-script.patch     | 4491 ++++++++++++++++++++
 .../engines-install-in-libdir-ssl.patch            |    0
 .../oe-ldflags.patch                               |    0
 .../openssl/openssl-1.0.0d/parallel-make-fix.patch |   20 +
 .../shared-libs.patch                              |    0
 .../openssl/openssl-native_1.0.0c.bb               |   27 -
 .../recipes-connectivity/openssl/openssl_1.0.0c.bb |   36 -
 .../recipes-connectivity/openssl/openssl_1.0.0d.bb |   47 +
 21 files changed, 5031 insertions(+), 605 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/debian.patch
 delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/libdeps-first.patch
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/configure-targets.patch (100%)
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/c_rehash-compat.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/ca.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/debian-targets.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/make-targets.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-dir.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-section.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-rpath.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-symbolic.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pic.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pkg-config.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/version-script.patch
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/engines-install-in-libdir-ssl.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/oe-ldflags.patch (100%)
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/parallel-make-fix.patch
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/shared-libs.patch (100%)
 delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl-native_1.0.0c.bb
 delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl_1.0.0c.bb
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb
meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/debian.patch deleted +0 -515
deleted file mode 100644
index 1cd6e11..0000000
@@ -1,515 +0,0 @@
-Index: openssl-1.0.0/Makefile
-===================================================================
---- openssl-1.0.0.orig/Makefile
-+++ openssl-1.0.0/Makefile
-@@ -26,10 +26,10 @@ HERE=.
- # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
- # Normally it is left empty.
- INSTALL_PREFIX=
--INSTALLTOP=/usr/local/ssl
-+INSTALLTOP=/usr
- 
- # Do not edit this manually. Use Configure --openssldir=DIR do change this!
--OPENSSLDIR=/usr/local/ssl
-+OPENSSLDIR=/usr/lib/ssl
- 
- # NO_IDEA - Define to build without the IDEA algorithm
- # NO_RC4  - Define to build without the RC4 algorithm
-@@ -133,12 +133,13 @@ TESTS = alltests
- 
- MAKEFILE= Makefile
- 
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
--MANSUFFIX=
-+MANSUFFIX=ssl
-+MANSECTION=SSL
- HTMLSUFFIX=html
--HTMLDIR=$(OPENSSLDIR)/html
-+HTMLDIR=/usr/share/doc/openssl/html
- SHELL=/bin/sh
- 
- TOP=    .
-@@ -149,8 +150,8 @@ LIBS=   libcrypto.a libssl.a
- SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
- SHARED_SSL=libssl$(SHLIB_EXT)
- SHARED_LIBS=
--SHARED_LIBS_LINK_EXTS=
--SHARED_LDFLAGS=
-+SHARED_LIBS_LINK_EXTS=.so
-+SHARED_LDFLAGS=-m64 -Wl,--version-script=openssl.ld
- 
- GENERAL=        Makefile
- BASENAME=       openssl
-@@ -324,7 +325,8 @@ libcrypto.pc: Makefile
- 	    echo 'Description: OpenSSL cryptography library'; \
- 	    echo 'Version: '$(VERSION); \
- 	    echo 'Requires: '; \
--	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
-+	    echo 'Libs: -L$${libdir} -lcrypto'; \
-+	    echo 'Libs.private: $(EX_LIBS)'; \
- 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
- 
- libssl.pc: Makefile
-@@ -337,7 +339,8 @@ libssl.pc: Makefile
- 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
- 	    echo 'Version: '$(VERSION); \
- 	    echo 'Requires: '; \
--	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-+	    echo 'Libs: -L$${libdir} -lssl'; \
-+	    echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
- 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
- 
- openssl.pc: Makefile
-@@ -350,7 +353,8 @@ openssl.pc: Makefile
- 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
- 	    echo 'Version: '$(VERSION); \
- 	    echo 'Requires: '; \
--	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-+	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
-+	    echo 'Libs.private: $(EX_LIBS)'; \
- 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
- 
- Makefile: Makefile.org Configure config
-@@ -499,7 +503,7 @@ install: all install_docs install_sw
- install_sw:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
--		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-@@ -608,7 +612,7 @@ install_docs:
- 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- 		(cd `$(PERL) util/dirname.pl $$i`; \
- 		sh -c "$$pod2man \
--			--section=$$sec --center=OpenSSL \
-+			--section=$${sec}$(MANSECTION) --center=OpenSSL \
- 			--release=$(VERSION) `basename $$i`") \
- 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
- 		$(PERL) util/extract-names.pl < $$i | \
-@@ -625,7 +629,7 @@ install_docs:
- 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- 		(cd `$(PERL) util/dirname.pl $$i`; \
- 		sh -c "$$pod2man \
--			--section=$$sec --center=OpenSSL \
-+			--section=$${sec}$(MANSECTION) --center=OpenSSL \
- 			--release=$(VERSION) `basename $$i`") \
- 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
- 		$(PERL) util/extract-names.pl < $$i | \
-Index: openssl-1.0.0/Configure
-===================================================================
---- openssl-1.0.0.orig/Configure
-+++ openssl-1.0.0/Configure
-@@ -1,4 +1,4 @@
--:
-+#!/usr/local/bin/perl
- eval 'exec perl -S $0 ${1+"$@"}'
-     if $running_under_some_shell;
- ##
-@@ -331,6 +331,44 @@ my %table=(
- "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
- "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
- 
-+# Debian GNU/* (various architectures)
-+"debian-alpha","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev4","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev4 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev5","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev5 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armel","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ia64","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i486","gcc:-DL_ENDIAN 	-DTERMIO -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb3 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-i386",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-m68k",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-sparc",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -Wa,--noexecstack -g::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-i386",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-mips","gcc:-O2 -Wa,--noexecstack -g -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::linux_ppc32.o:::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o:::::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
-+"debian-sh3",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4eb",   "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m32r","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -mcpu=v8 -g -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,--noexecstack -Wa,-Av8plus -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::md5-sparcv8plus.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- ####
- #### Variety of LINUX:-)
- ####
-@@ -529,7 +567,7 @@ my %table=(
- # Cygwin
- "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
- "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
--"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
-+-"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
- 
- # NetWare from David Ward ([email protected])
- # requires either MetroWerks NLM development tools, or gcc / nlmconv
-@@ -1465,6 +1503,8 @@ if ($strict_warnings)
- 		}
- 	}
- 
-+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
-+
- open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
- unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
- open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-@@ -1555,7 +1595,8 @@ while (<IN>)
- 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
- 		{
- 		my $sotmp = $1;
--		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-+#		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-+		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
- 		}
- 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
- 		{
-@@ -1683,7 +1724,7 @@ while (<IN>)
- 		}
- 	elsif	(/^#define\s+ENGINESDIR/)
- 		{
--		my $foo = "$prefix/$libdir/engines";
-+		my $foo = "$prefix/lib/ssl/engines";
- 		$foo =~ s/\\/\\\\/g;
- 		print OUT "#define ENGINESDIR \"$foo\"\n";
- 		}
-Index: openssl-1.0.0/config
-===================================================================
---- openssl-1.0.0.orig/config
-+++ openssl-1.0.0/config
-@@ -170,8 +170,8 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
- 	echo "${MACHINE}-whatever-linux1"; exit 0
- 	;;
- 
--    GNU*)
--	echo "hurd-x86"; exit 0;
-+    GNU:*|GNU/*:*)
-+	echo "${MACHINE}-gnuish"; exit 0;
- 	;;
- 
-     LynxOS:*)
-Index: openssl-1.0.0/Makefile.org
-===================================================================
---- openssl-1.0.0.orig/Makefile.org
-+++ openssl-1.0.0/Makefile.org
-@@ -131,12 +131,13 @@ TESTS = alltests
- 
- MAKEFILE= Makefile
- 
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
--MANSUFFIX=
-+MANSUFFIX=ssl
-+MANSECTION=SSL
- HTMLSUFFIX=html
--HTMLDIR=$(OPENSSLDIR)/html
-+HTMLDIR=/usr/share/doc/openssl/html
- SHELL=/bin/sh
- 
- TOP=    .
-@@ -322,7 +323,8 @@ libcrypto.pc: Makefile
- 	    echo 'Description: OpenSSL cryptography library'; \
- 	    echo 'Version: '$(VERSION); \
- 	    echo 'Requires: '; \
--	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
-+	    echo 'Libs: -L$${libdir} -lcrypto'; \
-+	    echo 'Libs.private: $(EX_LIBS)'; \
- 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
- 
- libssl.pc: Makefile
-@@ -335,7 +337,8 @@ libssl.pc: Makefile
- 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
- 	    echo 'Version: '$(VERSION); \
- 	    echo 'Requires: '; \
--	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-+	    echo 'Libs: -L$${libdir} -lssl'; \
-+	    echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
- 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
- 
- openssl.pc: Makefile
-@@ -348,7 +351,8 @@ openssl.pc: Makefile
- 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
- 	    echo 'Version: '$(VERSION); \
- 	    echo 'Requires: '; \
--	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-+	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
-+	    echo 'Libs.private: $(EX_LIBS)'; \
- 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
- 
- Makefile: Makefile.org Configure config
-@@ -497,7 +501,7 @@ install: all install_docs install_sw
- install_sw:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
--		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-@@ -606,7 +610,7 @@ install_docs:
- 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- 		(cd `$(PERL) util/dirname.pl $$i`; \
- 		sh -c "$$pod2man \
--			--section=$$sec --center=OpenSSL \
-+			--section=$${sec}$(MANSECTION) --center=OpenSSL \
- 			--release=$(VERSION) `basename $$i`") \
- 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
- 		$(PERL) util/extract-names.pl < $$i | \
-@@ -623,7 +627,7 @@ install_docs:
- 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- 		(cd `$(PERL) util/dirname.pl $$i`; \
- 		sh -c "$$pod2man \
--			--section=$$sec --center=OpenSSL \
-+			--section=$${sec}$(MANSECTION) --center=OpenSSL \
- 			--release=$(VERSION) `basename $$i`") \
- 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
- 		$(PERL) util/extract-names.pl < $$i | \
-Index: openssl-1.0.0/openssl.ld
-===================================================================
---- /dev/null
-+++ openssl-1.0.0/openssl.ld
-@@ -0,0 +1,5 @@
-+OPENSSL_0.9.8 {
-+	 global:
-+		 *;
-+};
-+
-Index: openssl-1.0.0/engines/openssl.ld
-===================================================================
---- /dev/null
-+++ openssl-1.0.0/engines/openssl.ld
-@@ -0,0 +1,5 @@
-+OPENSSL_0.9.8 {
-+	 global:
-+		 *;
-+};
-+
-Index: openssl-1.0.0/doc/Makefile
-===================================================================
---- /dev/null
-+++ openssl-1.0.0/doc/Makefile
-@@ -0,0 +1,40 @@
-+VERSION =
-+
-+#PODS = $(wildcard *.pod)
-+#MANS = $(addsuffix .man, $(basename $(PODS)))
-+
-+MANS = openssl.1 ssl.3 crypto.3
-+
-+P2M = pod2man --center='OpenSSL Documentation' --release="OpenSSL $(VERSION)"
-+
-+all: manpages
-+
-+.PHONY: manpages 
-+
-+manpages: openssl.1 crypto.3 ssl.3
-+
-+openssl.1:
-+	$(P2M) --section=1 openssl.pod > openssl.1
-+
-+crypto.3:
-+	$(P2M) --section=3 crypto.pod > crypto.3
-+
-+ssl.3:
-+	$(P2M) --section=3 ssl.pod > ssl.3
-+
-+.PHONY: install
-+install:
-+	mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
-+	mkdir -p $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
-+	install -m 644 -p openssl.1 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man1
-+	install -m 644 -p crypto.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
-+	install -m 644 -p ssl.3 $(INSTALL_PREFIX)$(INSTALLTOP)/share/man/man3
-+	rm -f $(MANS)
-+
-+.PHONY: clean
-+clean:
-+	rm -f $(MANS)
-+
-+.PHONY: realclean
-+realclean:
-+	-$(MAKE) clean
-Index: openssl-1.0.0/doc/apps/c_rehash.pod
-===================================================================
---- /dev/null
-+++ openssl-1.0.0/doc/apps/c_rehash.pod
-@@ -0,0 +1,55 @@
-+
-+=pod
-+
-+=head1 NAME
-+
-+c_rehash - Create symbolic links to files named by the hash values
-+
-+=head1 SYNOPSIS
-+
-+B<c_rehash>
-+[directory] ...
-+
-+=head1 DESCRIPTION
-+
-+c_rehash scans directories and takes a hash value of each .pem and .crt file in the directory. It then creates symbolic links for each of the files named by the hash value. This is useful as many programs require directories to be set up like this in order to find the certificates they require. 
-+
-+If any directories are named on the command line then these directories are processed in turn. If not then and the environment variable SSL_CERT_DIR is defined then that is consulted. This variable should be a colon (:) separated list of directories, all of which will be processed. If neither of these conditions are true then /usr/lib/ssl/certs is processed. 
-+
-+For each directory that is to be processed he user must have write permissions on the directory, if they do not then nothing will be printed for that directory.
-+
-+Note that this program deletes all the symbolic links that look like ones that it creates before processing a directory. Beware that if you run the program on a directory that contains symbolic links for other purposes that are named in the same format as those created by this program they will be lost.
-+
-+The hashes for certificate files are of the form <hash>.<n> where n is an integer. If the hash value already exists then n will be incremented, unless the file is a duplicate. Duplicates are detected using the fingerprint of the certificate. A warning will be printed if a duplicate is detected. The hashes for CRL files are of the form <hash>.r<n> and have the same behavior.
-+
-+The program will also warn if there are files with extension .pem which are not certificate or CRL files.
-+
-+The program uses the openssl program to compute the hashes and fingerprints. It expects the executable to be named openssl and be on the PATH, or in the /usr/lib/ssl/bin directory. If the OPENSSL environment variable is defined then this is used instead as the executable that provides the hashes and fingerprints. When called as $OPENSSL x509 -hash -fingerprint -noout -in $file it must output the hash of $file on the first line followed by the fingerprint on the second line, optionally prefixed with some text and an equals sign (=). 
-+
-+=head1 OPTIONS
-+
-+None
-+
-+=head1 ENVIRONMENT
-+
-+=over 4
-+
-+=item B<OPENSSL>
-+
-+The name (and path) of an executable to use to generate hashes and fingerprints (see above).
-+
-+=item B<SSL_CERT_DIR>
-+
-+Colon separated list of directories to operate on. Ignored if directories are listed on the command line.
-+
-+=head1 SEE ALSO
-+
-+L<openssl(1)|openssl(1)>, L<x509(1)|x509(1)>
-+
-+=back
-+
-+=head1 BUGS
-+
-+No known bugs
-+
-+=cut
-Index: openssl-1.0.0/crypto/opensslconf.h
-===================================================================
---- openssl-1.0.0.orig/crypto/opensslconf.h
-+++ openssl-1.0.0/crypto/opensslconf.h
-@@ -11,6 +11,9 @@
- #ifndef OPENSSL_NO_JPAKE
- # define OPENSSL_NO_JPAKE
- #endif
-+#ifndef OPENSSL_NO_IDEA
-+# define OPENSSL_NO_IDEA
-+#endif
- #ifndef OPENSSL_NO_KRB5
- # define OPENSSL_NO_KRB5
- #endif
-@@ -44,6 +47,9 @@
- # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
- #  define NO_JPAKE
- # endif
-+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
-+#  define NO_IDEA
-+# endif
- # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
- #  define NO_KRB5
- # endif
-@@ -68,8 +74,8 @@
- 
- #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
- #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
--#define ENGINESDIR "/usr/local/ssl/lib/engines"
--#define OPENSSLDIR "/usr/local/ssl"
-+#define ENGINESDIR "/usr/lib/ssl/engines"
-+#define OPENSSLDIR "/usr/lib/ssl"
- #endif
- #endif
- 
-@@ -100,14 +106,14 @@
-  * - Intel P6 because partial register stalls are very expensive;
-  * - elder Alpha because it lacks byte load/store instructions;
-  */
--#define RC4_INT unsigned int
-+#define RC4_INT unsigned char
- #endif
- #if !defined(RC4_CHUNK)
- /*
-  * This enables code handling data aligned at natural CPU word
-  * boundary. See crypto/rc4/rc4_enc.c for further details.
-  */
--#undef RC4_CHUNK
-+#define RC4_CHUNK unsigned long
- #endif
- #endif
- 
-@@ -115,7 +121,7 @@
- /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
-  * %20 speed up (longs are 8 bytes, int's are 4). */
- #ifndef DES_LONG
--#define DES_LONG unsigned long
-+#define DES_LONG unsigned int
- #endif
- #endif
- 
-@@ -126,9 +132,9 @@
- /* Should we define BN_DIV2W here? */
- 
- /* Only one for the following should be defined */
--#undef SIXTY_FOUR_BIT_LONG
-+#define SIXTY_FOUR_BIT_LONG
- #undef SIXTY_FOUR_BIT
--#define THIRTY_TWO_BIT
-+#undef THIRTY_TWO_BIT
- #endif
- 
- #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-@@ -140,7 +146,7 @@
- 
- #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
- #define CONFIG_HEADER_BF_LOCL_H
--#undef BF_PTR
-+#define BF_PTR2
- #endif /* HEADER_BF_LOCL_H */
- 
- #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-@@ -170,7 +176,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND D
- /* Unroll the inner loop, this sometimes helps, sometimes hinders.
-  * Very mucy CPU dependant */
- #ifndef DES_UNROLL
--#undef DES_UNROLL
-+#define DES_UNROLL
- #endif
- 
- /* These default values were supplied by
-Index: openssl-1.0.0/crypto/sha/sha.h
-===================================================================
---- openssl-1.0.0.orig/crypto/sha/sha.h
-+++ openssl-1.0.0/crypto/sha/sha.h
-@@ -59,6 +59,7 @@
- #ifndef HEADER_SHA_H
- #define HEADER_SHA_H
- 
-+#include <stddef.h>
- #include <openssl/e_os2.h>
- #include <stddef.h>
- 
meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/libdeps-first.patch deleted +0 -27
deleted file mode 100644
index 1fda69b..0000000
@@ -1,27 +0,0 @@
-Links to previously staged 0.9.8* easily otherwise
-
-Index: openssl-1.0.0/Makefile.shared
-===================================================================
---- openssl-1.0.0.orig/Makefile.shared
-+++ openssl-1.0.0/Makefile.shared
-@@ -96,7 +96,7 @@
-     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
--    $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
-+    $${LDCMD} $${LIBDEPS} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) )
- 
- LINK_SO=	\
-   ( $(SET_X);   \
-@@ -106,9 +106,9 @@
-     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
-     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
--    $${SHAREDCMD} $${SHAREDFLAGS} \
-+    $${SHAREDCMD} $$LIBDEPS $${SHAREDFLAGS} \
- 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
--	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
-+	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS \
-   ) && $(SYMLINK_SO)
- 
- SYMLINK_SO=	\
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/configure-targets.patch renamed from meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/configure-targets.patch +0 -0
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/configure-targets.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/configure-targets.patch
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/c_rehash-compat.patch new file +43 -0

43 lines not on this page · raw message

meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/ca.patch new file +20 -0
new file mode 100644
index 0000000..761eebe
@@ -0,0 +1,20 @@
+Index: openssl-0.9.8m/apps/CA.pl.in
+===================================================================
+--- openssl-0.9.8m.orig/apps/CA.pl.in	2006-04-28 00:28:51.000000000 +0000
++++ openssl-0.9.8m/apps/CA.pl.in	2010-02-27 00:36:51.000000000 +0000
+@@ -65,6 +65,7 @@
+ foreach (@ARGV) {
+ 	if ( /^(-\?|-h|-help)$/ ) {
+ 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
++	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
+ 	    exit 0;
+ 	} elsif (/^-newcert$/) {
+ 	    # create a certificate
+@@ -165,6 +166,7 @@
+ 	} else {
+ 	    print STDERR "Unknown arg $_\n";
+ 	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
++	    print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
+ 	    exit 1;
+ 	}
+ }
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/debian-targets.patch new file +52 -0

52 lines not on this page · raw message

meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/make-targets.patch new file +13 -0
new file mode 100644
index 0000000..f4ddbfa
@@ -0,0 +1,13 @@
+Index: openssl-1.0.0c/Makefile.org
+===================================================================
+--- openssl-1.0.0c.orig/Makefile.org	2010-12-12 16:10:12.000000000 +0100
++++ openssl-1.0.0c/Makefile.org	2010-12-12 16:11:27.000000000 +0100
+@@ -109,7 +109,7 @@
+ ZLIB_INCLUDE=
+ LIBZLIB=
+ 
+-DIRS=   crypto ssl engines apps test tools
++DIRS=   crypto ssl engines apps tools
+ ENGDIRS= ccgost
+ SHLIBDIRS= crypto ssl
+ 
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-dir.patch new file +13 -0
new file mode 100644
index 0000000..a35b37e
@@ -0,0 +1,13 @@
+Index: openssl-1.0.0c/Makefile.org
+===================================================================
+--- openssl-1.0.0c.orig/Makefile.org	2010-12-12 16:11:27.000000000 +0100
++++ openssl-1.0.0c/Makefile.org	2010-12-12 16:11:37.000000000 +0100
+@@ -131,7 +131,7 @@
+ 
+ MAKEFILE= Makefile
+ 
+-MANDIR=$(OPENSSLDIR)/man
++MANDIR=/usr/share/man
+ MAN1=1
+ MAN3=3
+ MANSUFFIX=
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-section.patch new file +32 -0
new file mode 100644
index 0000000..a8ac662
@@ -0,0 +1,32 @@
+Index: openssl-1.0.0c/Makefile.org
+===================================================================
+--- openssl-1.0.0c.orig/Makefile.org	2010-12-12 16:11:37.000000000 +0100
++++ openssl-1.0.0c/Makefile.org	2010-12-12 16:13:28.000000000 +0100
+@@ -134,7 +134,8 @@
+ MANDIR=/usr/share/man
+ MAN1=1
+ MAN3=3
+-MANSUFFIX=
++MANSUFFIX=ssl
++MANSECTION=SSL
+ HTMLSUFFIX=html
+ HTMLDIR=$(OPENSSLDIR)/html
+ SHELL=/bin/sh
+@@ -606,7 +607,7 @@
+ 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
+ 		(cd `$(PERL) util/dirname.pl $$i`; \
+ 		sh -c "$$pod2man \
+-			--section=$$sec --center=OpenSSL \
++			--section=$${sec}$(MANSECTION) --center=OpenSSL \
+ 			--release=$(VERSION) `basename $$i`") \
+ 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+ 		$(PERL) util/extract-names.pl < $$i | \
+@@ -623,7 +624,7 @@
+ 		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
+ 		(cd `$(PERL) util/dirname.pl $$i`; \
+ 		sh -c "$$pod2man \
+-			--section=$$sec --center=OpenSSL \
++			--section=$${sec}$(MANSECTION) --center=OpenSSL \
+ 			--release=$(VERSION) `basename $$i`") \
+ 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
+ 		$(PERL) util/extract-names.pl < $$i | \
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-rpath.patch new file +13 -0
new file mode 100644
index 0000000..6ef0f0e
@@ -0,0 +1,13 @@
+Index: openssl-1.0.0c/Makefile.shared
+===================================================================
+--- openssl-1.0.0c.orig/Makefile.shared	2010-08-21 13:36:49.000000000 +0200
++++ openssl-1.0.0c/Makefile.shared	2010-12-12 16:13:36.000000000 +0100
+@@ -153,7 +153,7 @@
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+ 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ 
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(CFLAGS)"
+ 
+ #This is rather special.  It's a special target with which one can link
+ #applications without bothering with any features that have anything to
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-symbolic.patch new file +13 -0
new file mode 100644
index 0000000..2a30777
@@ -0,0 +1,13 @@
+Index: openssl-1.0.0c/Makefile.shared
+===================================================================
+--- openssl-1.0.0c.orig/Makefile.shared	2010-12-12 16:13:36.000000000 +0100
++++ openssl-1.0.0c/Makefile.shared	2010-12-12 16:13:44.000000000 +0100
+@@ -151,7 +151,7 @@
+ 	SHLIB_SUFFIX=; \
+ 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
++	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ 
+ DO_GNU_APP=LDFLAGS="$(CFLAGS)"
+ 
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pic.patch new file +240 -0

240 lines not on this page · raw message

meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pkg-config.patch new file +34 -0
new file mode 100644
index 0000000..7a2a94e
@@ -0,0 +1,34 @@
+Index: openssl-1.0.0c/Makefile.org
+===================================================================
+--- openssl-1.0.0c.orig/Makefile.org	2010-12-12 16:13:28.000000000 +0100
++++ openssl-1.0.0c/Makefile.org	2010-12-12 17:01:49.000000000 +0100
+@@ -323,7 +323,8 @@
+ 	    echo 'Description: OpenSSL cryptography library'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lcrypto'; \
++	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
+ 
+ libssl.pc: Makefile
+@@ -336,7 +337,8 @@
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lssl'; \
++	    echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+ 
+ openssl.pc: Makefile
+@@ -349,7 +351,8 @@
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
+ 	    echo 'Version: '$(VERSION); \
+ 	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
++	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
++	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
+ 
+ Makefile: Makefile.org Configure config
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/version-script.patch new file +4491 -0

1,985 lines not on this page · raw message

meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/engines-install-in-libdir-ssl.patch renamed from meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/engines-install-in-libdir-ssl.patch +0 -0
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/engines-install-in-libdir-ssl.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/engines-install-in-libdir-ssl.patch
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/oe-ldflags.patch renamed from meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/oe-ldflags.patch +0 -0
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/oe-ldflags.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/oe-ldflags.patch
meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/parallel-make-fix.patch new file +20 -0
new file mode 100644
index 0000000..7ba9348

Lines of this file are not shown. View the raw message.

meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/shared-libs.patch renamed from meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/shared-libs.patch +0 -0
similarity index 100%
rename from meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/shared-libs.patch
rename to meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/shared-libs.patch
meta-oe/recipes-connectivity/openssl/openssl-native_1.0.0c.bb deleted +0 -27
deleted file mode 100644
index 8483293..0000000

Lines of this file are not shown. View the raw message.

meta-oe/recipes-connectivity/openssl/openssl_1.0.0c.bb deleted +0 -36
deleted file mode 100644
index 9348e53..0000000

Lines of this file are not shown. View the raw message.

meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb new file +47 -0

47 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.5.4

Part of the diff is not shown here. View the raw message.

#2 lore raw

Re: [meta-oe][PATCH 2/2] openssl-1.0.0: Add recipes for openssl_1.0.0d

Am Samstag, den 13.08.2011, 08:47 -0700 schrieb Khem Raj:

Quoted 1 line

Delete 1.0.0c recipes

The commit summary should say »update« and not »Add« then.

	openssl-1.0.0: Update to openssl_1.0.0d

In my opinion »recipe« is redundant for a commit summary.

Quoted 1 line

Add patches from debian

The patch headers seem to be missing. Maybe you can submit those to Debian too.

Quoted 2 lines

Remove recipes for openssl-native use BBCLASSEXTEND instead
Drop libdeps-first.patch it would not let openssl-native build on ubuntu 11.10

What is the error?

Quoted 47 lines

Delete debian.patch, all changes in it are now provided by patches under debian dir

---
 .../openssl/openssl-1.0.0c/debian.patch            |  515 ---
 .../openssl/openssl-1.0.0c/libdeps-first.patch     |   27 -
 .../configure-targets.patch                        |    0
 .../openssl-1.0.0d/debian/c_rehash-compat.patch    |   43 +
 .../openssl/openssl-1.0.0d/debian/ca.patch         |   20 +
 .../openssl-1.0.0d/debian/debian-targets.patch     |   52 +
 .../openssl-1.0.0d/debian/make-targets.patch       |   13 +
 .../openssl/openssl-1.0.0d/debian/man-dir.patch    |   13 +
 .../openssl-1.0.0d/debian/man-section.patch        |   32 +
 .../openssl/openssl-1.0.0d/debian/no-rpath.patch   |   13 +
 .../openssl-1.0.0d/debian/no-symbolic.patch        |   13 +
 .../openssl/openssl-1.0.0d/debian/pic.patch        |  240 ++
 .../openssl/openssl-1.0.0d/debian/pkg-config.patch |   34 +
 .../openssl-1.0.0d/debian/version-script.patch     | 4491 ++++++++++++++++++++
 .../engines-install-in-libdir-ssl.patch            |    0
 .../oe-ldflags.patch                               |    0
 .../openssl/openssl-1.0.0d/parallel-make-fix.patch |   20 +
 .../shared-libs.patch                              |    0
 .../openssl/openssl-native_1.0.0c.bb               |   27 -
 .../recipes-connectivity/openssl/openssl_1.0.0c.bb |   36 -
 .../recipes-connectivity/openssl/openssl_1.0.0d.bb |   47 +
 21 files changed, 5031 insertions(+), 605 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/debian.patch
 delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/libdeps-first.patch
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/configure-targets.patch (100%)
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/c_rehash-compat.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/ca.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/debian-targets.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/make-targets.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-dir.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-section.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-rpath.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-symbolic.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pic.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pkg-config.patch
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/version-script.patch
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/engines-install-in-libdir-ssl.patch (100%)
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/oe-ldflags.patch (100%)
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/parallel-make-fix.patch
 rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/shared-libs.patch (100%)
 delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl-native_1.0.0c.bb
 delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl_1.0.0c.bb
 create mode 100644 meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb

[…]

Quoted 7 lines
meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb new file +1 -0
new file mode 100644
index 0000000..384f3ba
@@ -0,0 +1,47 @@
+require recipes-connectivity/openssl/openssl.inc

meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb line 11

Quoted 10 lines
meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb new file +10 -0
+
+# For target side versions of openssl enable support for OCF Linux driver
+# if they are available.
+DEPENDS += "ocf-linux"
+
+CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
+
+PR = "${INC_PR}.0"
+#- * Copyright (c) 1998-2008 The OpenSSL Project.  All rights reserved.
+#+ * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.

What are those comments good for?

meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb line 18

Quoted 7 lines
meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb new file +7 -0
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
+
+SRC_URI[src.md5sum] = "40b6ea380cc8a5bf9734c2f8bf7e701e"
+SRC_URI[src.sha256sum] = "92511d1f0caaa298dba250426f8e7d5d00b271847886d1adc62422778d6320db"
+
+DEFAULT_PREFERENCE = "-1"

Why is it not the default? Just not tested? I am not into meta-openembedded yet but I am wondering if only distributions should pin that in their configurations.

Quoted 10 lines
meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb new file +10 -0
+
+export DIRS = "crypto ssl apps engines"
+export OE_LDFLAGS="${LDFLAGS}"
+
+SRC_URI += "file://configure-targets.patch \
+            file://shared-libs.patch \
+            file://oe-ldflags.patch \
+	    file://engines-install-in-libdir-ssl.patch \
+	    file://debian/version-script.patch \
+	    file://debian/pic.patch \

meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb line 38

Quoted 10 lines
meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb new file +10 -0
+	    file://debian/c_rehash-compat.patch \
+	    file://debian/ca.patch \
+	    file://debian/make-targets.patch \
+	    file://debian/no-rpath.patch \
+	    file://debian/man-dir.patch \
+	    file://debian/man-section.patch \
+	    file://debian/pkg-config.patch \
+	    file://debian/no-symbolic.patch \
+	    file://debian/debian-targets.patch \
+	   "

The indentations do look differently.

meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb line 45

Quoted 7 lines
meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb new file +7 -0
+
+PACKAGES += " \
+	${PN}-engines \
+	${PN}-engines-dbg \
+	"
+
+PARALLEL_MAKE = ""

Do you know what the problem with parallel builds is? What is the error?

meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb line 47

Quoted 2 lines
meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb new file +2 -0
+FILES_${PN}-engines = "${libdir}/ssl/engines/*.so"
+FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"

Thanks,

Paul

author
#3 lore raw

Re: [meta-oe][PATCH 2/2] openssl-1.0.0: Add recipes for openssl_1.0.0d

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 5 lines · Paul Menzel

Am Samstag, den 13.08.2011, 08:47 -0700 schrieb Khem Raj:

Quoted 1 line

Delete 1.0.0c recipes

The commit summary should say »update« and not »Add« then.

Quoted 9 lines

openssl-1.0.0: Update to openssl_1.0.0d

In my opinion »recipe« is redundant for a commit summary.

Quoted 1 line

Add patches from debian

The patch headers seem to be missing. Maybe you can submit those to Debian too.

I am no openssl expert therefore describing them might not be something for me.

Quoted 5 lines
Quoted 3 lines

Remove recipes for openssl-native use BBCLASSEXTEND instead Drop libdeps-first.patch it would not let openssl-native build on ubuntu 11.10

What is the error?

openssl-native changed the order of libraries and objects where now library was specified before objects and any references to functions in libcrypto were being reported undefined.

Quoted 25 lines
Quoted 25 lines

Delete debian.patch, all changes in it are now provided by patches under debian dir

.../openssl/openssl-1.0.0c/debian.patch            |  515 --- 
.../openssl/openssl-1.0.0c/libdeps-first.patch     |   27 - 
.../configure-targets.patch                        |    0 
.../openssl-1.0.0d/debian/c_rehash-compat.patch    |   43 + 
.../openssl/openssl-1.0.0d/debian/ca.patch         |   20 + 
.../openssl-1.0.0d/debian/debian-targets.patch     |   52 + 
.../openssl-1.0.0d/debian/make-targets.patch       |   13 + 
.../openssl/openssl-1.0.0d/debian/man-dir.patch    |   13 + 
.../openssl-1.0.0d/debian/man-section.patch        |   32 + 
.../openssl/openssl-1.0.0d/debian/no-rpath.patch   |   13 + 
.../openssl-1.0.0d/debian/no-symbolic.patch        |   13 + 
.../openssl/openssl-1.0.0d/debian/pic.patch        |  240 ++ 
.../openssl/openssl-1.0.0d/debian/pkg-config.patch |   34 + 
.../openssl-1.0.0d/debian/version-script.patch     | 4491
++++++++++++++++++++ .../engines-install-in-libdir-ssl.patch
|    0 .../oe-ldflags.patch                               |    0 
.../openssl/openssl-1.0.0d/parallel-make-fix.patch |   20 + 
.../shared-libs.patch                              |    0 
.../openssl/openssl-native_1.0.0c.bb               |   27 - 
.../recipes-connectivity/openssl/openssl_1.0.0c.bb |   36 - 
Quoted 8 lines
Quoted 8 lines

.../recipes-connectivity/openssl/openssl_1.0.0d.bb | 47 + 21
files changed, 5031 insertions(+), 605 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/debian.patch delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0c/libdeps-first.patch

rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/configure-targets.patch (100%)

Quoted 4 lines
Quoted 4 lines

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/c_rehash-compat.patch

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/ca.patch

Quoted 4 lines
Quoted 4 lines

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/debian-targets.patch

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/make-targets.patch

Quoted 4 lines
Quoted 4 lines

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-dir.patch

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/man-section.patch

Quoted 4 lines
Quoted 4 lines

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-rpath.patch

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/no-symbolic.patch

Quoted 4 lines
Quoted 4 lines

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pic.patch

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/pkg-config.patch

Quoted 4 lines
Quoted 4 lines

create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/debian/version-script.patch

rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/engines-install-in-libdir-ssl.patch (100%)

Quoted 5 lines
Quoted 5 lines

rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/oe-ldflags.patch (100%) create mode 100644 meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/parallel-make-fix.patch

rename meta-oe/recipes-connectivity/openssl/{openssl-1.0.0c => openssl-1.0.0d}/shared-libs.patch (100%)

Quoted 8 lines
Quoted 5 lines

delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl-native_1.0.0c.bb delete mode 100644 meta-oe/recipes-connectivity/openssl/openssl_1.0.0c.bb create mode 100644 meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb

[…]

Quoted 14 lines
Quoted 11 lines
(quoted diff) +0 -0

b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb new file mode 100644 index 0000000..384f3ba --- /dev/null +++ b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb @@ -0,0 +1,47 @@ +require recipes-connectivity/openssl/openssl.inc + +# For target side versions of openssl enable support for OCF Linux driver +# if they are available. +DEPENDS += "ocf-linux" + +CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" + +PR = "${INC_PR}.0" +#- * Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved. +#+ * Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved.

What are those comments good for?

Good for nothing. Those were changes that made difference in license checksums between 1.0.0c and 1.0.0d I have resubmit a patch to clean them up. I meant to add them to commit message instead

Quoted 11 lines
Quoted 6 lines

+ +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" +

(quoted diff) +2 -0
+SRC_URI[src.md5sum] = "40b6ea380cc8a5bf9734c2f8bf7e701e" 
+SRC_URI[src.sha256sum] =

"92511d1f0caaa298dba250426f8e7d5d00b271847886d1adc62422778d6320db"
+ +DEFAULT_PREFERENCE = "-1"

Why is it not the default? Just not tested? I am not into meta-openembedded yet but I am wondering if only distributions should pin that in their configurations.

I left it as it was in 1.0.0c I have not tried to fix it. Avoid many variables as a time. There could be a subsequent patch for that like oe-core has. I am not too sure if that patch is applicable to 1.0.0 as well.

Quoted 7 lines
Quoted 7 lines

+ +export DIRS = "crypto ssl apps engines" +export OE_LDFLAGS="${LDFLAGS}" + +SRC_URI += "file://configure-targets.patch \ +
file://shared-libs.patch \ + file://oe-ldflags.patch \ +
file://engines-install-in-libdir-ssl.patch \ +
file://debian/version-script.patch \ + file://debian/pic.patch
\ + file://debian/c_rehash-compat.patch \ +

Quoted 9 lines
Quoted 6 lines

file://debian/ca.patch \ + file://debian/make-targets.patch \ +
file://debian/no-rpath.patch \ + file://debian/man-dir.patch \

(quoted diff) +1 -0
+	    file://debian/man-section.patch \ +

file://debian/pkg-config.patch \ +
file://debian/no-symbolic.patch \ +
file://debian/debian-targets.patch \ + "

The indentations do look differently.

yes fixed in followup patch

Quoted 6 lines
Quoted 2 lines

+ +PACKAGES += " \ + ${PN}-engines \ + ${PN}-engines-dbg \ + " +
+PARALLEL_MAKE = ""

Do you know what the problem with parallel builds is? What is the error?

as explained above

Quoted 6 lines

meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb line 47

Quoted 2 lines
meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb new file +2 -0
+FILES_${PN}-engines = "${libdir}/ssl/engines/*.so" 
+FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"

Thanks,

Quoted 7 lines

Paul

_______________________________________________ Openembedded-devel mailing list [email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk5JPmYACgkQuwUzVZGdMxSn8ACfQnp8RH/jIn9vp9mBk7r6uhpU bo4AnR+MCqHihLjPe0Ilu/d5T3OPiUig
=1Ka9
-----END PGP SIGNATURE-----

Applied
#4 lore raw
In reply to Khem Raj

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-08-11 17:47, Khem Raj schreef:

Quoted 5 lines
meta-oe/recipes-connectivity/openssl/ocf-linux.inc index b98f887..f4ec7c9 100644 --- a/meta-oe/recipes-connectivity/openssl/ocf-linux.inc +++ b/meta-oe/recipes-connectivity/openssl/ocf-linux.inc @@ -22,3 +22,4 @@ do_install() { } renamed from meta-oe/recipes-connectivity/openssl/ocf-linux.inc +0 -0

ALLOW_EMPTY = "1" +BBCLASSEXTEND = "native nativesdk"

Applied, thanks! I'll wait for a v2 of 2/2 which addressed Pauls comments. -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOSMNsMkyGM64RGpERAt9tAKCRgTKhE1NYfkiwz5bMYHqnV0gKgQCgtUlF aoKJUAolYcyRLCAGmN/ItQg=
=bV88
-----END PGP SIGNATURE-----