Backport openssl-1.0.0e from meta-openembedded
PATCH 1/3 Backport openssl-1.0.0e from meta-openembedded
From: Ulf Samuelsson <[email protected]>
--- .../include/angstrom-2010-preferred-versions.inc | 4 +- .../openssl/openssl-1.0.0e/configure-targets.patch | 31 + .../openssl-1.0.0e/debian/c_rehash-compat.patch | 43 + recipes/openssl/openssl-1.0.0e/debian/ca.patch | 20 + .../openssl-1.0.0e/debian/debian-targets.patch | 52 + .../openssl-1.0.0e/debian/make-targets.patch | 13 + .../openssl/openssl-1.0.0e/debian/man-dir.patch | 13 + .../openssl-1.0.0e/debian/man-section.patch | 32 + .../openssl/openssl-1.0.0e/debian/no-rpath.patch | 13 + .../openssl-1.0.0e/debian/no-symbolic.patch | 13 + recipes/openssl/openssl-1.0.0e/debian/pic.patch | 240 ++ .../openssl/openssl-1.0.0e/debian/pkg-config.patch | 34 + .../openssl-1.0.0e/debian/version-script.patch | 4509 ++++++++++++++++++++ .../engines-install-in-libdir-ssl.patch | 53 + recipes/openssl/openssl-1.0.0e/oe-ldflags.patch | 22 + .../openssl/openssl-1.0.0e/openssl-fix-link.patch | 35 + .../openssl/openssl-1.0.0e/parallel-make-fix.patch | 20 + recipes/openssl/openssl-1.0.0e/shared-libs.patch | 48 + recipes/openssl/openssl-native_1.0.0e.bb | 39 + recipes/openssl/openssl.inc | 9 +- recipes/openssl/openssl_1.0.0e.bb | 46 + 21 files changed, 5284 insertions(+), 5 deletions(-) create mode 100644 recipes/openssl/openssl-1.0.0e/configure-targets.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/c_rehash-compat.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/ca.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/debian-targets.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/make-targets.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/man-dir.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/man-section.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/no-rpath.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/no-symbolic.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/pic.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/pkg-config.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/version-script.patch create mode 100644 recipes/openssl/openssl-1.0.0e/engines-install-in-libdir-ssl.patch create mode 100644 recipes/openssl/openssl-1.0.0e/oe-ldflags.patch create mode 100644 recipes/openssl/openssl-1.0.0e/openssl-fix-link.patch create mode 100644 recipes/openssl/openssl-1.0.0e/parallel-make-fix.patch create mode 100644 recipes/openssl/openssl-1.0.0e/shared-libs.patch create mode 100644 recipes/openssl/openssl-native_1.0.0e.bb create mode 100644 recipes/openssl/openssl_1.0.0e.bb
conf/distro/include/angstrom-2010-preferred-versions.inc +2 -2
@@ -43,8 +43,8 @@ PREFERRED_VERSION_mythplugins = "0.23" PREFERRED_VERSION_myththemes = "0.23" PREFERRED_VERSION_mythtv = "0.23" PREFERRED_VERSION_mplayer = "0.0+1.0rc3+svnr%" -PREFERRED_VERSION_openssl = "1.0.0d" -PREFERRED_VERSION_openssl-native = "1.0.0d" +PREFERRED_VERSION_openssl = "1.0.0e" +PREFERRED_VERSION_openssl-native = "1.0.0e" PREFERRED_VERSION_pango = "1.28.3" PREFERRED_VERSION_pango-native = "1.28.3" PREFERRED_VERSION_perl = "5.10.1"
recipes/openssl/openssl-1.0.0e/configure-targets.patch new file +31 -0
@@ -0,0 +1,31 @@ + +The number of colons are important :) + + +Index: openssl-1.0.0a/Configure +=================================================================== +--- openssl-1.0.0a.orig/Configure ++++ openssl-1.0.0a/Configure +@@ -380,6 +380,22 @@ my %table=( + "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", + "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", + ++ # Linux on ARM ++"linux-elf-arm","$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)", ++"linux-elf-armeb","$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-gnueabi-arm","$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)", ++"linux-gnueabi-armeb","$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-uclibceabi-arm","$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)", ++"linux-uclibceabi-armeb","$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-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).", ++ ++#### Linux on MIPS/MIPS64 ++"linux-mips","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -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)", ++"linux-mips64","$ENV{'CC'}:-DB_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::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"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::::::::::::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::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + #### *BSD [do see comment about ${BSDthreads} above!] + "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "BSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
recipes/openssl/openssl-1.0.0e/debian/c_rehash-compat.patch new file +43 -0
43 lines not on this page · raw message
recipes/openssl/openssl-1.0.0e/debian/ca.patch new file +20 -0
@@ -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; + } + }
recipes/openssl/openssl-1.0.0e/debian/debian-targets.patch new file +52 -0
52 lines not on this page · raw message
recipes/openssl/openssl-1.0.0e/debian/make-targets.patch new file +13 -0
@@ -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 +
recipes/openssl/openssl-1.0.0e/debian/man-dir.patch new file +13 -0
@@ -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=
recipes/openssl/openssl-1.0.0e/debian/man-section.patch new file +32 -0
@@ -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 | \
recipes/openssl/openssl-1.0.0e/debian/no-rpath.patch new file +13 -0
@@ -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
recipes/openssl/openssl-1.0.0e/debian/no-symbolic.patch new file +13 -0
@@ -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)" +
recipes/openssl/openssl-1.0.0e/debian/pic.patch new file +240 -0
240 lines not on this page · raw message
recipes/openssl/openssl-1.0.0e/debian/pkg-config.patch new file +34 -0
@@ -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
recipes/openssl/openssl-1.0.0e/debian/version-script.patch new file +4509 -0
2,486 lines not on this page · raw message
recipes/openssl/openssl-1.0.0e/engines-install-in-libdir-ssl.patch new file +53 -0
53 lines not on this page · raw message
recipes/openssl/openssl-1.0.0e/oe-ldflags.patch new file +22 -0
Lines of this file are not shown. View the raw message.
recipes/openssl/openssl-1.0.0e/openssl-fix-link.patch new file +35 -0
Lines of this file are not shown. View the raw message.
recipes/openssl/openssl-1.0.0e/parallel-make-fix.patch new file +20 -0
Lines of this file are not shown. View the raw message.
recipes/openssl/openssl-1.0.0e/shared-libs.patch new file +48 -0
48 lines not on this page · raw message
recipes/openssl/openssl-native_1.0.0e.bb new file +39 -0
Lines of this file are not shown. View the raw message.
recipes/openssl/openssl_1.0.0e.bb new file +46 -0
46 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.
PATCH 2/3 Use linux2 when configuring python-2.6.6
From: Ulf Samuelsson <[email protected]>
--- ...64-bit-host.-Use-linux2-instead-of-linux3.patch | 40 ++++++++++++++++++++ recipes/python/python_2.6.6.bb | 1 + 2 files changed, 41 insertions(+), 0 deletions(-) create mode 100644 recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 3fbd3d4aa2f9b0aaa806ec9f19dc589a0928ef0c Mon Sep 17 00:00:00 2001 +From: Ulf Samuelsson <[email protected]> +Date: Wed, 19 Oct 2011 15:46:32 +0200 +Subject: [PATCH] Support 64 bit host. Use linux2 instead of linux3 + +Imported from the Buildroot project. + +Signed-off-by: Ulf Samuelsson <[email protected]> +--- + configure | 1 + + configure.in | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/configure b/configure +index d0731c3..dc8d029 100755 +--- a/configure ++++ b/configure +@@ -2814,6 +2814,7 @@ then + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; + irix646) MACHDEP="irix6";; ++ linux*) MACHDEP="linux2";; + '') MACHDEP="unknown";; + esac + fi +diff --git a/configure.in b/configure.in +index 609d8f2..8b8b77c 100644 +--- a/configure.in ++++ b/configure.in +@@ -264,6 +264,7 @@ then + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; + irix646) MACHDEP="irix6";; ++ linux*) MACHDEP="linux2";; + '') MACHDEP="unknown";; + esac + fi +-- +1.7.5.4 +
recipes/python/python_2.6.6.bb +1 -0
@@ -18,6 +18,7 @@ SRC_URI = "\ file://python-module-rpath-fix.patch \ file://sitecustomize.py \ file://pkgconfig-support.patch \ + file://0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch \ " SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" SRC_URI[sha256sum] = "134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83"
Signature · 1 line
1.7.5.4
Re: [PATCH 2/3] Use linux2 when configuring python-2.6.6
Quoted 16 lines · On 10/19/2011 8:10 AM, [email protected] wrote:
From: Ulf Samuelsson<[email protected]>
Signed-off-by Ulf Samuelsson<[email protected]>--- ...64-bit-host.-Use-linux2-instead-of-linux3.patch | 40 ++++++++++++++++++++ recipes/python/python_2.6.6.bb | 1 + 2 files changed, 41 insertions(+), 0 deletions(-)create mode 100644
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patchrecipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch new file +0
-0
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch line 4
Quoted 4 lines
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch new file +4
-0@@ -0,0 +1,40 @@ +From 3fbd3d4aa2f9b0aaa806ec9f19dc589a0928ef0c Mon Sep 17 00:00:00 2001 +From: Ulf Samuelsson<[email protected]> +Date: Wed, 19 Oct 2011 15:46:32 +0200 +Subject: [PATCH] Support 64 bit host. Use linux2 instead of linux3
can you explain why this change is needed.
Quoted 48 lines
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch new file +36
-0+ +Imported from the Buildroot project. + +Signed-off-by: Ulf Samuelsson<[email protected]> +--- + configure | 1 + + configure.in | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/configure b/configure +index d0731c3..dc8d029 100755 +--- a/configure ++++ b/configure +@@ -2814,6 +2814,7 @@ then + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; + irix646) MACHDEP="irix6";; ++ linux*) MACHDEP="linux2";; + '') MACHDEP="unknown";; + esac + fi +diff --git a/configure.in b/configure.in +index 609d8f2..8b8b77c 100644 +--- a/configure.in ++++ b/configure.in +@@ -264,6 +264,7 @@ then + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; + irix646) MACHDEP="irix6";; ++ linux*) MACHDEP="linux2";; + '') MACHDEP="unknown";; + esac + fi +-- +1.7.5.4 +recipes/python/python_2.6.6.bb +1
-0@@ -18,6 +18,7 @@ SRC_URI = "\ file://python-module-rpath-fix.patch \ file://sitecustomize.py \ file://pkgconfig-support.patch \ + file://0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch \ " SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" SRC_URI[sha256sum] = "134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83"
Re: [PATCH 2/3] Use linux2 when configuring python-2.6.6
2011-10-19 17:45, Khem Raj skrev:
Quoted 15 lines · On 10/19/2011 8:10 AM, [email protected] wrote:
Quoted 14 lines
From: Ulf Samuelsson<[email protected]>
Signed-off-by Ulf Samuelsson<[email protected]>--- ...64-bit-host.-Use-linux2-instead-of-linux3.patch | 40 ++++++++++++++++++++ recipes/python/python_2.6.6.bb | 1 + 2 files changed, 41 insertions(+), 0 deletions(-)create mode 100644
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patchrecipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch +0
-0
Quoted 13 lines
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch line 4
Quoted 10 lines
new file mode 100644
index 0000000..46ce713
---/dev/null
+++b/recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patchrecipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch +4
-0@@ -0,0 +1,40 @@ +From 3fbd3d4aa2f9b0aaa806ec9f19dc589a0928ef0c Mon Sep 17 00:00:00 2001 +From: Ulf Samuelsson<[email protected]> +Date: Wed, 19 Oct 2011 15:46:32 +0200 +Subject: [PATCH] Support 64 bit host. Use linux2 instead of linux3can you explain why this change is needed.
I tried building on Ubuntu 11.10 x64 and Python, openssl and binutils fails. openssl I backported as recommended, and I then found the buildroot patch after some searching.
Here is the comment from the Buildroot patch:
When compiling Python on a host running Linux 3.0, the sys.platform constant is set at "linux3". A lot of code (inside the interpreter itself, its build system and third party apps and libraries) relies on it to be linux2 on a Linux system.
This leads to the build of the target python package to break.
This behaviour has been reported on the Python bugtracker but is not fixed yet.
---
After I applied the three patches in the patchset, I managed to complete the build without errors.
Quoted 56 lines
Quoted 49 lines
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch +36
-0+ +Imported from the Buildroot project. + +Signed-off-by: Ulf Samuelsson<[email protected]> +--- + configure | 1 + + configure.in | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/configure b/configure +index d0731c3..dc8d029 100755 +--- a/configure ++++ b/configure +@@ -2814,6 +2814,7 @@ then + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; + irix646) MACHDEP="irix6";; ++ linux*) MACHDEP="linux2";; + '') MACHDEP="unknown";; + esac + fi +diff --git a/configure.in b/configure.in +index 609d8f2..8b8b77c 100644 +--- a/configure.in ++++ b/configure.in +@@ -264,6 +264,7 @@ then + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; + irix646) MACHDEP="irix6";; ++ linux*) MACHDEP="linux2";; + '') MACHDEP="unknown";; + esac + fi +-- +1.7.5.4 +recipes/python/python_2.6.6.bb +1
-0@@ -18,6 +18,7 @@ SRC_URI = "\ file://python-module-rpath-fix.patch \ file://sitecustomize.py \ file://pkgconfig-support.patch \ + file://0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch \ " SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" SRC_URI[sha256sum] =Quoted 1 line
"
134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83"_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 2 lines
Best Regards Ulf Samuelsson
Re: [PATCH 2/3] Use linux2 when configuring python-2.6.6
Quoted 36 lines · Ulf Samuelsson
2011-10-19 17:45, Khem Raj skrev:
Quoted 17 lines · On 10/19/2011 8:10 AM, [email protected] wrote:
Quoted 16 lines
From: Ulf Samuelsson<[email protected]>
Signed-off-by Ulf Samuelsson<[email protected]>--- ...64-bit-host.-Use-linux2-instead-of-linux3.patch | 40 ++++++++++++++++++++ recipes/python/python_2.6.6.bb | 1 + 2 files changed, 41 insertions(+), 0 deletions(-)create mode 100644
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch(quoted diff) +0
-0
a/recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patchb/recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patchQuoted 13 lines
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch line 4
Quoted 10 lines
new file mode 100644
index 0000000..46ce713
---/dev/null
+++b/recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patchrecipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch new file +4
-0@@ -0,0 +1,40 @@ +From 3fbd3d4aa2f9b0aaa806ec9f19dc589a0928ef0c Mon Sep 17 00:00:00 2001 +From: Ulf Samuelsson<[email protected]> +Date: Wed, 19 Oct 2011 15:46:32 +0200 +Subject: [PATCH] Support 64 bit host. Use linux2 instead of linux3can you explain why this change is needed.
I tried building on Ubuntu 11.10 x64 and Python, openssl and binutils fails. openssl I backported as recommended, and I then found the buildroot patch after some searching.
Quoted 6 lines
Here is the comment from the Buildroot patch:
When compiling Python on a host running Linux 3.0, the sys.platform constant is set at "linux3". A lot of code (inside the interpreter itself, its build system and third party apps and libraries) relies on it to be linux2 on a Linux system.
Or you can use this patch
http://git.openembedded.org/openembedded-core/commit/?id=4b7e7b004dacb698ed637f35661a60d2402c00cd
Regards,
Quoted 78 lines
This leads to the build of the target python package to break.
This behaviour has been reported on the Python bugtracker but is not fixed yet.
---
After I applied the three patches in the patchset, I managed to complete the build without errors.Quoted 57 lines
Quoted 50 lines
recipes/python/python-2.6.6/0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch new file +36
-0+ +Imported from the Buildroot project. + +Signed-off-by: Ulf Samuelsson<[email protected]> +--- + configure | 1 + + configure.in | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/configure b/configure +index d0731c3..dc8d029 100755 +--- a/configure ++++ b/configure +@@ -2814,6 +2814,7 @@ then + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; + irix646) MACHDEP="irix6";; ++ linux*) MACHDEP="linux2";; + '') MACHDEP="unknown";; + esac + fi +diff --git a/configure.in b/configure.in +index 609d8f2..8b8b77c 100644 +--- a/configure.in ++++ b/configure.in +@@ -264,6 +264,7 @@ then + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; + irix646) MACHDEP="irix6";; ++ linux*) MACHDEP="linux2";; + '') MACHDEP="unknown";; + esac + fi +-- +1.7.5.4 +recipes/python/python_2.6.6.bb +1
-0@@ -18,6 +18,7 @@ SRC_URI = "\ file://python-module-rpath-fix.patch \ file://sitecustomize.py \ file://pkgconfig-support.patch \ + file://0001-Support-64-bit-host.-Use-linux2-instead-of-linux3.patch \ " SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" SRC_URI[sha256sum] =Quoted 1 line
"
134c5e0736bae2e5570d0b915693374f11108ded63c35a23a35d282737d2ce83"_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-develSignature · 8 lines
Best Regards Ulf Samuelsson _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 3/3 Update checksums for binutils-2.20.1.tar.bz2
In reply to [email protected]From: Ulf Samuelsson <[email protected]>
Tarball is updated to 2.20.1b so checksums have changed.
--- recipes/binutils/binutils_2.20.1.bb | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
recipes/binutils/binutils_2.20.1.bb +4 -3
@@ -1,7 +1,7 @@ require binutils.inc LICENSE = "GPLv3" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" EXTRA_OECONF += "--disable-werror" #COMPATIBLE_TARGET_SYS = "."
@@ -24,10 +24,11 @@ SRC_URI_append_nios2 =" \ file://binutils-nios2.patch \ " -SRC_URI[tarball.sha256sum] = "228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8" -SRC_URI[tarball.md5sum] = "9cdfb9d6ec0578c166d3beae5e15c4e5" +SRC_URI[tarball.sha256sum] = "71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64" +SRC_URI[tarball.md5sum] = "2b9dc8f2b7dbd5ec5992c6e29de0b764" # powerpc patches SRC_URI += "\ file://binutils-2.16.1-e300c2c3.patch \ " +
Signature · 1 line
1.7.5.4
Re: [PATCH 3/3] Update checksums for binutils-2.20.1.tar.bz2
2011-10-19 17:10, [email protected] skrev:
FYI:
With the three patches in the patchset, classic openembedded builds on a 64 bit Ubuntu-11.10. Did not test them on a board yet.
BR
Ulf Samuelsson
Quoted 37 lines
From: Ulf Samuelsson<[email protected]>
Tarball is updated to 2.20.1b so checksums have changed.
Signed-off-by Ulf Samuelsson<[email protected]>--- recipes/binutils/binutils_2.20.1.bb | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)recipes/binutils/binutils_2.20.1.bb +4
-3@@ -1,7 +1,7 @@ require binutils.inc LICENSE = "GPLv3" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" EXTRA_OECONF += "--disable-werror" #COMPATIBLE_TARGET_SYS = "."@@ -24,10 +24,11 @@ SRC_URI_append_nios2 =" \ file://binutils-nios2.patch \ " -SRC_URI[tarball.sha256sum] = "228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8" -SRC_URI[tarball.md5sum] = "9cdfb9d6ec0578c166d3beae5e15c4e5" +SRC_URI[tarball.sha256sum] = "71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64" +SRC_URI[tarball.md5sum] = "2b9dc8f2b7dbd5ec5992c6e29de0b764" # powerpc patches SRC_URI += "\ file://binutils-2.16.1-e300c2c3.patch \ " +
Signature · 2 lines
Best Regards Ulf Samuelsson
Re: [PATCH 3/3] Update checksums for binutils-2.20.1.tar.bz2
In reply to [email protected]Dear Ulf,
Am Mittwoch, den 19.10.2011, 17:10 +0200 schrieb [email protected]:
Quoted 1 line
From: Ulf Samuelsson <[email protected]>
again, please comply with our commit policy [1].
binutils: Update from 2.20.1 to 2.20.1a
Quoted 1 line
Tarball is updated to 2.20.1b so checksums have changed.
I am not aware of any binutils version 2.20.1b. Do you mean 2.20.1a?
Please create a new recipe since doing it this way the already downloaded sources would be made invalid and archives on mirrors would cause problems too.
Please see commit f4faecdb [2] as an example and take a look at the list discussion [3].
Quoted 23 lines
Signed-off-by Ulf Samuelsson <[email protected]>--- recipes/binutils/binutils_2.20.1.bb | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)recipes/binutils/binutils_2.20.1.bb +1
-1@@ -1,7 +1,7 @@ require binutils.inc LICENSE = "GPLv3" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" EXTRA_OECONF += "--disable-werror" #COMPATIBLE_TARGET_SYS = "."@@ -24,10 +24,11 @@ SRC_URI_append_nios2 =" \ file://binutils-nios2.patch \ "
recipes/binutils/binutils_2.20.1.bb SRC_URI_append_nios2 =" \ · line 34
Quoted 10 lines
recipes/binutils/binutils_2.20.1.bb +3
-2-SRC_URI[tarball.sha256sum] = "228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8" -SRC_URI[tarball.md5sum] = "9cdfb9d6ec0578c166d3beae5e15c4e5" +SRC_URI[tarball.sha256sum] = "71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64" +SRC_URI[tarball.md5sum] = "2b9dc8f2b7dbd5ec5992c6e29de0b764" # powerpc patches SRC_URI += "\ file://binutils-2.16.1-e300c2c3.patch \ " +
Please remove the newly added line.
Thanks,
Paul
[1] http://www.openembedded.org/wiki/Commit_Policy
[2] http://git.openembedded.org/openembedded/commit/?id=f4faecdbd0b7c83e5787735ef1495a34aca861e4
[3] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-September/034885.html
Re: [PATCH 3/3] Update checksums for binutils-2.20.1.tar.bz2
Quoted 12 lines · Paul Menzel
Dear Ulf,
Am Mittwoch, den 19.10.2011, 17:10 +0200 schrieb [email protected]:
Quoted 1 line
From: Ulf Samuelsson <[email protected]>
again, please comply with our commit policy [1].
binutils: Update from 2.20.1 to 2.20.1a
Quoted 1 line
Tarball is updated to 2.20.1b so checksums have changed.
Quoted 8 lines
I am not aware of any binutils version 2.20.1b. Do you mean 2.20.1a?
Please create a new recipe since doing it this way the already downloaded sources would be made invalid and archives on mirrors would cause problems too.
Please see commit
f4faecdb[2] as an example and take a look at the list discussion [3].
Better example commit in [4]
Quoted 3 lines
[1] http://www.openembedded.org/wiki/Commit_Policy
[2] http://git.openembedded.org/openembedded/commit/?id=f4faecdbd0b7c83e5787735ef1495a34aca861e4
[3] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-September/034885.html
[4] http://git.openembedded.org/meta-openembedded/commit/?id=15832ab1f64f2bc2ee7d342e5bff0351b5e2479b
Regards,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 3/3] Update checksums for binutils-2.20.1.tar.bz2
Quoted 8 lines · Martin Jansa
Quoted 7 lines · Paul Menzel
Am Mittwoch, den 19.10.2011, 17:10 +0200 schrieb [email protected]:
Quoted 1 line
From: Ulf Samuelsson <[email protected]>
again, please comply with our commit policy [1].
binutils: Update from 2.20.1 to 2.20.1a
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
Tarball is updated to 2.20.1b so checksums have changed.
I am not aware of any binutils version 2.20.1b. Do you mean 2.20.1a?
Please create a new recipe since doing it this way the already downloaded sources would be made invalid and archives on mirrors would cause problems too.
Darn it, from the subject line I got my hopes high that someone bit the bullet and made a proper patch for 2.20.1a... Guess not. :)
Quoted 10 lines
Quoted 2 lines
Please see commit
f4faecdb[2] as an example and take a look at the list discussion [3].Better example commit in [4]
Quoted 3 lines
[1] http://www.openembedded.org/wiki/Commit_Policy
[2] http://git.openembedded.org/openembedded/commit/?id=f4faecdbd0b7c83e5787735ef1495a34aca861e4
[3] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-September/034885.html[4] http://git.openembedded.org/meta-openembedded/commit/?id=15832ab1f64f2bc2ee7d342e5bff0351b5e2479b
Re: [PATCH 3/3] Update checksums for binutils-2.20.1.tar.bz2
In reply to Paul Menzel2011-10-19 22:58, Paul Menzel skrev:
Quoted 11 lines
Dear Ulf,
Am Mittwoch, den 19.10.2011, 17:10 +0200 schrieb [email protected]:
Quoted 1 line
From: Ulf Samuelsson<[email protected]>
again, please comply with our commit policy [1].
binutils: Update from 2.20.1 to 2.20.1a
Quoted 1 line
Tarball is updated to 2.20.1b so checksums have changed.
I am not aware of any binutils version 2.20.1b. Do you mean 2.20.1a?
Maybe, twas from memory.
Quoted 4 lines
Please create a new recipe since doing it this way the already downloaded sources would be made invalid and archives on mirrors would cause problems too.
The recipe is not working, if the source is not downloaded yet. Maybe a better idea is to change the URI to something useful. Anyone knows where the original source can be downloaded?
Quoted 53 lines
Please see commit
f4faecdb[2] as an example and take a look at the list discussion [3].Quoted 23 lines
Signed-off-by Ulf Samuelsson<[email protected]>--- recipes/binutils/binutils_2.20.1.bb | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)recipes/binutils/binutils_2.20.1.bb +1
-1@@ -1,7 +1,7 @@ require binutils.inc LICENSE = "GPLv3" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" EXTRA_OECONF += "--disable-werror" #COMPATIBLE_TARGET_SYS = "."@@ -24,10 +24,11 @@ SRC_URI_append_nios2 =" \ file://binutils-nios2.patch \ "recipes/binutils/binutils_2.20.1.bb SRC_URI_append_nios2 =" \ · line 34
Quoted 10 lines
recipes/binutils/binutils_2.20.1.bb +3
-2-SRC_URI[tarball.sha256sum] = "228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8" -SRC_URI[tarball.md5sum] = "9cdfb9d6ec0578c166d3beae5e15c4e5" +SRC_URI[tarball.sha256sum] = "71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64" +SRC_URI[tarball.md5sum] = "2b9dc8f2b7dbd5ec5992c6e29de0b764" # powerpc patches SRC_URI += "\ file://binutils-2.16.1-e300c2c3.patch \ " +Please remove the newly added line.
Thanks,
Paul
[1] http://www.openembedded.org/wiki/Commit_Policy
[2] http://git.openembedded.org/openembedded/commit/?id=f4faecdbd0b7c83e5787735ef1495a34aca861e4
[3] http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-September/034885.html_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 2 lines
Best Regards Ulf Samuelsson
Re: [PATCH 3/3] Update checksums for binutils-2.20.1.tar.bz2
Am Donnerstag, den 20.10.2011, 00:11 +0200 schrieb Ulf Samuelsson:
Quoted 10 lines
2011-10-19 22:58, Paul Menzel skrev:
Quoted 8 lines
Am Mittwoch, den 19.10.2011, 17:10 +0200 schrieb [email protected]:
Quoted 1 line
From: Ulf Samuelsson<[email protected]>
again, please comply with our commit policy [1].
binutils: Update from 2.20.1 to 2.20.1a
Quoted 1 line
Tarball is updated to 2.20.1b so checksums have changed.
I am not aware of any binutils version 2.20.1b. Do you mean 2.20.1a?
Quoted 8 lines
Maybe, twas from memory.
Quoted 4 lines
Please create a new recipe since doing it this way the already downloaded sources would be made invalid and archives on mirrors would cause problems too.
The recipe is not working, if the source is not downloaded yet. Maybe a better idea is to change the URI to something useful. Anyone knows where the original source can be downloaded?
lftp ftp.gnu.org:/gnu/binutils> ls binutils-2.20.1*
lrwxrwxrwx 1 3003 3003 24 Sep 01 08:40 binutils-2.20.1.tar.bz2 -> binutils-2.20.1a.tar.bz2
-rw-r--r-- 1 3003 3002 17591527 Aug 26 07:56 binutils-2.20.1a.tar.bz2
-rw-r--r-- 1 3003 3002 194 Aug 26 07:56 binutils-2.20.1a.tar.bz2.sigJust take a look at the commit Martin referenced in his reply.
Quoted 31 lines
Quoted 31 lines
Please see commit
f4faecdb[2] as an example and take a look at the list discussion [3].Quoted 28 lines
Signed-off-by Ulf Samuelsson<[email protected]>--- recipes/binutils/binutils_2.20.1.bb | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)recipes/binutils/binutils_2.20.1.bb +3
-3@@ -1,7 +1,7 @@ require binutils.inc LICENSE = "GPLv3" -PR = "${INC_PR}.4" +PR = "${INC_PR}.5" EXTRA_OECONF += "--disable-werror" #COMPATIBLE_TARGET_SYS = "."@@ -24,10 +24,11 @@ SRC_URI_append_nios2 =" \ file://binutils-nios2.patch \ " -SRC_URI[tarball.sha256sum] = "228b84722d87e88e7fdd36869e590e649ab523a0800a7d53df906498afe6f6f8" -SRC_URI[tarball.md5sum] = "9cdfb9d6ec0578c166d3beae5e15c4e5" +SRC_URI[tarball.sha256sum] = "71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64" +SRC_URI[tarball.md5sum] = "2b9dc8f2b7dbd5ec5992c6e29de0b764"
Quoted 6 lines
Quoted 6 lines
recipes/binutils/binutils_2.20.1.bb SRC_URI_append_nios2 =" \ · line 34
Quoted 5 lines
recipes/binutils/binutils_2.20.1.bb +1
-0# powerpc patches SRC_URI += "\ file://binutils-2.16.1-e300c2c3.patch \ " +Please remove the newly added line.
Thanks,
Paul
Dear Ulf,
Am Mittwoch, den 19.10.2011, 17:10 +0200 schrieb [email protected]:
Quoted 1 line
From: Ulf Samuelsson <[email protected]>
please amend the commit summary and make it compliant to our commit policy [1].
openssl: Add version 1.0.0e (backport from meta-openembedded)
Please also include the revision or URL to the commit you took this from.
I am build testing this right now. For easier review it would be nice if you could add this information to the commit message too.
Quoted 44 lines
Signed-off-by Ulf Samuelsson <[email protected]>--- .../include/angstrom-2010-preferred-versions.inc | 4 +- .../openssl/openssl-1.0.0e/configure-targets.patch | 31 + .../openssl-1.0.0e/debian/c_rehash-compat.patch | 43 + recipes/openssl/openssl-1.0.0e/debian/ca.patch | 20 + .../openssl-1.0.0e/debian/debian-targets.patch | 52 + .../openssl-1.0.0e/debian/make-targets.patch | 13 + .../openssl/openssl-1.0.0e/debian/man-dir.patch | 13 + .../openssl-1.0.0e/debian/man-section.patch | 32 + .../openssl/openssl-1.0.0e/debian/no-rpath.patch | 13 + .../openssl-1.0.0e/debian/no-symbolic.patch | 13 + recipes/openssl/openssl-1.0.0e/debian/pic.patch | 240 ++ .../openssl/openssl-1.0.0e/debian/pkg-config.patch | 34 + .../openssl-1.0.0e/debian/version-script.patch | 4509 ++++++++++++++++++++ .../engines-install-in-libdir-ssl.patch | 53 + recipes/openssl/openssl-1.0.0e/oe-ldflags.patch | 22 + .../openssl/openssl-1.0.0e/openssl-fix-link.patch | 35 + .../openssl/openssl-1.0.0e/parallel-make-fix.patch | 20 + recipes/openssl/openssl-1.0.0e/shared-libs.patch | 48 + recipes/openssl/openssl-native_1.0.0e.bb | 39 + recipes/openssl/openssl.inc | 9 +- recipes/openssl/openssl_1.0.0e.bb | 46 + 21 files changed, 5284 insertions(+), 5 deletions(-) create mode 100644 recipes/openssl/openssl-1.0.0e/configure-targets.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/c_rehash-compat.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/ca.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/debian-targets.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/make-targets.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/man-dir.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/man-section.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/no-rpath.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/no-symbolic.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/pic.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/pkg-config.patch create mode 100644 recipes/openssl/openssl-1.0.0e/debian/version-script.patch create mode 100644 recipes/openssl/openssl-1.0.0e/engines-install-in-libdir-ssl.patch create mode 100644 recipes/openssl/openssl-1.0.0e/oe-ldflags.patch create mode 100644 recipes/openssl/openssl-1.0.0e/openssl-fix-link.patch create mode 100644 recipes/openssl/openssl-1.0.0e/parallel-make-fix.patch create mode 100644 recipes/openssl/openssl-1.0.0e/shared-libs.patch create mode 100644 recipes/openssl/openssl-native_1.0.0e.bb create mode 100644 recipes/openssl/openssl_1.0.0e.bb
[…]
Quoted 6 lines
recipes/openssl/openssl-native_1.0.0e.bb new file +0
-0
recipes/openssl/openssl-native_1.0.0e.bb line 9
Quoted 9 lines
recipes/openssl/openssl-native_1.0.0e.bb new file +9
-0@@ -0,0 +1,39 @@ +require openssl.inc + +inherit pkgconfig native + +SRC_URI[src.md5sum] = "7040b89c4c58c7a1016c0dfa6e821c86" +SRC_URI[src.sha256sum] = "e361dc2775733fb84de7b5bf7b504778b772869e8f7bfac0b28b935cbf7380f7" +PR = "${INC_PR}.0" + +DEFAULT_PREFERENCE = "-1"
This seems strange, since this is not set in the “normal” recipe.
Quoted 104 lines
recipes/openssl/openssl-native_1.0.0e.bb new file +29
-0+export DIRS = "crypto ssl apps engines" + +# This flag can contain target options (e.g -mfpu=neon for armv7-a systems) +export FULL_OPTIMIZATION = " " +export BUILD_OPTIMIZATION = " " + +SRC_URI += "file://configure-targets.patch \ + file://shared-libs.patch \ + file://oe-ldflags.patch \ + file://engines-install-in-libdir-ssl.patch \ + file://openssl-fix-link.patch \ + file://debian/version-script.patch \ + file://debian/pic.patch \ + 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 \ + " + +PARALLEL_MAKE = "" + +CFLAG += " -Wa,--noexecstack " + +NATIVE_INSTALL_WORKS = "1"recipes/openssl/openssl.inc +6
-3@@ -1,14 +1,17 @@ DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools." HOMEPAGE = "http://www.openssl.org/" -LICENSE = "openssl" SECTION = "libs/network" +# "openssl | SSLeay" dual license +LICENSE = "openssl" +LIC_FILES_CHKSUM = "file://LICENSE;md5=83d26c69f6f0172ee7f795790424b453" + SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz;name=src" S = "${WORKDIR}/openssl-${PV}" inherit siteinfo -INC_PR = "r14" +INC_PR = "r15" AR_append = " r" CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \@@ -97,7 +100,7 @@ do_configure () { # inject machine-specific flags sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure useprefix=${prefix} - if [ "x$useprefix" = "x" ]; then + if [ "x$useprefix" == "x" ]; then useprefix=/ fi perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $targetrecipes/openssl/openssl_1.0.0e.bb new file +36
-0@@ -0,0 +1,46 @@ +inherit pkgconfig + +require 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" + +SRC_URI[src.md5sum] = "7040b89c4c58c7a1016c0dfa6e821c86" +SRC_URI[src.sha256sum] = "e361dc2775733fb84de7b5bf7b504778b772869e8f7bfac0b28b935cbf7380f7" + +PR = "${INC_PR}.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" + +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://openssl-fix-link.patch \ + file://debian/version-script.patch \ + file://debian/pic.patch \ + 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 \ + "
recipes/openssl/openssl_1.0.0e.bb line 46
Quoted 10 lines
recipes/openssl/openssl_1.0.0e.bb new file +10
-0+ +PARALLEL_MAKE = "" + +PACKAGES += " \ + ${PN}-engines \ + ${PN}-engines-dbg \ + " + +FILES_${PN}-engines = "${libdir}/ssl/engines/*.so" +FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
Thanks,
Paul