summaryrefslogtreecommitdiffstats
path: root/meta-integrity
diff options
context:
space:
mode:
authorLans Zhang <jia.zhang@windriver.com>2017-07-04 17:19:42 +0800
committerLans Zhang <jia.zhang@windriver.com>2017-07-04 17:19:42 +0800
commit407c56068dcbb7f2c83b80fc723cf5918f5240b6 (patch)
tree598304590df637bc56b15d20c92e6266811bc8c3 /meta-integrity
parent55492bcc10d49a22a614e36eec63b77f19171231 (diff)
downloadmeta-secure-core-407c56068dcbb7f2c83b80fc723cf5918f5240b6.tar.gz
Code style fixup
Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
Diffstat (limited to 'meta-integrity')
-rw-r--r--meta-integrity/recipes-core/base-files/base-files_%.bbappend2
-rw-r--r--meta-integrity/recipes-core/util-linux/util-linux_%.bbappend9
-rw-r--r--meta-integrity/recipes-kernel/linux/linux-yocto-integrity.inc2
3 files changed, 6 insertions, 7 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 @@
1# Append iversion option for auto types 1# Append iversion option for auto types
2do_install_append() { 2do_install_append() {
3 sed -i 's/\s*auto\s*defaults/&,iversion/' ${D}${sysconfdir}/fstab 3 sed -i 's/\s*auto\s*defaults/&,iversion/' "${D}${sysconfdir}/fstab"
4} 4}
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 @@
1PACKAGES =+ "${PN}-switch_root.static"
2
3CFLAGS_remove += "-pie -fpie" 1CFLAGS_remove += "-pie -fpie"
4 2
5do_compile_append_class-target() { 3do_compile_append_class-target() {
@@ -9,8 +7,11 @@ do_compile_append_class-target() {
9} 7}
10 8
11do_install_append_class-target() { 9do_install_append_class-target() {
12 install -d ${D}${sbindir} 10 install -d "${D}${sbindir}"
13 install -m 0700 ${B}/switch_root.static ${D}${sbindir}/switch_root.static 11 install -m 0700 "${B}/switch_root.static" \
12 "${D}${sbindir}/switch_root.static"
14} 13}
15 14
15PACKAGES =+ "${PN}-switch_root.static"
16
16FILES_${PN}-switch_root.static = "${sbindir}/switch_root.static" 17FILES_${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:"
3IMA_ENABLED = "${@bb.utils.contains('DISTRO_FEATURES', 'ima', '1', '0', d)}" 3IMA_ENABLED = "${@bb.utils.contains('DISTRO_FEATURES', 'ima', '1', '0', d)}"
4 4
5DEPENDS += "${@'key-store openssl-native' if d.getVar('IMA_ENABLED', True) == '1' else ''}" 5DEPENDS += "${@'key-store openssl-native' if d.getVar('IMA_ENABLED', True) == '1' else ''}"
6# key-store-ima-cert is required in runtime but we hope it is available
7# in initramfs only. So we don't add it to RDEPENDS_${PN} here.
8 6
9SRC_URI += "\ 7SRC_URI += "\
10 ${@'file://ima.scc file://ima.cfg file://integrity.scc file://integrity.cfg' \ 8 ${@'file://ima.scc file://ima.cfg file://integrity.scc file://integrity.cfg' \