diff options
author | Tom Rini <trini@konsulko.com> | 2017-11-15 22:28:01 -0500 |
---|---|---|
committer | Jia Zhang <qianyue.zj@alibaba-inc.com> | 2017-11-16 22:03:28 +0800 |
commit | 3ad05893e58cd171ee202afbacfa035726560e72 (patch) | |
tree | 857ea398c6fd93eebf8d004619066020926029eb | |
parent | d3a05a62c19faa4107f95c3b064a6dba9f407762 (diff) | |
download | meta-secure-core-3ad05893e58cd171ee202afbacfa035726560e72.tar.gz |
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 <trini@konsulko.com>
-rw-r--r-- | meta-signing-key/classes/user-key-store.bbclass | 2 | ||||
-rw-r--r-- | meta-signing-key/recipes-devtools/libsign/libsign_git.bb (renamed from meta-efi-secure-boot/recipes-devtools/libsign/libsign_git.bb) | 0 | ||||
-rw-r--r-- | meta-signing-key/recipes-devtools/sbsigntool/sbsigntool-native_git.bb (renamed from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool-native_git.bb) | 0 | ||||
-rw-r--r-- | meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/Fix-for-multi-sign.patch (renamed from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/Fix-for-multi-sign.patch) | 0 | ||||
-rw-r--r-- | meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/Fix-the-deprecated-ASN1_STRING_data-in-openssl-1.1.0.patch (renamed from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/Fix-the-deprecated-ASN1_STRING_data-in-openssl-1.1.0.patch) | 0 | ||||
-rw-r--r-- | meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/Update-OpenSSL-API-usage-to-support-OpenSSL-1.1.patch (renamed from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/Update-OpenSSL-API-usage-to-support-OpenSSL-1.1.patch) | 0 | ||||
-rw-r--r-- | meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/ccan.git.tar.bz2 (renamed from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/ccan.git.tar.bz2) | bin | 13964172 -> 13964172 bytes | |||
-rw-r--r-- | meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/disable-man-page-creation.patch (renamed from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/disable-man-page-creation.patch) | 0 | ||||
-rw-r--r-- | meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/fix-mixed-implicit-and-normal-rules.patch (renamed from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/fix-mixed-implicit-and-normal-rules.patch) | 0 | ||||
-rw-r--r-- | meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/image-fix-the-segment-fault-caused-by-the-uninitiali.patch (renamed from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/image-fix-the-segment-fault-caused-by-the-uninitiali.patch) | 0 | ||||
-rw-r--r-- | meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch (renamed from meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool/sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch) | 0 |
11 files changed, 1 insertions, 1 deletions
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 += "\ | |||
2 | sbsigntool-native \ | 2 | sbsigntool-native \ |
3 | libsign-native \ | 3 | libsign-native \ |
4 | openssl-native \ | 4 | openssl-native \ |
5 | efitools-native \ | 5 | ${@bb.utils.contains("DISTRO_FEATURES", "efi-secure-boot", "efitools-native", "", d)} \ |
6 | " | 6 | " |
7 | 7 | ||
8 | USER_KEY_SHOW_VERBOSE = "1" | 8 | 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 index 72f9d7a..72f9d7a 100644 --- a/meta-efi-secure-boot/recipes-devtools/libsign/libsign_git.bb +++ b/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 index f52b5fc..f52b5fc 100644 --- a/meta-efi-secure-boot/recipes-devtools/sbsigntool/sbsigntool-native_git.bb +++ b/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 index 873ade0..873ade0 100644 --- 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 | |||
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 index 3619945..3619945 100644 --- 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 | |||
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 index f517e47..f517e47 100644 --- 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 | |||
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 index 9a2994f..9a2994f 100644 --- 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 | |||
Binary files differ | |||
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 index 9310628..9310628 100644 --- 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 | |||
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 index 3031e4a..3031e4a 100644 --- 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 | |||
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 index 6fef038..6fef038 100644 --- 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 | |||
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 index b67f56a..b67f56a 100644 --- 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 | |||