11:57 p.m.
Resending as pull request at the request from Vipat Harshawardhan.
The following changes since commit 500ba9cce9a47abea207ad57fc4f0c0ea735a987:
Release 1.1 (2015-08-07 10:13:37 -0700)
are available in the git repository at:
git://github.com/mstsirkin/ikgt-usage HEAD
for you to fetch changes up to 57f4ce25accaae128c34a7baba17389f675f0954:
integrity: use standard configfs path (2015-09-24 16:55:44 +0300)
----------------------------------------------------------------
Michael S. Tsirkin (3):
integrity: fix reproducible builds
integrity: support cross-build
integrity: use standard configfs path
policy/policy.json | 2 +-
driver/main.c | 2 +-
handler/Makefile | 8 ++++----
policy/parse_policy.py | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
11:57 p.m.
New subject: [PULL 1/3] integrity: fix reproducible builds
On Fedora 22, build fails:
integrity/driver/main.c:121:68: error: macro "__DATE__" might prevent
reproducible builds [-Werror=date-time]
PRINTK_INFO("%s: Built on %s @ %s\n", __func__, __DATE__, __TIME__);
That's with:
gcc (GCC) 5.1.1 20150618 (Red Hat 5.1.1-4)
Reproducible builds are nice to have, and there's not a lot of
value in having the build date and time in the log.
Let's just drop them.
Change-Id: I4dc72b9bcd5e0f7b936e067147ffe1492a040854
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
---
driver/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/driver/main.c b/driver/main.c
index 0dce07f..1035794 100755
--- a/driver/main.c
+++ b/driver/main.c
@@ -118,7 +118,7 @@ static void uninit_shared_regions(void)
static int __init init_agent(void)
{
- PRINTK_INFO("%s: Built on %s @ %s\n", __func__, __DATE__, __TIME__);
+ PRINTK_INFO("%s\n", __func__);
if (!init_shared_regions()) {
PRINTK_ERROR("init_shared_regions failed\n");
--
MST
11:57 p.m.
New subject: [PULL 2/3] integrity: support cross-build
Allow cross-build by specifying CROSS_COMPILE
Change-Id: I7c60216a812634a184a48c969814fc9452969654
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
---
handler/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/handler/Makefile b/handler/Makefile
index 3f4dff3..101c67d 100755
--- a/handler/Makefile
+++ b/handler/Makefile
@@ -17,10 +17,6 @@ ifndef PROJS
PWD=$(shell pwd)
export PROJS=$(PWD)/../../../xmon
-export CC = gcc
-export AS = gcc
-export AR = ar
-
debug ?= 0
ifeq ($(debug), 1)
export XMON_CMPL_OPT_FLAGS = -DDEBUG
@@ -37,6 +33,10 @@ $(shell mkdir -p $(OUTDIR))
$(shell mkdir -p $(BINDIR))
endif # PROJS
+export CC = ${CROSS_COMPILE}gcc
+export AS = ${CROSS_COMPILE}gcc
+export AR = ${CROSS_COMPILE}ar
+
$(shell mkdir -p $(OUTDIR)handler)
TARGET = handler.a
--
MST
11:57 p.m.
New subject: [PULL 3/3] integrity: use standard configfs path
Modern distros all install configfs under /sys/kernel/config.
It is thus a better default.
Note: manifest readme.txt suggests /config which is neither standard nor
consistent with example usage.
Will be fixed in a separate patch.
Change-Id: Ia3fec38364cad2eb4a818bfe776ea4da737ef581
Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com>
---
policy/policy.json | 2 +-
policy/parse_policy.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/policy/policy.json b/policy/policy.json
index 28532ad..23be1ce 100755
--- a/policy/policy.json
+++ b/policy/policy.json
@@ -26,6 +26,6 @@
}
},
"log": {
- "log.txt": "/configfs/ikgt_agent/log/log.txt"
+ "log.txt": "/sys/kernel/config/ikgt_agent/log/log.txt"
}
}
diff --git a/policy/parse_policy.py b/policy/parse_policy.py
index 2a6886d..1bfd98e 100755
--- a/policy/parse_policy.py
+++ b/policy/parse_policy.py
@@ -75,7 +75,7 @@ def parse_and_remove_dir_structure(policy_data):
def parse_policy():
parser = argparse.ArgumentParser()
parser.add_argument("-f", "--policy_file", help="JSON file
defining evmm hardening policy", required=True)
- parser.add_argument("-b", "--base_dir", help="Base directory to
start from (eg. /configfs)", required=True)
+ parser.add_argument("-b", "--base_dir", help="Base directory to
start from (eg. /sys/kernel/config)", required=True)
parser.add_argument("-r", "--remove_dir",
action="store_true", help="Remove directory structure in policy
file")
args = parser.parse_args()
--
MST
2551
days inactive
2551
days old
3 comments
1 participants
participants (1)
-
Michael S. Tsirkin