diff options
author | Lans Zhang <jia.zhang@windriver.com> | 2017-07-13 10:27:45 +0800 |
---|---|---|
committer | Lans Zhang <jia.zhang@windriver.com> | 2017-07-13 10:27:45 +0800 |
commit | 6d7f0155e33eace9a835361e625de37d256b5f97 (patch) | |
tree | 1c9e1fb77fa7371bbe1388a6e4dfe73a91bec464 | |
parent | 3af3588ab2e2cf279294d58411d2f4226814080f (diff) | |
download | meta-secure-core-6d7f0155e33eace9a835361e625de37d256b5f97.tar.gz |
seloader, libsign, cryptfs-tpm2: code style fixup
Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
3 files changed, 28 insertions, 20 deletions
diff --git a/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb b/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb index 211bc65..53b096f 100644 --- a/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb +++ b/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb | |||
@@ -13,30 +13,31 @@ The SELoader publishes MOK2 Verify Protocol which provides a flexible \ | |||
13 | interface to allow the bootloader to verify the file, file buffer or \ | 13 | interface to allow the bootloader to verify the file, file buffer or \ |
14 | memory buffer without knowing the file format. \ | 14 | memory buffer without knowing the file format. \ |
15 | " | 15 | " |
16 | AUTHOR = "Jia Zhang" | ||
16 | HOMEPAGE = "https://github.com/jiazhang0/SELoader.git" | 17 | HOMEPAGE = "https://github.com/jiazhang0/SELoader.git" |
17 | SECTION = "bootloaders" | 18 | SECTION = "bootloaders" |
18 | 19 | ||
19 | LICENSE = "BSD-3-Clause" | 20 | LICENSE = "BSD-3-Clause" |
20 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d9bf404642f21afb4ad89f95d7bc91ee" | 21 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d9bf404642f21afb4ad89f95d7bc91ee" |
21 | PR = "r0" | 22 | |
23 | DEPENDS += "\ | ||
24 | gnu-efi sbsigntool-native \ | ||
25 | " | ||
26 | |||
27 | PV = "0.4.5+git${SRCPV}" | ||
28 | |||
22 | SRC_URI = "\ | 29 | SRC_URI = "\ |
23 | git://github.com/jiazhang0/SELoader.git \ | 30 | git://github.com/jiazhang0/SELoader.git \ |
24 | " | 31 | " |
25 | SRCREV = "e6c6cbe6405f01d58f9e9cbb0115a12ae49454a0" | 32 | SRCREV = "ec08c7f2325c80e87a120e81c133ff88488715d1" |
26 | PV = "0.4.5+git${SRCPV}" | 33 | |
34 | S = "${WORKDIR}/git" | ||
27 | 35 | ||
28 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | 36 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' |
37 | PARALLEL_MAKE = "" | ||
29 | 38 | ||
30 | inherit deploy user-key-store | 39 | inherit deploy user-key-store |
31 | 40 | ||
32 | S = "${WORKDIR}/git" | ||
33 | DEPENDS += "\ | ||
34 | gnu-efi sbsigntool-native \ | ||
35 | " | ||
36 | |||
37 | EFI_ARCH_x86 = "ia32" | ||
38 | EFI_ARCH_x86-64 = "x64" | ||
39 | |||
40 | EXTRA_OEMAKE = "\ | 41 | EXTRA_OEMAKE = "\ |
41 | CROSS_COMPILE="${TARGET_PREFIX}" \ | 42 | CROSS_COMPILE="${TARGET_PREFIX}" \ |
42 | SBSIGN=${STAGING_BINDIR_NATIVE}/sbsign \ | 43 | SBSIGN=${STAGING_BINDIR_NATIVE}/sbsign \ |
@@ -44,10 +45,10 @@ EXTRA_OEMAKE = "\ | |||
44 | LIB_GCC="`${CC} -print-libgcc-file-name`" \ | 45 | LIB_GCC="`${CC} -print-libgcc-file-name`" \ |
45 | " | 46 | " |
46 | 47 | ||
47 | PARALLEL_MAKE = "" | 48 | EFI_ARCH_x86 = "ia32" |
49 | EFI_ARCH_x86-64 = "x64" | ||
48 | 50 | ||
49 | EFI_TARGET = "/boot/efi/EFI/BOOT" | 51 | EFI_TARGET = "/boot/efi/EFI/BOOT" |
50 | FILES_${PN} += "${EFI_TARGET}" | ||
51 | 52 | ||
52 | python do_sign() { | 53 | python do_sign() { |
53 | sb_sign(d.expand('${B}/Src/Efi/SELoader.efi'), \ | 54 | sb_sign(d.expand('${B}/Src/Efi/SELoader.efi'), \ |
@@ -96,3 +97,5 @@ do_deploy() { | |||
96 | "${DEPLOYDIR}/Pkcs7VerifyDxe.efi" | 97 | "${DEPLOYDIR}/Pkcs7VerifyDxe.efi" |
97 | } | 98 | } |
98 | addtask deploy after do_install before do_build | 99 | addtask deploy after do_install before do_build |
100 | |||
101 | FILES_${PN} += "${EFI_TARGET}" | ||
diff --git a/meta-efi-secure-boot/recipes-devtools/libsign/libsign_git.bb b/meta-efi-secure-boot/recipes-devtools/libsign/libsign_git.bb index 0984ec5..faa07b7 100644 --- a/meta-efi-secure-boot/recipes-devtools/libsign/libsign_git.bb +++ b/meta-efi-secure-boot/recipes-devtools/libsign/libsign_git.bb | |||
@@ -7,19 +7,21 @@ Each signaturelet only concerns about the details about how to construct the \ | |||
7 | layout of a signature format, and signlet only cares how to construct the \ | 7 | layout of a signature format, and signlet only cares how to construct the \ |
8 | signing request. \ | 8 | signing request. \ |
9 | " | 9 | " |
10 | AUTHOR = "Jia Zhang" | ||
11 | HOMEPAGE = "https://github.com/jiazhang0/libsign.git" | ||
10 | SECTION = "devel" | 12 | SECTION = "devel" |
13 | |||
11 | LICENSE = "BSD-3-Clause" | 14 | LICENSE = "BSD-3-Clause" |
12 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=d9bf404642f21afb4ad89f95d7bc91ee" | 15 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=d9bf404642f21afb4ad89f95d7bc91ee" |
13 | 16 | ||
17 | DEPENDS += "openssl" | ||
18 | |||
19 | PV = "0.3.2+git${SRCPV}" | ||
20 | |||
14 | SRC_URI = " \ | 21 | SRC_URI = " \ |
15 | git://github.com/jiazhang0/libsign.git \ | 22 | git://github.com/jiazhang0/libsign.git \ |
16 | " | 23 | " |
17 | SRCREV = "dfab84b4235a36bb395bc6663e50578bb2f9edca" | 24 | SRCREV = "0e8005f1c546ef25d834084f5cd85d386cf7cd1d" |
18 | PV = "0.3.2+git${SRCPV}" | ||
19 | |||
20 | DEPENDS += "openssl" | ||
21 | RDEPENDS_${PN}_class-target += "libcrypto" | ||
22 | RDEPENDS_${PN}_class-native += "openssl" | ||
23 | 25 | ||
24 | PARALLEL_MAKE = "" | 26 | PARALLEL_MAKE = "" |
25 | 27 | ||
@@ -45,4 +47,7 @@ FILES_${PN} += " \ | |||
45 | ${libdir}/signaturelet \ | 47 | ${libdir}/signaturelet \ |
46 | " | 48 | " |
47 | 49 | ||
50 | RDEPENDS_${PN}_class-target += "libcrypto" | ||
51 | RDEPENDS_${PN}_class-native += "openssl" | ||
52 | |||
48 | BBCLASSEXTEND = "native" | 53 | BBCLASSEXTEND = "native" |
diff --git a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb index 0f8a422..13367e0 100644 --- a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb +++ b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb | |||
@@ -19,7 +19,7 @@ PV = "0.6.0+git${SRCPV}" | |||
19 | SRC_URI = "\ | 19 | SRC_URI = "\ |
20 | git://github.com/WindRiver-OpenSourceLabs/cryptfs-tpm2.git \ | 20 | git://github.com/WindRiver-OpenSourceLabs/cryptfs-tpm2.git \ |
21 | " | 21 | " |
22 | SRCREV = "4f6a7a34cb7b0c0afd6c5f96c3de5b677a256cc5" | 22 | SRCREV = "bbe22db48c06eafc60e950535f9aed7a90eb1ade" |
23 | 23 | ||
24 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |
25 | 25 | ||