From 28557499256b03098e7225f2179e8c8a5d81cd10 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Thu, 9 Dec 2021 12:10:05 +0100
Subject: [PATCH] rauc: Fix syntax overrides
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
meta-oniro-core/recipes-core/rauc/rauc_%.bbappend | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta-oniro-core/recipes-core/rauc/rauc_%.bbappend b/meta-oniro-core/recipes-core/rauc/rauc_%.bbappend
index b5e60bf1..fe05c1a1 100644
--- a/meta-oniro-core/recipes-core/rauc/rauc_%.bbappend
+++ b/meta-oniro-core/recipes-core/rauc/rauc_%.bbappend
@@ -9,7 +9,7 @@
# FIXME(zyga): The file defines RAUC compatible string which is technically
# something that SystemOTA should be responsible for (make/model and remodel
# operations). This should be addressed before re-model is supported.
-FILESEXTRAPATHS_prepend_raspberrypi4-64 := "${THISDIR}/files/raspberrypi4:"
+FILESEXTRAPATHS:prepend:raspberrypi4-64 := "${THISDIR}/files/raspberrypi4:"
# Make the RAUC package machine-specific. This lets us put the specific configuration
# file, which encodes the slot configuration, into it safely.
@@ -36,9 +36,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
# key. This variable is also set up to append to SRC_URI, so no additional
# declaration is needed.
RAUC_KEYRING_FILE ?= "oniro-insecure-cert.pem"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-do_install_append() {
+do_install:append() {
if [ -f ${D}${sysconfdir}/rauc/oniro-insecure-cert.pem ]; then
bbwarn "The image is using a known, insecure test key for verifying RAUC bundles. Do not use this in production systems."
fi
@@ -46,14 +46,14 @@ do_install_append() {
# Install Oniro specific override for RAUC state directory.
-SRC_URI_append = " \
+SRC_URI:append = " \
file://rauc-state-dir.conf \
"
-FILES_${PN}-service += "\
+FILES:${PN}-service += "\
${systemd_unitdir}/system/rauc.service.d/*.conf \
"
-do_install_append() {
+do_install:append() {
install -D -m 644 ${WORKDIR}/rauc-state-dir.conf --target-directory=${D}${systemd_unitdir}/system/rauc.service.d/
}
--
GitLab