unify certs and keys used

The certs and keys used are only redundant copies of the exact same set. To reduce duplication and simplify adding further platforms, move them all into a common directory of the base repo. Signed-off-by: Enrico Jörns <[email protected]>
rauc · Feb 5, 2025 · 86cc4e6 · 86cc4e6
1 parent 72bb823
commit 86cc4e6
Show file tree

Hide file tree

Showing 25 changed files with 20 additions and 767 deletions.
diff --git a/...ebone/recipes-core/rauc/files/ca.cert.pem → files/rauc-example-keys/ca.cert.pem b/...ebone/recipes-core/rauc/files/ca.cert.pem → files/rauc-example-keys/ca.cert.pem
diff --git a/...core/bundles/files/development-1.cert.pem → .../rauc-example-keys/development-1.cert.pem b/...core/bundles/files/development-1.cert.pem → .../rauc-example-keys/development-1.cert.pem
diff --git a/...-core/bundles/files/development-1.key.pem → ...s/rauc-example-keys/development-1.key.pem b/...-core/bundles/files/development-1.key.pem → ...s/rauc-example-keys/development-1.key.pem
diff --git a/meta-rauc-beaglebone/conf/layer.conf b/meta-rauc-beaglebone/conf/layer.conf
@@ -11,3 +11,7 @@ BBFILE_PRIORITY_meta-rauc-beaglebone = "6"
 
 LAYERDEPENDS_meta-rauc-beaglebone = "core rauc yoctobsp"
 LAYERSERIES_COMPAT_meta-rauc-beaglebone = "scarthgap"
+
+RAUC_KEY_FILE ?= "${LAYERDIR}/../files/rauc-example-keys/development-1.key.pem"
+RAUC_CERT_FILE ?= "${LAYERDIR}/../files/rauc-example-keys/development-1.cert.pem"
+RAUC_KEYRING_FILE ?= "${LAYERDIR}/../files/rauc-example-keys/ca.cert.pem"
diff --git a/meta-rauc-beaglebone/recipes-core/bundles/update-bundle.bb b/meta-rauc-beaglebone/recipes-core/bundles/update-bundle.bb
@@ -14,6 +14,3 @@ RAUC_BUNDLE_DESCRIPTION = "RAUC demonstration bundle"
 RAUC_BUNDLE_SLOTS = "rootfs"
 RAUC_SLOT_rootfs = "core-image-minimal"
 RAUC_SLOT_rootfs[fstype] = "ext4"
-
-RAUC_KEY_FILE = "${THISDIR}/files/development-1.key.pem"
-RAUC_CERT_FILE = "${THISDIR}/files/development-1.cert.pem"
diff --git a/meta-rauc-nxp/conf/layer.conf b/meta-rauc-nxp/conf/layer.conf
@@ -11,3 +11,7 @@ BBFILE_PRIORITY_meta-rauc-nxp = "6"
 
 LAYERDEPENDS_meta-rauc-nxp = "core rauc freescale-layer freescale-3rdparty"
 LAYERSERIES_COMPAT_meta-rauc-nxp = "styhead"
+
+RAUC_KEY_FILE ?= "${LAYERDIR}/../files/rauc-example-keys/development-1.key.pem"
+RAUC_CERT_FILE ?= "${LAYERDIR}/../files/rauc-example-keys/development-1.cert.pem"
+RAUC_KEYRING_FILE ?= "${LAYERDIR}/../files/rauc-example-keys/ca.cert.pem"
diff --git a/meta-rauc-nxp/recipes-core/bundles/files/development-1.cert.pem b/meta-rauc-nxp/recipes-core/bundles/files/development-1.cert.pem
diff --git a/meta-rauc-nxp/recipes-core/bundles/files/development-1.key.pem b/meta-rauc-nxp/recipes-core/bundles/files/development-1.key.pem
diff --git a/meta-rauc-nxp/recipes-core/bundles/update-bundle.bb b/meta-rauc-nxp/recipes-core/bundles/update-bundle.bb
@@ -11,6 +11,3 @@ RAUC_BUNDLE_DESCRIPTION = "RAUC demonstration bundle"
 RAUC_BUNDLE_SLOTS = "rootfs"
 RAUC_SLOT_rootfs = "core-image-base"
 RAUC_SLOT_rootfs[fstype] = "ext4"
-
-RAUC_KEY_FILE ?= "${THISDIR}/files/development-1.key.pem"
-RAUC_CERT_FILE ?= "${THISDIR}/files/development-1.cert.pem"
diff --git a/meta-rauc-nxp/recipes-core/rauc/files/ca.cert.pem b/meta-rauc-nxp/recipes-core/rauc/files/ca.cert.pem
diff --git a/meta-rauc-raspberrypi/conf/layer.conf b/meta-rauc-raspberrypi/conf/layer.conf
@@ -14,3 +14,7 @@ LAYERDEPENDS_meta-rauc-raspberrypi = "core rauc raspberrypi"
 # https://git.yoctoproject.org/meta-lts-mixins scarthgap/u-boot branch
 LAYERRECOMMENDS_meta-rauc-raspberrypi = "lts-u-boot-mixin"
 LAYERSERIES_COMPAT_meta-rauc-raspberrypi = "styhead"
+
+RAUC_KEY_FILE ?= "${LAYERDIR}/../files/rauc-example-keys/development-1.key.pem"
+RAUC_CERT_FILE ?= "${LAYERDIR}/../files/rauc-example-keys/development-1.cert.pem"
+RAUC_KEYRING_FILE ?= "${LAYERDIR}/../files/rauc-example-keys/ca.cert.pem"
diff --git a/meta-rauc-raspberrypi/recipes-core/bundles/files/development-1.cert.pem b/meta-rauc-raspberrypi/recipes-core/bundles/files/development-1.cert.pem
diff --git a/meta-rauc-raspberrypi/recipes-core/bundles/files/development-1.key.pem b/meta-rauc-raspberrypi/recipes-core/bundles/files/development-1.key.pem
diff --git a/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb b/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb
@@ -11,6 +11,3 @@ RAUC_BUNDLE_FORMAT = "verity"
 RAUC_BUNDLE_SLOTS = "rootfs"
 RAUC_SLOT_rootfs = "core-image-minimal"
 RAUC_SLOT_rootfs[fstype] = "ext4"
-
-RAUC_KEY_FILE ?= "${THISDIR}/files/development-1.key.pem"
-RAUC_CERT_FILE ?= "${THISDIR}/files/development-1.cert.pem"