From 88a2c035c862751423d6d09907941b00d56bbb5c Mon Sep 17 00:00:00 2001
From: Tomasz Grabiec <tgrabiec@cloudius-systems.com>
Date: Fri, 17 Jan 2014 11:07:41 +0100
Subject: [PATCH] build: do not generate .d file of the uploaded manifest
Fixes #116.
Because modules add files to which cannot be handled by our build
system incremental build fails with messages like this:
make[1]: *** No rule to make target `/home/tgrabiec/src/osv \
/apps/cassandra//upstream/jna-3.`
Signed-off-by: Tomasz Grabiec <tgrabiec@cloudius-systems.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
---
build.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.mk b/build.mk
index fd3984a6b..a39e25bae 100644
--- a/build.mk
+++ b/build.mk
@@ -648,7 +648,7 @@ bare.img: scripts/mkzfs.py $(jni) bare.raw $(out)/bootfs.manifest
usr.img: bare.img $(out)/usr.manifest $(out)/cmdline
$(call quiet, cp bare.img $@)
- $(src)/scripts/upload_manifest.py -o $@ -d $@.d -m $(out)/usr.manifest \
+ $(src)/scripts/upload_manifest.py -o $@ -m $(out)/usr.manifest \
-D jdkbase=$(jdkbase) -D gccbase=$(gccbase) -D \
glibcbase=$(glibcbase) -D miscbase=$(miscbase)
$(call quiet, $(src)/scripts/imgedit.py setargs $@ $(shell cat $(out)/cmdline), IMGEDIT $@)
--
GitLab