From 3ad05893e58cd171ee202afbacfa035726560e72 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 15 Nov 2017 22:28:01 -0500 Subject: [PATCH] meta-signing-key, meta-efi-secure-boot: Rework for dependencies The content of meta-signing-key depends on a few recipes within meta-efi-secure-boot. However, meta-signing-key can be used without meta-efi-secure-boot if we move libsign and sbsigntool over. Doing this will also provide a more correct set of dependencies as we cannot say that both layers depend on eachother. While doing this, within meta-signing-key only depend on content from meta-efi-secure-boot if the efi-secure-boot DISTRO_FEATURE is set. Signed-off-by: Tom Rini --- meta-signing-key/classes/user-key-store.bbclass | 2 +- .../recipes-devtools/libsign/libsign_git.bb | 0 .../sbsigntool/sbsigntool-native_git.bb | 0 .../sbsigntool/sbsigntool/Fix-for-multi-sign.patch | 0 ...precated-ASN1_STRING_data-in-openssl-1.1.0.patch | 0 ...e-OpenSSL-API-usage-to-support-OpenSSL-1.1.patch | 0 .../sbsigntool/sbsigntool/ccan.git.tar.bz2 | Bin .../sbsigntool/disable-man-page-creation.patch | 0 .../fix-mixed-implicit-and-normal-rules.patch | 0 ...the-segment-fault-caused-by-the-uninitiali.patch | 0 ...-x-option-to-avoid-overwrite-existing-sign.patch | 0 11 files changed, 1 insertion(+), 1 deletion(-) rename {meta-efi-secure-boot => meta-signing-key}/recipes-devtools/libsign/libsign_git.bb (100%) rename {meta-efi-secure-boot => meta-signing-key}/recipes-devtools/sbsigntool/sbsigntool-native_git.bb (100%) rename {meta-efi-secure-boot => meta-signing-key}/recipes-devtools/sbsigntool/sbsigntool/Fix-for-multi-sign.patch (100%) rename {meta-efi-secure-boot => meta-signing-key}/recipes-devtools/sbsigntool/sbsigntool/Fix-the-deprecated-ASN1_STRING_data-in-openssl-1.1.0.patch (100%) rename {meta-efi-secure-boot => meta-signing-key}/recipes-devtools/sbsigntool/sbsigntool/Update-OpenSSL-API-usage-to-support-OpenSSL-1.1.patch (100%) rename {meta-efi-secure-boot => meta-signing-key}/recipes-devtools/sbsigntool/sbsigntool/ccan.git.tar.bz2 (100%) rename {meta-efi-secure-boot => meta-signing-key}/recipes-devtools/sbsigntool/sbsigntool/disable-man-page-creation.patch (100%) rename {meta-efi-secure-boot => meta-signing-key}/recipes-devtools/sbsigntool/sbsigntool/fix-mixed-implicit-and-normal-rules.patch (100%) rename {meta-efi-secure-boot => meta-signing-key}/recipes-devtools/sbsigntool/sbsigntool/image-fix-the-segment-fault-caused-by-the-uninitiali.patch (100%) rename {meta-efi-secure-boot => meta-signing-key}/recipes-devtools/sbsigntool/sbsigntool/sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch (100%) diff --git a/meta-signing-key/classes/user-key-store.bbclass b/meta-signing-key/classes/user-key-store.bbclass index 7e29ea0..9af758f 100644 --- a/meta-signing-key/classes/user-key-store.bbclass +++ b/meta-signing-key/classes/user-key-store.bbclass @@ -2,7 +2,7 @@ DEPENDS_append_class-target += "\ sbsigntool-native \ libsign-native \ openssl-native \ - efitools-native \ + ${@bb.utils.contains("DISTRO_FEATURES", "efi-secure-boot", "efitools-native", "", d)} \ " USER_KEY_SHOW_VERBOSE = "1" diff --git a/meta-efi-secure-boot/recipes-devtools/libsign/libsign_git.bb b/meta-signing-key/recipes-devtools/libsign/libsign_git.bb similarity index 100% rename from meta-efi-secure-boot/recipes-devtools/libsign/libsign_git.bb rename to meta-signing-key/recipes-devtools/libsign/libsign_git.bb diff --git a/meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool-native_git.bb b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool-native_git.bb similarity index 100% rename from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool-native_git.bb rename to meta-signing-key/recipes-devtools/sbsigntool/sbsigntool-native_git.bb diff --git a/meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/Fix-for-multi-sign.patch b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/Fix-for-multi-sign.patch similarity index 100% rename from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/Fix-for-multi-sign.patch rename to meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/Fix-for-multi-sign.patch diff --git a/meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/Fix-the-deprecated-ASN1_STRING_data-in-openssl-1.1.0.patch b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/Fix-the-deprecated-ASN1_STRING_data-in-openssl-1.1.0.patch similarity index 100% rename from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/Fix-the-deprecated-ASN1_STRING_data-in-openssl-1.1.0.patch rename to meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/Fix-the-deprecated-ASN1_STRING_data-in-openssl-1.1.0.patch diff --git a/meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/Update-OpenSSL-API-usage-to-support-OpenSSL-1.1.patch b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/Update-OpenSSL-API-usage-to-support-OpenSSL-1.1.patch similarity index 100% rename from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/Update-OpenSSL-API-usage-to-support-OpenSSL-1.1.patch rename to meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/Update-OpenSSL-API-usage-to-support-OpenSSL-1.1.patch diff --git a/meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/ccan.git.tar.bz2 b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/ccan.git.tar.bz2 similarity index 100% rename from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/ccan.git.tar.bz2 rename to meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/ccan.git.tar.bz2 diff --git a/meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/disable-man-page-creation.patch b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/disable-man-page-creation.patch similarity index 100% rename from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/disable-man-page-creation.patch rename to meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/disable-man-page-creation.patch diff --git a/meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/fix-mixed-implicit-and-normal-rules.patch b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/fix-mixed-implicit-and-normal-rules.patch similarity index 100% rename from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/fix-mixed-implicit-and-normal-rules.patch rename to meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/fix-mixed-implicit-and-normal-rules.patch diff --git a/meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/image-fix-the-segment-fault-caused-by-the-uninitiali.patch b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/image-fix-the-segment-fault-caused-by-the-uninitiali.patch similarity index 100% rename from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/image-fix-the-segment-fault-caused-by-the-uninitiali.patch rename to meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/image-fix-the-segment-fault-caused-by-the-uninitiali.patch diff --git a/meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch similarity index 100% rename from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch rename to meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch