[meta-xilinx] [PATCH 1/1] [daisy] [dizzy] openssl: addapt patch to latest version 1.0.1p

[Nathan Rossi]

On Tue, Aug 4, 2015 at 6:35 AM, Tudor Florea <tudor.florea at enea.com> wrote:
> Signed-off-by: Tudor Florea <tudor.florea at enea.com>
> ---
>  .../openssl/files/Add-MicroBlaze-Support.patch                | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/recipes-connectivity/openssl/files/Add-MicroBlaze-Support.patch b/recipes-connectivity/openssl/files/Add-MicroBlaze-Support.patch
> index 1723feb..a445fcb 100644
> --- a/recipes-connectivity/openssl/files/Add-MicroBlaze-Support.patch
> +++ b/recipes-connectivity/openssl/files/Add-MicroBlaze-Support.patch
> @@ -2,24 +2,25 @@ From: Nathan Rossi <nathan.rossi at xilinx.com>
>  Subject: [PATCH] Add MicroBlaze Support
>
>  Signed-off-by: Nathan Rossi <nathan.rossi at xilinx.com>
> +Adapted to openssl_1.0.1p
> +Signed-off-by: Tudor Florea <tudor.florea at enea.com>
>  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)",
> +@@ -466,6 +466,10 @@
> + "linux-mips64el","$ENV{'CC'}:-DL_ENDIAN -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 -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: linux-* but without 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.9.1

Hi Tudor,

Sorry for being so slow to reply to this patch. I had initially looked
into it and couldn't reproduce the issue (the patch applied fine for
both daisy and dizzy of oe-core).

I have just verified that the existing patch applies cleanly to the
current HEAD of daisy and dizzy. Just want to confirm whether or not
you still require this patch on your side? It could be that the
version of patch (2.7.5) that I am using is doing more aggressive
fuzzing.

Thanks,
Nathan

>
> --
> _______________________________________________
> meta-xilinx mailing list
> meta-xilinx at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-xilinx