From d57a9b7a70c71af6a6f0d9e76696920116adf162 Mon Sep 17 00:00:00 2001
From: Patrick Vogelaar <patrick.vogelaar@belden.com>
Date: Mon, 5 Feb 2024 18:18:20 +0100
Subject: [PATCH] refactor(certificates-and-keys-native): renamed recipe

renamed certificates-and-keys-native recipe to cos-certificates-and-keys-native
because bil has already a certificates-and-keys recipe
---
 .../classes/coreos-efi-secureboot.bbclass                     | 2 +-
 .../recipes-bsp/u-boot/u-boot-coreos-efi.inc                  | 2 +-
 .../recipes-bsp/efibootguard/efibootguard_%.bbappend          | 2 +-
 .../cos-certificates-and-keys-native_1.0.bb}                  | 4 ++--
 .../recipes-support/swupdate/swupdate_%.bbappend              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename layers/meta-belden-coreos/recipes-security/{certificates-and-keys/certificates-and-keys-native_1.0.bb => cos-certificates-and-keys/cos-certificates-and-keys-native_1.0.bb} (95%)

diff --git a/layers/meta-belden-coreos-bsp/classes/coreos-efi-secureboot.bbclass b/layers/meta-belden-coreos-bsp/classes/coreos-efi-secureboot.bbclass
index 23718e5..f6998f1 100644
--- a/layers/meta-belden-coreos-bsp/classes/coreos-efi-secureboot.bbclass
+++ b/layers/meta-belden-coreos-bsp/classes/coreos-efi-secureboot.bbclass
@@ -16,7 +16,7 @@ HOSTTOOLS += "sbsign"
 
 # Ensure that the public keys are always deployed to the deploy directory
 # before running wic
-do_image_wic[depends] += "certificates-and-keys-native:do_deploy"
+do_image_wic[depends] += "cos-certificates-and-keys-native:do_deploy"
 
 COREOS_EFI_SECUREBOOT_INSTALL_PUBKEY_IN_EFIDIR ??= "0"
 def get_coreos_secureboot_efi_boot_files(d):
diff --git a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-coreos-efi.inc b/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-coreos-efi.inc
index dd25c8e..ea16776 100644
--- a/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-coreos-efi.inc
+++ b/layers/meta-belden-coreos-bsp/recipes-bsp/u-boot/u-boot-coreos-efi.inc
@@ -5,7 +5,7 @@ SRC_URI += " \
     file://uefi-secureboot.cfg \
 "
 
-DEPENDS:append = " ${PYTHON_PN}-pyopenssl-native u-boot-tools-native certificates-and-keys-native"
+DEPENDS:append = " ${PYTHON_PN}-pyopenssl-native u-boot-tools-native cos-certificates-and-keys-native"
 
 # Generate a ubootefi.var file inside the build directory
 #
diff --git a/layers/meta-belden-coreos/recipes-bsp/efibootguard/efibootguard_%.bbappend b/layers/meta-belden-coreos/recipes-bsp/efibootguard/efibootguard_%.bbappend
index d79a4d6..249fba3 100644
--- a/layers/meta-belden-coreos/recipes-bsp/efibootguard/efibootguard_%.bbappend
+++ b/layers/meta-belden-coreos/recipes-bsp/efibootguard/efibootguard_%.bbappend
@@ -9,7 +9,7 @@ SRC_URI += "file://0001-coreos-add-a-coreos-specific-rootfs-switch-to-the-UK.pat
 # Add signature support
 # ==============================================================================
 
-DEPENDS:append = " certificates-and-keys-native"
+DEPENDS:append = " cos-certificates-and-keys-native"
 
 inherit coreos-efi-sbsign
 require conf/image-uefi.conf
diff --git a/layers/meta-belden-coreos/recipes-security/certificates-and-keys/certificates-and-keys-native_1.0.bb b/layers/meta-belden-coreos/recipes-security/cos-certificates-and-keys/cos-certificates-and-keys-native_1.0.bb
similarity index 95%
rename from layers/meta-belden-coreos/recipes-security/certificates-and-keys/certificates-and-keys-native_1.0.bb
rename to layers/meta-belden-coreos/recipes-security/cos-certificates-and-keys/cos-certificates-and-keys-native_1.0.bb
index bded77d..a987ad2 100644
--- a/layers/meta-belden-coreos/recipes-security/certificates-and-keys/certificates-and-keys-native_1.0.bb
+++ b/layers/meta-belden-coreos/recipes-security/cos-certificates-and-keys/cos-certificates-and-keys-native_1.0.bb
@@ -1,5 +1,5 @@
-SUMMARY = "Installs certificates and keys"
-DESCRIPTION = "Installs certificates and keys that are used during the build"
+SUMMARY = "Installs CoreOS certificates and keys"
+DESCRIPTION = "Installs CoreOS certificates and keys that are used during the build"
 AUTHOR = "Patrick Vogelaar"
 LICENSE = "CLOSED"
 
diff --git a/layers/meta-belden-coreos/recipes-support/swupdate/swupdate_%.bbappend b/layers/meta-belden-coreos/recipes-support/swupdate/swupdate_%.bbappend
index 8cdd848..61d6ed5 100644
--- a/layers/meta-belden-coreos/recipes-support/swupdate/swupdate_%.bbappend
+++ b/layers/meta-belden-coreos/recipes-support/swupdate/swupdate_%.bbappend
@@ -5,7 +5,7 @@ REQUIRED_DISTRO_FEATURES = "swupdate"
 # same file in meta-swupdate
 FILESEXTRAPATHS:prepend := "${THISDIR}/swupdate:"
 
-DEPENDS += "certificates-and-keys-native"
+DEPENDS += "cos-certificates-and-keys-native"
 
 SRC_URI += "\
     file://50-webserver-config.sh \