From 6f52bf40a7b8c3bde23c0a44dd5fc570987bd361 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Wed, 13 Oct 2021 09:07:49 +0200
Subject: [PATCH] rauc: Follow the project rename
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
.../files/{ostc-insecure-cert.pem => oniro-insecure-cert.pem} | 0
.../recipes-core/rauc/files/raspberrypi4/system.conf | 2 +-
meta-ohos-core/recipes-core/rauc/insecure-keys/gen-keys.sh | 2 +-
meta-ohos-core/recipes-core/rauc/rauc_%.bbappend | 4 ++--
4 files changed, 4 insertions(+), 4 deletions(-)
rename meta-ohos-core/recipes-core/rauc/files/{ostc-insecure-cert.pem => oniro-insecure-cert.pem} (100%)
diff --git a/meta-ohos-core/recipes-core/rauc/files/ostc-insecure-cert.pem b/meta-ohos-core/recipes-core/rauc/files/oniro-insecure-cert.pem
similarity index 100%
rename from meta-ohos-core/recipes-core/rauc/files/ostc-insecure-cert.pem
rename to meta-ohos-core/recipes-core/rauc/files/oniro-insecure-cert.pem
diff --git a/meta-ohos-core/recipes-core/rauc/files/raspberrypi4/system.conf b/meta-ohos-core/recipes-core/rauc/files/raspberrypi4/system.conf
index 1585b361..eec16092 100644
--- a/meta-ohos-core/recipes-core/rauc/files/raspberrypi4/system.conf
+++ b/meta-ohos-core/recipes-core/rauc/files/raspberrypi4/system.conf
@@ -24,7 +24,7 @@ device=/dev/mmcblk0p3
bootname=B
[keyring]
-path=/etc/rauc/ostc-insecure-cert.pem
+path=/etc/rauc/oniro-insecure-cert.pem
[handlers]
# Use SystemOTA for RAUC pre-install and post-install handlers. This is
diff --git a/meta-ohos-core/recipes-core/rauc/insecure-keys/gen-keys.sh b/meta-ohos-core/recipes-core/rauc/insecure-keys/gen-keys.sh
index cd89f768..ae809ce8 100755
--- a/meta-ohos-core/recipes-core/rauc/insecure-keys/gen-keys.sh
+++ b/meta-ohos-core/recipes-core/rauc/insecure-keys/gen-keys.sh
@@ -11,5 +11,5 @@ openssl req -x509 -newkey rsa:4096 \
-out cert.pem \
-days 365 \
-nodes \
- -subj "/CN=ostc-eu.org/O=Open Source Technology Center (Europe)/C=PL/L=Warsaw" </dev/null
+ -subj "/CN=oniroproject.org/O=Oniro Project/C=PL/L=Warsaw" </dev/null
diff --git a/meta-ohos-core/recipes-core/rauc/rauc_%.bbappend b/meta-ohos-core/recipes-core/rauc/rauc_%.bbappend
index 9cfcf46f..b7ebcbd1 100644
--- a/meta-ohos-core/recipes-core/rauc/rauc_%.bbappend
+++ b/meta-ohos-core/recipes-core/rauc/rauc_%.bbappend
@@ -35,11 +35,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
# downstream overrides to define it more strongly and use a different private
# key. This variable is also set up to append to SRC_URI, so no additional
# declaration is needed.
-RAUC_KEYRING_FILE ?= "ostc-insecure-cert.pem"
+RAUC_KEYRING_FILE ?= "oniro-insecure-cert.pem"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
do_install_append() {
- if [ -f ${D}${sysconfdir}/rauc/ostc-insecure-cert.pem ]; then
+ 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
}
--
GitLab