From 3a3f66c300bbc20663c41f0b0ee3e9cb80d96cb4 Mon Sep 17 00:00:00 2001
From: Cristi Magherusan <majeru@atheme.org>
Date: Mon, 30 Jun 2008 10:29:16 +0300
Subject: [PATCH] some progress in KVM integration into the buildrom
 buildsystem

---
 .config                         | 3 ++-
 .config.old                     | 3 ++-
 .tmpconfig.h                    | 6 +++++-
 README                          | 1 +
 config/payloads/Config.in       | 6 ++++++
 packages/kvm-tools/kvm-tools.mk | 8 ++++----
 scripts/defconfig               | 1 +
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.config b/.config
index 15f1a0a..4c3d941 100644
--- a/.config
+++ b/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Buildrom version: 
-# Mon Jun 30 02:37:08 2008
+# Mon Jun 30 10:03:11 2008
 #
 CONFIG_HAVE_DOT_CONFIG=y
 CONFIG_ADVANCED=y
@@ -96,6 +96,7 @@ CONFIG_CMDLINE=""
 #
 # CONFIG_KBL_KEXEC_ONLY is not set
 # CONFIG_KBL is not set
+CONFIG_KVM=y
 CONFIG_LAB_PAUSE=5
 CONFIG_BUSYBOX=y
 # CONFIG_MEMTEST_SERIAL is not set
diff --git a/.config.old b/.config.old
index a10ac05..212794f 100644
--- a/.config.old
+++ b/.config.old
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Buildrom version: 
-# Sun Jun 29 23:00:47 2008
+# Mon Jun 30 09:52:15 2008
 #
 CONFIG_HAVE_DOT_CONFIG=y
 CONFIG_ADVANCED=y
@@ -96,6 +96,7 @@ CONFIG_CMDLINE=""
 #
 # CONFIG_KBL_KEXEC_ONLY is not set
 # CONFIG_KBL is not set
+# CONFIG_KVM is not set
 CONFIG_LAB_PAUSE=5
 CONFIG_BUSYBOX=y
 # CONFIG_MEMTEST_SERIAL is not set
diff --git a/.tmpconfig.h b/.tmpconfig.h
index 5db3326..3040920 100644
--- a/.tmpconfig.h
+++ b/.tmpconfig.h
@@ -2,7 +2,7 @@
  * Automatically generated C config: don't edit
  * Buildrom version: 
  */
-#define AUTOCONF_TIMESTAMP "2008-06-30 02:37:08 EEST"
+#define AUTOCONF_TIMESTAMP "2008-06-30 10:03:11 EEST"
 
 #define CONFIG_HAVE_DOT_CONFIG 1
 #define ENABLE_HAVE_DOT_CONFIG 1
@@ -316,6 +316,10 @@
 #define ENABLE_KBL 0
 #define USE_KBL(...)
 #define SKIP_KBL(...) __VA_ARGS__
+#define CONFIG_KVM 1
+#define ENABLE_KVM 1
+#define USE_KVM(...) __VA_ARGS__
+#define SKIP_KVM(...)
 #define CONFIG_LAB_PAUSE 5
 #define ENABLE_LAB_PAUSE 1
 #define USE_LAB_PAUSE(...) __VA_ARGS__
diff --git a/README b/README
index c9ab8e0..69532d5 100644
--- a/README
+++ b/README
@@ -47,6 +47,7 @@ Kernel:
 LaB:
   CONFIG_KBL_KEXEC_ONLY - Build only the Kexec part of the KBL
   CONFIG_KBL - Build Marcelo Toscatti's kernel boot loader
+  CONFIG_KVM - Build the KVM tools
   CONFIG_BUSYBOX - Build busybox
 
 memtest:
diff --git a/config/payloads/Config.in b/config/payloads/Config.in
index 5ebfd1e..9f110a4 100644
--- a/config/payloads/Config.in
+++ b/config/payloads/Config.in
@@ -123,6 +123,12 @@ config KBL
 	  Say 'Y' here to include the the Kexec Bootloader as a cheep
 	  substitute for kexec-tools
 
+config KVM
+        bool "Include the KVM tools"
+        default n
+        help
+          Say 'Y' here to include the KVM tools
+
 config LAB_PAUSE
 	int "Seconds to pause before booting, to allow access to the busybox environment"
 	default 5
diff --git a/packages/kvm-tools/kvm-tools.mk b/packages/kvm-tools/kvm-tools.mk
index cf306fc..984b522 100644
--- a/packages/kvm-tools/kvm-tools.mk
+++ b/packages/kvm-tools/kvm-tools.mk
@@ -20,10 +20,10 @@ $(KVM_STAMP_DIR)/.configured: $(KVM_STAMP_DIR)/.unpacked
 #	--disable-vnc-tls\
 #	--disable-gfx-check)
 
-#$(KVM_SRC_DIR)/kvm-tools: $(KVM_STAMP_DIR)/.configured
-#	$(MAKE) -C $(KVM_SRC_DIR) \
-#	CFLAGS=$(CFLAGS) \
-#	LDFLAGS="$(LDFLAGS) -L$(STAGING_DIR)/lib --rpath-link,$(STAGING_DIR)/lib "
+$(KVM_SRC_DIR)/kvm-tools: $(KVM_STAMP_DIR)/.configured
+	$(MAKE) -C $(KVM_SRC_DIR) \
+	CFLAGS=$(CFLAGS) \
+	LDFLAGS="$(LDFLAGS) -L$(STAGING_DIR)/lib --rpath-link,$(STAGING_DIR)/lib "
 
 $(INITRD_DIR)/sbin/kvm-tools: $(KVM_SRC_DIR)/kvm
 	install -d $(INITRD)/sbin
diff --git a/scripts/defconfig b/scripts/defconfig
index 2ebce05..f8da125 100644
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -35,6 +35,7 @@ CONFIG_PAYLOAD_LAB=y
 #
 CONFIG_KBL_KEXEC_ONLY=y
 CONFIG_KBL=y
+CONFIG_KVM=y
 CONFIG_BUSYBOX=y
 CONFIG_BOOTMENU=y
 # CONFIG_OLPCFLASH is not set
-- 
2.11.4.GIT