From b736677f3f3907be3231c85b1c94f7730bdba0cf Mon Sep 17 00:00:00 2001
From: Lans Zhang <jia.zhang@windriver.com>
Date: Tue, 4 Jul 2017 17:20:59 +0800
Subject: initrdscripts-ima: clean up code style and RDEPENDS

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
---
 .../initrdscripts/initrdscripts-ima.bb             | 43 ++++++++++------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/meta-integrity/recipes-core/initrdscripts/initrdscripts-ima.bb b/meta-integrity/recipes-core/initrdscripts/initrdscripts-ima.bb
index 3860be2..8e40392 100644
--- a/meta-integrity/recipes-core/initrdscripts/initrdscripts-ima.bb
+++ b/meta-integrity/recipes-core/initrdscripts/initrdscripts-ima.bb
@@ -1,47 +1,44 @@
 DESCRIPTION = "The initrd script for Linux Integrity Measurement Architecture (IMA)"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-S = "${WORKDIR}"
-
-ALLOW_EMPTY_${PN} = "1"
+LIC_FILES_CHKSUM = "\
+    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \
+"
 
 SRC_URI = "\
     file://init.ima \
 "
 
+S = "${WORKDIR}"
+
+ALLOW_EMPTY_${PN} = "1"
+
 do_install() {
-    if [ x"${@bb.utils.contains('DISTRO_FEATURES', 'ima', '1', '0', d)}" = x"1" ]; then
-        install -m 0500 ${WORKDIR}/init.ima ${D}
-    fi
+    install -m 0500 "${WORKDIR}/init.ima" "${D}"
 }
 
-FILES_${PN} += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'ima', '/init.ima', '', d)} \
+FILES_${PN} += "\
+    /init.ima \
 "
 
 # Install the minimal stuffs only, and don't care how the external
 # environment is configured.
+
 # @bash: sh
-# @coreutils: echo, mkdir, mknod, dirname, basename, cp, rm, sleep
-#             seq, printf, cut
+# @coreutils: echo, printf
 # @grep: grep
 # @gawk: awk
-# @kmod: modprobe, depmod
-# @net-tools: ifconfig
-# @trousers: tcsd
-# @procps: pkill
-# @util-linux: blkid, mount, umount
+# @util-linux: mount, umount
+# @ima-evm-utils: evmctl
 RDEPENDS_${PN} += "\
-    bash \
     coreutils \
     grep \
     gawk \
-    kmod \
-    net-tools \
-    procps \
-    util-linux-blkid \
     util-linux-mount \
     util-linux-umount \
+    ima-evm-utils \
+    ima-policy \
+"
+
+RRECOMMENDS_${PN} += "\
+    key-store-ima-cert \
 "
-- 
cgit v1.2.3-54-g00ecf