Complete Yocto mirror with license table for TQMa6UL (2038-compliance)
- 264 license table entries with exact download URLs (224/264 resolved) - Complete sources/ directory with all BitBake recipes - Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl) - Full traceability for Softwarefreigabeantrag - GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4 - License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
This commit is contained in:
@@ -0,0 +1,90 @@
|
||||
From e8e566a4b4d589cbdf2613c78cac75ecbea86d3b Mon Sep 17 00:00:00 2001
|
||||
From: Ting Liu <ting.liu@nxp.com>
|
||||
Date: Wed, 30 Sep 2020 10:24:14 +0530
|
||||
Subject: [PATCH] fix multiple definition error
|
||||
|
||||
gcc10 default to -fno-common, which results in error:
|
||||
| ../aarch64-fsl-linux/10.2.0/ld: /tmp/ccaL5AXA.o:.../libpkcs11/git-r0/git/app/pkcs11_app.c:23: multiple definition of `funcs'; /tmp/ccvGV0xB.o:.../app/utils.c:18: first defined here
|
||||
| collect2: error: ld returned 1 exit status
|
||||
| Makefile:66: recipe for target 'app' failed
|
||||
| make: *** [app] Error 1
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Ting Liu <ting.liu@nxp.com>
|
||||
---
|
||||
app/gen_test.c | 2 +-
|
||||
app/pkcs11_app.c | 2 +-
|
||||
app/sign_digest_update_final.c | 2 +-
|
||||
app/thread_test.c | 2 +-
|
||||
app/utils.c | 2 +-
|
||||
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/app/gen_test.c b/app/gen_test.c
|
||||
index fbd3429..2476e18 100644
|
||||
--- a/app/gen_test.c
|
||||
+++ b/app/gen_test.c
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <openssl/pem.h>
|
||||
#include <openssl/md5.h>
|
||||
|
||||
-CK_FUNCTION_LIST *funcs;
|
||||
+static CK_FUNCTION_LIST *funcs;
|
||||
|
||||
#define err2str(X) case X: return #X
|
||||
|
||||
diff --git a/app/pkcs11_app.c b/app/pkcs11_app.c
|
||||
index 2b4a70d..3883dab 100644
|
||||
--- a/app/pkcs11_app.c
|
||||
+++ b/app/pkcs11_app.c
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <openssl/pem.h>
|
||||
#include "utils.h"
|
||||
|
||||
-CK_FUNCTION_LIST *funcs;
|
||||
+static CK_FUNCTION_LIST *funcs;
|
||||
|
||||
struct getOptValue_t {
|
||||
uint32_t main_option;
|
||||
diff --git a/app/sign_digest_update_final.c b/app/sign_digest_update_final.c
|
||||
index b3367ed..49fee20 100644
|
||||
--- a/app/sign_digest_update_final.c
|
||||
+++ b/app/sign_digest_update_final.c
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <openssl/pem.h>
|
||||
#include "utils.h"
|
||||
|
||||
-CK_FUNCTION_LIST *funcs;
|
||||
+static CK_FUNCTION_LIST *funcs;
|
||||
|
||||
struct getOptValue_t {
|
||||
uint32_t main_option;
|
||||
diff --git a/app/thread_test.c b/app/thread_test.c
|
||||
index 19d03ee..a574074 100644
|
||||
--- a/app/thread_test.c
|
||||
+++ b/app/thread_test.c
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <sched.h>
|
||||
#include <pthread.h>
|
||||
|
||||
-CK_FUNCTION_LIST *funcs;
|
||||
+static CK_FUNCTION_LIST *funcs;
|
||||
|
||||
#define err2str(X) case X: return #X
|
||||
#define MAX_THREADS 10
|
||||
diff --git a/app/utils.c b/app/utils.c
|
||||
index 7afad95..9f9e143 100644
|
||||
--- a/app/utils.c
|
||||
+++ b/app/utils.c
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <tee_slot.h>
|
||||
#include "utils.h"
|
||||
|
||||
-CK_FUNCTION_LIST *funcs;
|
||||
+static CK_FUNCTION_LIST *funcs;
|
||||
|
||||
#define err2str(X) case X: return #X
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
DESCRIPTION = "PKCS library"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=803852533e29eb1d6d5e55ad3078b625"
|
||||
|
||||
SRC_URI = "git://github.com/nxp-qoriq/libpkcs11;protocol=https;nobranch=1 \
|
||||
file://0001-fix-multiple-definition-error.patch \
|
||||
"
|
||||
SRCREV = "8d85182b7a7cd393ab6dd72930f8d1b69468f741"
|
||||
|
||||
DEPENDS = "openssl secure-obj"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
|
||||
export CROSS_COMPILE_HOST = "${CROSS_COMPILE}"
|
||||
export CROSS_COMPILE_TA = "${CROSS_COMPILE}"
|
||||
|
||||
CFLAGS += "-fPIC"
|
||||
|
||||
EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}"'
|
||||
|
||||
do_compile() {
|
||||
export OPENSSL_PATH="${RECIPE_SYSROOT}/usr"
|
||||
export CROSS_COMPILE="${WRAP_TARGET_PREFIX}"
|
||||
oe_runmake all
|
||||
}
|
||||
|
||||
do_install(){
|
||||
mkdir -p ${D}/${libdir}
|
||||
mkdir -p ${D}/${includedir} ${D}/${bindir}
|
||||
cp ${S}/out/export/lib/libpkcs11.so ${D}/${libdir}
|
||||
cp ${S}/out/export/include/*.h ${D}/${includedir}
|
||||
rm -f ${D}${includedir}/pkcs11.h
|
||||
cp ${S}/out/export/app/* ${D}/${bindir}
|
||||
}
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
INSANE_SKIP:${PN} = "ldflags dev-deps"
|
||||
INSANE_SKIP:${PN}-dev = "ldflags dev-elf"
|
||||
COMPATIBLE_MACHINE = "(qoriq-arm64)"
|
||||
Reference in New Issue
Block a user