From b32e1ccdc6419e0030636e94d2bb05c22e2fc510 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 16 Feb 2015 18:50:58 +1000 Subject: openssl: Patches no longer required * Merged change to oe-core for MicroBlaze -> linux-generic32 detection Signed-off-by: Nathan Rossi --- .../openssl/files/Add-MicroBlaze-Support.patch | 26 ---------------------- .../openssl/openssl_1.0.%.bbappend | 3 --- 2 files changed, 29 deletions(-) delete mode 100644 recipes-connectivity/openssl/files/Add-MicroBlaze-Support.patch delete mode 100644 recipes-connectivity/openssl/openssl_1.0.%.bbappend diff --git a/recipes-connectivity/openssl/files/Add-MicroBlaze-Support.patch b/recipes-connectivity/openssl/files/Add-MicroBlaze-Support.patch deleted file mode 100644 index 1723febb..00000000 --- a/recipes-connectivity/openssl/files/Add-MicroBlaze-Support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Nathan Rossi -Subject: [PATCH] Add MicroBlaze Support - -Signed-off-by: Nathan Rossi -Upstream-Status: Not Submitted ---- - Configure | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/Configure b/Configure -index 0c54d19..edaae47 100755 ---- a/Configure -+++ b/Configure -@@ -467,6 +467,10 @@ my %table=( - "linux-mips64el","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "linux-mipsel","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - -+#### Linux on MicroBlaze -+"linux-microblaze","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-microblazeel","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - # Android: linux-* but without -DTERMIO and pointers to headers and libs. - "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", --- -1.7.1 diff --git a/recipes-connectivity/openssl/openssl_1.0.%.bbappend b/recipes-connectivity/openssl/openssl_1.0.%.bbappend deleted file mode 100644 index 4aeea009..00000000 --- a/recipes-connectivity/openssl/openssl_1.0.%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append += "file://Add-MicroBlaze-Support.patch" -- cgit v1.2.3-54-g00ecf