diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2019-01-09 16:46:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 16:46:50 +0100 |
| commit | ab0ddf01030f972b95af3c4f4d801c8ae56eadb2 (patch) | |
| tree | 125e673d579d2d07fac05000095f20a14953ba69 | |
| parent | 967ac2b1db9ce96436d3afe9ea997bfc01f07ecd (diff) | |
| parent | 94d0516b9e83171d047b416dc551290daee9b44a (diff) | |
| download | meta-updater-ab0ddf01030f972b95af3c4f4d801c8ae56eadb2.tar.gz | |
Merge pull request #453 from advancedtelematic/fix/rm-sc-hsm-embedded
sc-hsm-embedded: removed as it was never actually used.
| -rw-r--r-- | recipes-support/sc-hsm-embedded/files/0001-Cross-compilation-tweaks.patch | 86 | ||||
| -rw-r--r-- | recipes-support/sc-hsm-embedded/sc-hsm-embedded_git.bb | 22 |
2 files changed, 0 insertions, 108 deletions
diff --git a/recipes-support/sc-hsm-embedded/files/0001-Cross-compilation-tweaks.patch b/recipes-support/sc-hsm-embedded/files/0001-Cross-compilation-tweaks.patch deleted file mode 100644 index b3a7622..0000000 --- a/recipes-support/sc-hsm-embedded/files/0001-Cross-compilation-tweaks.patch +++ /dev/null | |||
| @@ -1,86 +0,0 @@ | |||
| 1 | From b6add28acb884b6006216e8422cc18504483c72e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anton Gerasimov <anton@advancedtelematic.com> | ||
| 3 | Date: Fri, 8 Sep 2017 15:08:40 +0200 | ||
| 4 | Subject: [PATCH] Cross-compilation tweaks | ||
| 5 | |||
| 6 | --- | ||
| 7 | m4/acx_openssl.m4 | 2 ++ | ||
| 8 | m4/acx_openssl_ecc.m4 | 3 +++ | ||
| 9 | m4/acx_openssl_fips.m4 | 2 ++ | ||
| 10 | m4/acx_openssl_gost.m4 | 2 ++ | ||
| 11 | 4 files changed, 9 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/m4/acx_openssl.m4 b/m4/acx_openssl.m4 | ||
| 14 | index e90c78f..9de6055 100644 | ||
| 15 | --- a/m4/acx_openssl.m4 | ||
| 16 | +++ b/m4/acx_openssl.m4 | ||
| 17 | @@ -25,6 +25,7 @@ AC_DEFUN([ACX_OPENSSL],[ | ||
| 18 | AC_CHECK_HEADERS([openssl/ssl.h],,[AC_MSG_ERROR([Can't find OpenSSL headers])]) | ||
| 19 | AC_CHECK_LIB(crypto, BN_new,,[AC_MSG_ERROR([Can't find OpenSSL library])]) | ||
| 20 | |||
| 21 | + if test "$cross_compiling" != yes; then | ||
| 22 | AC_MSG_CHECKING([for OpenSSL version]) | ||
| 23 | CHECK_OPENSSL_VERSION=m4_format(0x%02x%02x%02x000L, $1, $2, $3) | ||
| 24 | AC_LANG_PUSH([C]) | ||
| 25 | @@ -51,6 +52,7 @@ AC_DEFUN([ACX_OPENSSL],[ | ||
| 26 | AC_MSG_ERROR([OpenSSL library too old ($1.$2.$3 or later required)]) | ||
| 27 | ],[]) | ||
| 28 | AC_LANG_POP([C]) | ||
| 29 | + fi | ||
| 30 | |||
| 31 | CPPFLAGS=$tmp_CPPFLAGS | ||
| 32 | LIBS=$tmp_LIBS | ||
| 33 | diff --git a/m4/acx_openssl_ecc.m4 b/m4/acx_openssl_ecc.m4 | ||
| 34 | index 612c505..ba2389d 100644 | ||
| 35 | --- a/m4/acx_openssl_ecc.m4 | ||
| 36 | +++ b/m4/acx_openssl_ecc.m4 | ||
| 37 | @@ -1,4 +1,5 @@ | ||
| 38 | AC_DEFUN([ACX_OPENSSL_ECC],[ | ||
| 39 | + if test "$cross_compiling" != yes; then | ||
| 40 | AC_MSG_CHECKING(for OpenSSL ECC support) | ||
| 41 | |||
| 42 | tmp_CPPFLAGS=$CPPFLAGS | ||
| 43 | @@ -32,6 +33,8 @@ AC_DEFUN([ACX_OPENSSL_ECC],[ | ||
| 44 | ],[]) | ||
| 45 | AC_LANG_POP([C]) | ||
| 46 | |||
| 47 | + fi | ||
| 48 | + | ||
| 49 | CPPFLAGS=$tmp_CPPFLAGS | ||
| 50 | LIBS=$tmp_LIBS | ||
| 51 | ]) | ||
| 52 | diff --git a/m4/acx_openssl_fips.m4 b/m4/acx_openssl_fips.m4 | ||
| 53 | index 0491397..896cdbf 100644 | ||
| 54 | --- a/m4/acx_openssl_fips.m4 | ||
| 55 | +++ b/m4/acx_openssl_fips.m4 | ||
| 56 | @@ -1,4 +1,5 @@ | ||
| 57 | AC_DEFUN([ACX_OPENSSL_FIPS],[ | ||
| 58 | + if test "$cross_compiling" != yes; then | ||
| 59 | AC_MSG_CHECKING(for OpenSSL FIPS capable library) | ||
| 60 | |||
| 61 | tmp_CPPFLAGS=$CPPFLAGS | ||
| 62 | @@ -47,4 +48,5 @@ AC_DEFUN([ACX_OPENSSL_FIPS],[ | ||
| 63 | |||
| 64 | CPPFLAGS=$tmp_CPPFLAGS | ||
| 65 | LIBS=$tmp_LIBS | ||
| 66 | + fi | ||
| 67 | ]) | ||
| 68 | diff --git a/m4/acx_openssl_gost.m4 b/m4/acx_openssl_gost.m4 | ||
| 69 | index dca489b..34c39d8 100644 | ||
| 70 | --- a/m4/acx_openssl_gost.m4 | ||
| 71 | +++ b/m4/acx_openssl_gost.m4 | ||
| 72 | @@ -1,4 +1,5 @@ | ||
| 73 | AC_DEFUN([ACX_OPENSSL_GOST],[ | ||
| 74 | + if test "$cross_compiling" != yes; then | ||
| 75 | AC_MSG_CHECKING(for OpenSSL GOST support) | ||
| 76 | |||
| 77 | tmp_CPPFLAGS=$CPPFLAGS | ||
| 78 | @@ -62,4 +63,5 @@ AC_DEFUN([ACX_OPENSSL_GOST],[ | ||
| 79 | |||
| 80 | CPPFLAGS=$tmp_CPPFLAGS | ||
| 81 | LIBS=$tmp_LIBS | ||
| 82 | + fi | ||
| 83 | ]) | ||
| 84 | -- | ||
| 85 | 2.7.4 | ||
| 86 | |||
diff --git a/recipes-support/sc-hsm-embedded/sc-hsm-embedded_git.bb b/recipes-support/sc-hsm-embedded/sc-hsm-embedded_git.bb deleted file mode 100644 index 062d514..0000000 --- a/recipes-support/sc-hsm-embedded/sc-hsm-embedded_git.bb +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | SUMMARY = "Smartcard HSM driver" | ||
| 2 | LICENSE = "BSD" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=55b854a477953696452f698a3af5de1c" | ||
| 4 | |||
| 5 | inherit autotools-brokensep | ||
| 6 | |||
| 7 | |||
| 8 | SRC_URI = "git://github.com/CardContact/sc-hsm-embedded.git;branch=master" | ||
| 9 | SRCREV="a45155d4249575ebdfb16ff26fdedbc4c4813002" | ||
| 10 | |||
| 11 | S = "${WORKDIR}/git" | ||
| 12 | |||
| 13 | DEPENDS += " openssl pcsc-lite" | ||
| 14 | |||
| 15 | do_configure() { | ||
| 16 | autoreconf -fi | ||
| 17 | oe_runconf | ||
| 18 | } | ||
| 19 | |||
| 20 | FILES_${PN} += "${libdir}" | ||
| 21 | FILES_SOLIBSDEV = "" | ||
| 22 | |||
