From 6d7f0155e33eace9a835361e625de37d256b5f97 Mon Sep 17 00:00:00 2001 From: Lans Zhang Date: Thu, 13 Jul 2017 10:27:45 +0800 Subject: seloader, libsign, cryptfs-tpm2: code style fixup Signed-off-by: Lans Zhang --- .../recipes-bsp/seloader/seloader_git.bb | 29 ++++++++++++---------- .../recipes-devtools/libsign/libsign_git.bb | 17 ++++++++----- .../recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb | 2 +- 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 \ interface to allow the bootloader to verify the file, file buffer or \ memory buffer without knowing the file format. \ " +AUTHOR = "Jia Zhang" HOMEPAGE = "https://github.com/jiazhang0/SELoader.git" SECTION = "bootloaders" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9bf404642f21afb4ad89f95d7bc91ee" -PR = "r0" + +DEPENDS += "\ + gnu-efi sbsigntool-native \ +" + +PV = "0.4.5+git${SRCPV}" + SRC_URI = "\ git://github.com/jiazhang0/SELoader.git \ " -SRCREV = "e6c6cbe6405f01d58f9e9cbb0115a12ae49454a0" -PV = "0.4.5+git${SRCPV}" +SRCREV = "ec08c7f2325c80e87a120e81c133ff88488715d1" + +S = "${WORKDIR}/git" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' +PARALLEL_MAKE = "" inherit deploy user-key-store -S = "${WORKDIR}/git" -DEPENDS += "\ - gnu-efi sbsigntool-native \ -" - -EFI_ARCH_x86 = "ia32" -EFI_ARCH_x86-64 = "x64" - EXTRA_OEMAKE = "\ CROSS_COMPILE="${TARGET_PREFIX}" \ SBSIGN=${STAGING_BINDIR_NATIVE}/sbsign \ @@ -44,10 +45,10 @@ EXTRA_OEMAKE = "\ LIB_GCC="`${CC} -print-libgcc-file-name`" \ " -PARALLEL_MAKE = "" +EFI_ARCH_x86 = "ia32" +EFI_ARCH_x86-64 = "x64" EFI_TARGET = "/boot/efi/EFI/BOOT" -FILES_${PN} += "${EFI_TARGET}" python do_sign() { sb_sign(d.expand('${B}/Src/Efi/SELoader.efi'), \ @@ -96,3 +97,5 @@ do_deploy() { "${DEPLOYDIR}/Pkcs7VerifyDxe.efi" } addtask deploy after do_install before do_build + +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 \ layout of a signature format, and signlet only cares how to construct the \ signing request. \ " +AUTHOR = "Jia Zhang" +HOMEPAGE = "https://github.com/jiazhang0/libsign.git" SECTION = "devel" + LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=d9bf404642f21afb4ad89f95d7bc91ee" +DEPENDS += "openssl" + +PV = "0.3.2+git${SRCPV}" + SRC_URI = " \ git://github.com/jiazhang0/libsign.git \ " -SRCREV = "dfab84b4235a36bb395bc6663e50578bb2f9edca" -PV = "0.3.2+git${SRCPV}" - -DEPENDS += "openssl" -RDEPENDS_${PN}_class-target += "libcrypto" -RDEPENDS_${PN}_class-native += "openssl" +SRCREV = "0e8005f1c546ef25d834084f5cd85d386cf7cd1d" PARALLEL_MAKE = "" @@ -45,4 +47,7 @@ FILES_${PN} += " \ ${libdir}/signaturelet \ " +RDEPENDS_${PN}_class-target += "libcrypto" +RDEPENDS_${PN}_class-native += "openssl" + 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}" SRC_URI = "\ git://github.com/WindRiver-OpenSourceLabs/cryptfs-tpm2.git \ " -SRCREV = "4f6a7a34cb7b0c0afd6c5f96c3de5b677a256cc5" +SRCREV = "bbe22db48c06eafc60e950535f9aed7a90eb1ade" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf