summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2021-07-29 16:33:12 -0700
committerArmin Kuster <akuster808@gmail.com>2021-08-01 08:47:08 -0700
commit90fe17c34781b4c91c76c075a7fd69e78f370419 (patch)
tree460e47abdd7af9a416f3f624da82aa2d2599d8f4
parent119cabaf2917c0c143778fc25f36e8158b7e2ba9 (diff)
downloadmeta-security-90fe17c34781b4c91c76c075a7fd69e78f370419.tar.gz
meta-parsec: Convert to new override syntax
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-parsec/README.md8
-rw-r--r--meta-parsec/recipes-parsec/parsec-service/parsec-service_0.7.0.bb10
2 files changed, 9 insertions, 9 deletions
diff --git a/meta-parsec/README.md b/meta-parsec/README.md
index a2736b6..24958ac 100644
--- a/meta-parsec/README.md
+++ b/meta-parsec/README.md
@@ -53,7 +53,7 @@ other layers needed. e.g.:
53To include the Parsec service into your image add following into the 53To include the Parsec service into your image add following into the
54local.conf: 54local.conf:
55 55
56 IMAGE_INSTALL_append = " parsec-service" 56 IMAGE_INSTALL:append = " parsec-service"
57 57
58 The Parsec service will be deployed into the image built with all the supported 58 The Parsec service will be deployed into the image built with all the supported
59providers and with the default config file from the Parsec repository: 59providers and with the default config file from the Parsec repository:
@@ -86,7 +86,7 @@ Manual testing with runqemu
86 This layer also contains a recipe for pasec-tool which can be used for 86 This layer also contains a recipe for pasec-tool which can be used for
87manual testing of the Parsec service: 87manual testing of the Parsec service:
88 88
89 IMAGE_INSTALL_append += " parsec-tools" 89 IMAGE_INSTALL:append += " parsec-tools"
90 90
91 There are a series of Parsec Demo videos showing how to use parsec-tool 91 There are a series of Parsec Demo videos showing how to use parsec-tool
92to test the Parsec service base functionality: 92to test the Parsec service base functionality:
@@ -103,7 +103,7 @@ enabled. No changes required for manual testing.
103 The Software HSM can be used for manual testing of the provider by 103 The Software HSM can be used for manual testing of the provider by
104including it into your test image: 104including it into your test image:
105 105
106 IMAGE_INSTALL_append += " softhsm" 106 IMAGE_INSTALL:append += " softhsm"
107 107
108Inside the running VM: 108Inside the running VM:
109- Stop Parsec 109- Stop Parsec
@@ -134,7 +134,7 @@ systemctl start parsec
134 The IBM Software TPM service can be used for manual testing of the provider by 134 The IBM Software TPM service can be used for manual testing of the provider by
135including it into your test image: 135including it into your test image:
136 136
137 IMAGE_INSTALL_append += " ibmswtpm2 tpm2-tools libtss2 libtss2-tcti-mssim" 137 IMAGE_INSTALL:append += " ibmswtpm2 tpm2-tools libtss2 libtss2-tcti-mssim"
138 138
139Inside the running VM: 139Inside the running VM:
140- Stop Parsec 140- Stop Parsec
diff --git a/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.7.0.bb b/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.7.0.bb
index d57a43a..5f7a99b 100644
--- a/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.7.0.bb
+++ b/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.7.0.bb
@@ -15,7 +15,7 @@ DEPENDS = "tpm2-tss clang-native"
15CARGO_BUILD_FLAGS += " --features all-providers,cryptoki/generate-bindings,tss-esapi/generate-bindings" 15CARGO_BUILD_FLAGS += " --features all-providers,cryptoki/generate-bindings,tss-esapi/generate-bindings"
16 16
17inherit systemd 17inherit systemd
18SYSTEMD_SERVICE_${PN} = "parsec.service" 18SYSTEMD_SERVICE:${PN} = "parsec.service"
19 19
20inherit update-rc.d 20inherit update-rc.d
21INITSCRIPT_NAME = "parsec" 21INITSCRIPT_NAME = "parsec"
@@ -24,7 +24,7 @@ INITSCRIPT_NAME = "parsec"
24# The file should also be included into SRC_URI then 24# The file should also be included into SRC_URI then
25PARSEC_CONFIG ?= "${S}/config.toml" 25PARSEC_CONFIG ?= "${S}/config.toml"
26 26
27do_install_append () { 27do_install:append () {
28 # Binaries 28 # Binaries
29 install -d -m 700 -o parsec -g parsec "${D}${libexecdir}/parsec" 29 install -d -m 700 -o parsec -g parsec "${D}${libexecdir}/parsec"
30 install -m 700 -o parsec -g parsec "${WORKDIR}/build/target/${CARGO_TARGET_SUBDIR}/parsec" ${D}${libexecdir}/parsec/parsec 30 install -m 700 -o parsec -g parsec "${WORKDIR}/build/target/${CARGO_TARGET_SUBDIR}/parsec" ${D}${libexecdir}/parsec/parsec
@@ -52,10 +52,10 @@ do_install_append () {
52 52
53inherit useradd 53inherit useradd
54USERADD_PACKAGES = "${PN}" 54USERADD_PACKAGES = "${PN}"
55USERADD_PARAM_${PN} = "-r -g parsec -s /bin/false -d ${localstatedir}/lib/parsec parsec" 55USERADD_PARAM:${PN} = "-r -g parsec -s /bin/false -d ${localstatedir}/lib/parsec parsec"
56GROUPADD_PARAM_${PN} = "-r parsec" 56GROUPADD_PARAM:${PN} = "-r parsec"
57 57
58FILES_${PN} += " \ 58FILES:${PN} += " \
59 ${sysconfdir}/parsec/config.toml \ 59 ${sysconfdir}/parsec/config.toml \
60 ${libexecdir}/parsec/parsec \ 60 ${libexecdir}/parsec/parsec \
61 ${systemd_unitdir}/system/parsec.service \ 61 ${systemd_unitdir}/system/parsec.service \