diff options
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 3 | ||||
-rw-r--r-- | recipes-sota/aktualizr/files/sota_hsm_test.toml | 5 | ||||
-rw-r--r-- | recipes-support/libp11/libp11_0.4.7.bb | 37 |
3 files changed, 41 insertions, 4 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 470c9bf..c98027d 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -19,7 +19,7 @@ PR = "7" | |||
19 | SRC_URI = " \ | 19 | SRC_URI = " \ |
20 | git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ | 20 | git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ |
21 | " | 21 | " |
22 | SRCREV = "67c4f44c4136d16871726449502e3926098e8524" | 22 | SRCREV = "f043191ae622a96cf2f4d48f9073d5cfa9f16e3f" |
23 | BRANCH ?= "master" | 23 | BRANCH ?= "master" |
24 | 24 | ||
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
@@ -34,7 +34,6 @@ EXTRA_OECMAKE_append_class-native = "-DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF " | |||
34 | 34 | ||
35 | do_install_append () { | 35 | do_install_append () { |
36 | rm -f ${D}${bindir}/aktualizr_cert_provider | 36 | rm -f ${D}${bindir}/aktualizr_cert_provider |
37 | rm -f ${D}${bindir}/garage-deploy | ||
38 | } | 37 | } |
39 | do_install_append_class-target () { | 38 | do_install_append_class-target () { |
40 | rm -f ${D}${bindir}/aktualizr_implicit_writer | 39 | rm -f ${D}${bindir}/aktualizr_implicit_writer |
diff --git a/recipes-sota/aktualizr/files/sota_hsm_test.toml b/recipes-sota/aktualizr/files/sota_hsm_test.toml index 1317914..28aefc2 100644 --- a/recipes-sota/aktualizr/files/sota_hsm_test.toml +++ b/recipes-sota/aktualizr/files/sota_hsm_test.toml | |||
@@ -12,6 +12,7 @@ pass = "1234" | |||
12 | 12 | ||
13 | [uptane] | 13 | [uptane] |
14 | metadata_path = "/var/sota/metadata" | 14 | metadata_path = "/var/sota/metadata" |
15 | private_key_path = "ecukey.der" | 15 | key_source = "pkcs11" |
16 | public_key_path = "ecukey.pub" | 16 | private_key_path = "03" |
17 | public_key_path = "03" | ||
17 | 18 | ||
diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.7.bb new file mode 100644 index 0000000..7d77e90 --- /dev/null +++ b/recipes-support/libp11/libp11_0.4.7.bb | |||
@@ -0,0 +1,37 @@ | |||
1 | SUMMARY = "Library for using PKCS" | ||
2 | DESCRIPTION = "\ | ||
3 | Libp11 is a library implementing a small layer on top of PKCS \ | ||
4 | make using PKCS" | ||
5 | HOMEPAGE = "http://www.opensc-project.org/libp11" | ||
6 | SECTION = "Development/Libraries" | ||
7 | LICENSE = "LGPLv2+" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" | ||
9 | DEPENDS = "libtool openssl" | ||
10 | |||
11 | SRC_URI = "git://github.com/OpenSC/libp11.git" | ||
12 | SRCREV = "da725ab727342083478150a203a3c80c4551feb4" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit autotools pkgconfig | ||
17 | |||
18 | # Currently, Makefile dependencies are incorrectly defined which causes build errors | ||
19 | # The number of jobs is high | ||
20 | # See https://github.com/OpenSC/libp11/issues/94 | ||
21 | PARALLEL_MAKE = "" | ||
22 | EXTRA_OECONF = "--disable-static" | ||
23 | |||
24 | do_install_append () { | ||
25 | rm -rf ${D}${libdir}/*.la | ||
26 | rm -rf ${D}${docdir}/${BPN} | ||
27 | } | ||
28 | |||
29 | FILES_${PN} = "${libdir}/engines/pkcs11.so \ | ||
30 | ${libdir}/engines/libpkcs11${SOLIBS} \ | ||
31 | ${libdir}/libp11${SOLIBS}" | ||
32 | |||
33 | FILES_${PN}-dev = " \ | ||
34 | ${libdir}/engines/libpkcs11${SOLIBSDEV} \ | ||
35 | ${libdir}/libp11${SOLIBSDEV} \ | ||
36 | ${libdir}/pkgconfig/libp11.pc \ | ||
37 | /usr/include" | ||