From 8dbce3e3a034fdcb8ba38269814c748123653df5 Mon Sep 17 00:00:00 2001
From: Lans Zhang <jia.zhang@windriver.com>
Date: Thu, 13 Jul 2017 13:09:41 +0800
Subject: efitools: code style fixup

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
---
 .../recipes-bsp/efitools/efitools-native_git.bb    |  4 ++--
 .../recipes-bsp/efitools/efitools.inc              | 25 +++++++++++-----------
 .../recipes-bsp/efitools/efitools_git.bb           | 14 ++++++------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/meta-efi-secure-boot/recipes-bsp/efitools/efitools-native_git.bb b/meta-efi-secure-boot/recipes-bsp/efitools/efitools-native_git.bb
index d7159d8..418eb77 100644
--- a/meta-efi-secure-boot/recipes-bsp/efitools/efitools-native_git.bb
+++ b/meta-efi-secure-boot/recipes-bsp/efitools/efitools-native_git.bb
@@ -1,9 +1,9 @@
 require efitools.inc
 
-inherit native
-
 DEPENDS_append = " gnu-efi-native"
 
+inherit native
+
 EXTRA_OEMAKE_append = "\
     INCDIR_PREFIX='${STAGING_DIR_NATIVE}' \
     CRTPATH_PREFIX='${STAGING_DIR_NATIVE}' \
diff --git a/meta-efi-secure-boot/recipes-bsp/efitools/efitools.inc b/meta-efi-secure-boot/recipes-bsp/efitools/efitools.inc
index c9de4db..446c713 100644
--- a/meta-efi-secure-boot/recipes-bsp/efitools/efitools.inc
+++ b/meta-efi-secure-boot/recipes-bsp/efitools/efitools.inc
@@ -10,6 +10,13 @@ in the Linux 3.8 kernel. \
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e28f66b16cb46be47b20a4cdfe6e99a1"
 
+DEPENDS_append += "\
+    help2man-native openssl-native sbsigntool-native \
+    libfile-slurp-perl-native \
+"
+
+PV = "1.7.0+git${SRCPV}"
+
 SRC_URI = "\
     git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git \
     file://Fix-for-the-cross-compilation.patch \
@@ -22,21 +29,14 @@ SRC_URI = "\
     file://Reuse-xxdi.pl.patch \
     file://Add-static-keyword-for-IsValidVariableHeader.patch \
 "
-
 SRCREV = "0649468475d20d8ca5634433c4912467cef3ce93"
-PV = "1.7.0+git${SRCPV}"
 
 PARALLEL_MAKE = ""
 
-inherit perlnative
-
-DEPENDS_append += "\
-    help2man-native openssl-native sbsigntool-native \
-    libfile-slurp-perl-native \
-"
-
 S = "${WORKDIR}/git"
 
+inherit perlnative
+
 EXTRA_OEMAKE = "\
     HELP2MAN='${STAGING_BINDIR_NATIVE}/help2man' \
     OPENSSL='${STAGING_BINDIR_NATIVE}/openssl' \
@@ -51,13 +51,14 @@ EXTRA_OEMAKE_append_x86-64 += " ARCH=x86_64"
 LDFLAGS := "${@oe_filter_out('-Wl,', '${LDFLAGS}', d)}"
 BUILD_LDFLAGS := "${@oe_filter_out('-Wl,', '${BUILD_LDFLAGS}', d)}"
 
+EFI_BOOT_PATH = "/boot/efi/EFI/BOOT"
+
 do_compile_prepend() {
     sed -i -e "1s:#!.*:#!/usr/bin/env nativeperl:" xxdi.pl 
 }
 
-EFI_BOOT_PATH = "/boot/efi/EFI/BOOT"
-FILES_${PN} += "${EFI_BOOT_PATH}"
-
 do_install() {
     oe_runmake install DESTDIR='${D}${base_prefix}'
 }
+
+FILES_${PN} += "${EFI_BOOT_PATH}"
diff --git a/meta-efi-secure-boot/recipes-bsp/efitools/efitools_git.bb b/meta-efi-secure-boot/recipes-bsp/efitools/efitools_git.bb
index ea02811..56ce41c 100644
--- a/meta-efi-secure-boot/recipes-bsp/efitools/efitools_git.bb
+++ b/meta-efi-secure-boot/recipes-bsp/efitools/efitools_git.bb
@@ -1,5 +1,8 @@
 require efitools.inc
 
+# The generated native binaries are used during native and target build
+DEPENDS += "${BPN}-native gnu-efi openssl"
+
 SRC_URI_append += "\
     file://LockDown-enable-the-enrollment-for-DBX.patch \
     file://LockDown-show-the-error-message-with-3-sec-timeout.patch \
@@ -13,13 +16,6 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 inherit user-key-store deploy
 
-# The generated native binaries are used during native and target build
-DEPENDS += "${BPN}-native gnu-efi openssl"
-
-RDEPENDS_${PN}_append += "\
-    parted mtools coreutils util-linux openssl libcrypto \
-"
-
 EXTRA_OEMAKE_append += "\
     INCDIR_PREFIX='${STAGING_DIR_TARGET}' \
     CRTPATH_PREFIX='${STAGING_DIR_TARGET}' \
@@ -82,3 +78,7 @@ do_deploy() {
     install -m 0600 ${D}${EFI_BOOT_PATH}/LockDown.efi "${DEPLOYDIR}"
 }
 addtask deploy after do_install before do_build
+
+RDEPENDS_${PN}_append += "\
+    parted mtools coreutils util-linux openssl libcrypto \
+"
-- 
cgit v1.2.3-54-g00ecf