Skip to contentSkip to conversation

VTPM mini-os: Stubdom makefile addtions for vtpm-stubdom and vtpmmgrdom

PATCH In review Matthew Fioravante 2 participants 2 messages Mar 11, 2011 – Mar 12, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 12/12 VTPM mini-os: Stubdom makefile addtions for vtpm-stubdom and vtpmmgrdom

This final patch adds the modifications to stubdom/Makefile to build vtpm-stubdom and vtpmmgrdom

Signed off by: Matthew Fioravante <[email protected]>

stubdom/Makefile +31 -1
diff -Naur xen-unstable-trp-sdp-pristine/stubdom/Makefile xen-unstable-trp-sdp/stubdom/Makefile
@@ -74,7 +102,7 @@
 
 TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib
 
-TARGETS=ioemu c caml grub
+TARGETS=ioemu c caml grub vtpm vtpmmgr
 
 CROSS_MAKE := $(MAKE) DESTDIR=
 
@@ -306,6 +510,24 @@
 	CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(CROSS_MAKE) -C $@ LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) 
 
 ######
+# VTPM
+######
+
+.PHONY: vtpm
+vtpm: cross-polarssl cross-tpmemu cross-vtpm_manager
+	make -C $(MINI_OS) links
+	XEN_TARGET_ARCH="$(XEN_TARGET_ARCH)" CPPFLAGS="$(TARGET_CPPFLAGS) -isystem $(CURDIR)/vtpm/compat -I$(CURDIR)/tpm_emulator-$(XEN_TARGET_ARCH) -I$(CURDIR)/tpm_emulator-$(XEN_TARGET_ARCH)/build -D__linux__" CFLAGS="$(TARGET_CFLAGS)" $(CROSS_MAKE) -C $@ 
+
+######
+# VTPMMGR
+######
+
+.PHONY: vtpmmgr
+vtpmmgr: cross-libcrypto cross-vtpm_manager
+	make -C $(MINI_OS) links
+	XEN_TARGET_ARCH="$(XEN_TARGET_ARCH)" CPPFLAGS="$(TARGET_CPPFLAGS) -isystem $(CURDIR)/vtpm/compat" CFLAGS="$(TARGET_CFLAGS)" $(CROSS_MAKE) -C $@ 
+
+######
 # Grub
 ######
 
@@ -341,6 +568,14 @@
 c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c lwip-$(XEN_TARGET_ARCH) libxc c
 	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="-DCONFIG_C $(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" $(CROSS_MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS=$(CURDIR)/c/main.a
 
+.PHONY: vtpm-stubdom
+vtpm-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpm libxc vtpm
+	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="-DCONFIG_C $(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" vtpm=y $(CROSS_MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpm/vtpm.a"
+
+.PHONY: vtpmmgrdom
+vtpmmgrdom: mini-os-$(XEN_TARGET_ARCH)-vtpmmgr lwip-$(XEN_TARGET_ARCH) libxc vtpmmgr
+	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="-DCONFIG_C $(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" vtpmmgr=y $(CROSS_MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpmmgr/vtpmmgr.a" LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH)
+
 .PHONY: pv-grub
 pv-grub: mini-os-$(XEN_TARGET_ARCH)-grub libxc grub
 	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="-DCONFIG_GRUB $(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" $(CROSS_MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/grub-$(XEN_TARGET_ARCH)/main.a
@@ -379,13 +622,17 @@
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-ioemu
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-c
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-caml
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-grub
+	rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm
+	rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr
 	$(CROSS_MAKE) -C caml clean
 	$(CROSS_MAKE) -C c clean
+	$(CROSS_MAKE) -C vtpm clean
+	$(CROSS_MAKE) -C vtpmmgr clean
 	rm -fr grub-$(XEN_TARGET_ARCH)
 	rm -f $(STUBDOMPATH)
 	[ ! -d libxc-$(XEN_TARGET_ARCH) ] || $(CROSS_MAKE) -C libxc-$(XEN_TARGET_ARCH) clean
 	-[ ! -d ioemu ] || $(CROSS_MAKE) -C ioemu clean
 
 # clean the cross-compilation result
 .PHONY: crossclean

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 2 lines · Matthew Fioravante, le Fri 11 Mar 2011 18:27:40 -0500, a écrit :

This final patch adds the modifications to stubdom/Makefile to build vtpm-stubdom and vtpmmgrdom

Looks good, provided the dependencies get applied too, of course :)

Samuel