From 407c56068dcbb7f2c83b80fc723cf5918f5240b6 Mon Sep 17 00:00:00 2001
From: Lans Zhang <jia.zhang@windriver.com>
Date: Tue, 4 Jul 2017 17:19:42 +0800
Subject: Code style fixup

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
---
 .../recipes-core/base-files/base-files_%.bbappend  |  2 +-
 .../recipes-core/util-linux/util-linux_%.bbappend  |  9 +++----
 .../recipes-kernel/linux/linux-yocto-integrity.inc |  2 --
 .../recipes-support/key-store/key-store_0.1.bb     | 28 +++++++++++-----------
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/meta-integrity/recipes-core/base-files/base-files_%.bbappend b/meta-integrity/recipes-core/base-files/base-files_%.bbappend
index 2636dad..06273e1 100644
--- a/meta-integrity/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-integrity/recipes-core/base-files/base-files_%.bbappend
@@ -1,4 +1,4 @@
 # Append iversion option for auto types
 do_install_append() {
-    sed -i 's/\s*auto\s*defaults/&,iversion/' ${D}${sysconfdir}/fstab
+    sed -i 's/\s*auto\s*defaults/&,iversion/' "${D}${sysconfdir}/fstab"
 }
diff --git a/meta-integrity/recipes-core/util-linux/util-linux_%.bbappend b/meta-integrity/recipes-core/util-linux/util-linux_%.bbappend
index 1728f2e..9634f4b 100644
--- a/meta-integrity/recipes-core/util-linux/util-linux_%.bbappend
+++ b/meta-integrity/recipes-core/util-linux/util-linux_%.bbappend
@@ -1,5 +1,3 @@
-PACKAGES =+ "${PN}-switch_root.static"
-
 CFLAGS_remove += "-pie -fpie"
 
 do_compile_append_class-target() {
@@ -9,8 +7,11 @@ do_compile_append_class-target() {
 }
 
 do_install_append_class-target() {
-    install -d ${D}${sbindir}
-    install -m 0700 ${B}/switch_root.static ${D}${sbindir}/switch_root.static
+    install -d "${D}${sbindir}"
+    install -m 0700 "${B}/switch_root.static" \
+        "${D}${sbindir}/switch_root.static"
 }
 
+PACKAGES =+ "${PN}-switch_root.static"
+
 FILES_${PN}-switch_root.static = "${sbindir}/switch_root.static"
diff --git a/meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc b/meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc
index a93f1b7..a9e5a93 100644
--- a/meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc
+++ b/meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc
@@ -3,8 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
 IMA_ENABLED = "${@bb.utils.contains('DISTRO_FEATURES', 'ima', '1', '0', d)}"
 
 DEPENDS += "${@'key-store openssl-native' if d.getVar('IMA_ENABLED', True) == '1' else ''}"
-# key-store-ima-cert is required in runtime but we hope it is available
-# in initramfs only. So we don't add it to RDEPENDS_${PN} here.
 
 SRC_URI += "\
     ${@'file://ima.scc file://ima.cfg file://integrity.scc file://integrity.cfg' \
diff --git a/meta-signing-key/recipes-support/key-store/key-store_0.1.bb b/meta-signing-key/recipes-support/key-store/key-store_0.1.bb
index 40a9a98..94ffd35 100644
--- a/meta-signing-key/recipes-support/key-store/key-store_0.1.bb
+++ b/meta-signing-key/recipes-support/key-store/key-store_0.1.bb
@@ -4,23 +4,11 @@ LIC_FILES_CHKSUM = "\
     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \
 "
 
-inherit user-key-store
-
 S = "${WORKDIR}"
 
-ALLOW_EMPTY_${PN} = "1"
-
-PACKAGES =+ "\
-    ${PN}-system-trusted-cert \
-    ${PN}-ima-cert \
-"
+inherit user-key-store
 
-# Note any private key is not available if user key signing model used.
-PACKAGES_DYNAMIC += "\
-    ${PN}-ima-privkey \
-    ${PN}-system-trusted-privkey \
-    ${PN}-rpm-pubkey \
-"
+ALLOW_EMPTY_${PN} = "1"
 
 KEY_DIR = "${sysconfdir}/keys"
 # For RPM verification
@@ -118,6 +106,18 @@ pkg_postinst_${PN}-rpm-pubkey() {
     fi
 }
 
+PACKAGES =+ "\
+    ${PN}-system-trusted-cert \
+    ${PN}-ima-cert \
+"
+
+# Note any private key is not available if user key signing model used.
+PACKAGES_DYNAMIC += "\
+    ${PN}-ima-privkey \
+    ${PN}-system-trusted-privkey \
+    ${PN}-rpm-pubkey \
+"
+
 FILES_${PN}-system-trusted-cert = "${SYSTEM_CERT}"
 CONFFILES_${PN}-system-trusted-cert = "${SYSTEM_CERT}"
 
-- 
cgit v1.2.3-54-g00ecf