summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Rapeli <mikko.rapeli@linaro.org>2023-05-30 09:54:37 +0300
committerArmin Kuster <akuster808@gmail.com>2023-06-03 10:04:40 -0400
commite98bb1c5673839965596d9154f667d9f42c105c3 (patch)
tree8e6ef3725dc4d3cc3cfe624b29ea983cd410dc8c
parente3156758b04244dde8b5f9a3a4d0ed106d525965 (diff)
downloadmeta-security-e98bb1c5673839965596d9154f667d9f42c105c3.tar.gz
parsec-service: fix build error
After latest changes to ${S}, parsec-service fails to apply systemd.patch: ERROR: parsec-service-1.2.0-r0 do_patch: Applying patch 'systemd.patch' on target directory '/home/builder/build/tmp_trs-qemuarm64/work/cortexa57-trs-linux/parsec-service/1.2.0-r0/cargo_home/bitbake/parsec-service-1.2.0' CmdError('quilt --quiltrc /home/builder/build/tmp_qemuarm64/work/cortexa57-linux/parsec-service/1.2.0-r0/recipe-sysroot-native/etc/quiltrc push', 0, "stdout: Applying patch systemd.patch can't find file to patch at input line 11 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- | |Run the Parsec service as parsec user in /var/lib/parsec/ working directory. | |Signed-off-by: Anton Antonov <Anton.Antonov@arm.com> |Upstream-Status: Inappropriate [deployment configuration] | |diff --git a/systemd-daemon/parsec.service b/systemd-daemon/parsec.service |index c07c3b9..a6fe6a3 100644 |--- a/systemd-daemon/parsec.service |+++ b/systemd-daemon/parsec.service -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored Patch systemd.patch does not apply (enforce with -f) stderr: ") ERROR: Logfile of failure stored in: /home/builder/build/tmp_qemuarm64/work/cortexa57-linux/parsec-service/1.2.0-r0/temp/log.do_patch.218884 Instead of changing S, it seems to be sufficient to switch build directory B to ${CARGO_VENDORING_DIRECTORY}/${BP}. Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-parsec/recipes-parsec/parsec-service/parsec-service_1.2.0.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.2.0.bb b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.2.0.bb
index 1d38dc5..b42b7b4 100644
--- a/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.2.0.bb
+++ b/meta-parsec/recipes-parsec/parsec-service/parsec-service_1.2.0.bb
@@ -14,7 +14,7 @@ SRC_URI += "crate://crates.io/parsec-service/${PV} \
14" 14"
15SRC_URI[parsec-service-1.2.0.sha256sum] = "f58e7ba859c22cc1904dc8298b1a7d94ee1ba3b4d4808f28e4cc0c96ddb149c9" 15SRC_URI[parsec-service-1.2.0.sha256sum] = "f58e7ba859c22cc1904dc8298b1a7d94ee1ba3b4d4808f28e4cc0c96ddb149c9"
16 16
17S = "${CARGO_VENDORING_DIRECTORY}/${BP}" 17B = "${CARGO_VENDORING_DIRECTORY}/${BP}"
18 18
19PACKAGECONFIG ??= "PKCS11 MBED-CRYPTO" 19PACKAGECONFIG ??= "PKCS11 MBED-CRYPTO"
20have_TPM = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'TPM', '', d)}" 20have_TPM = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'TPM', '', d)}"