From: Daniel Stodden <daniel.stodden@citrix.com>
Date: Wed, 13 Jul 2011 21:17:45 +0000 (-0700)
Subject: EA-1001: Break remaining XCP kernel build dependency.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=HEAD;p=people%2Fdstodden%2Fblktap.git

EA-1001: Break remaining XCP kernel build dependency.

Partial revert of 569:9f795e737459 (EA-1001: Build VBD ring macros
from kernel, not xen headers). Dropping KBUILD dependencies after
resorting to a private copy of the linux headers.

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>
---

diff --git a/drivers/Makefile b/drivers/Makefile
index dd9d8d0..aab511b 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -10,7 +10,7 @@ INST_DIR   = /usr/sbin
 CFLAGS    += -Werror -g
 CFLAGS    += -Wno-unused
 CFLAGS    += -fno-strict-aliasing
-CFLAGS    += -I../include -I$(KBUILD)/include
+CFLAGS    += -I../include
 CFLAGS    += -D_GNU_SOURCE
 CFLAGS    += -DUSE_NFS_LOCKS
 CFLAGS    += -DTAPDISK
diff --git a/mk/Makefile b/mk/Makefile
index 4eec6ed..b9f7023 100644
--- a/mk/Makefile
+++ b/mk/Makefile
@@ -2,7 +2,6 @@ USE_BRANDING := yes
 IMPORT_BRANDING := yes
 include $(B_BASE)/common.mk
 include $(B_BASE)/rpmbuild.mk
-include $(PROJECT_OUTPUTDIR)/kernel-dom0/kernel.inc
 
 REPO_NAME= blktap
 REPO=$(call hg_loc,blktap)
@@ -58,7 +57,6 @@ $(RPM_SPECSDIR)/blktap.spec: blktap.spec.in $(RPM_SPECSDIR)/.dirstamp
 	sed -e s\,@REPO_VERSION@,$(REPO_VERSION),g \
 	    -e s\,@BLKTAP_VERSION@,$(BLKTAP_VERSION),g\
 	    -e s\,@BLKTAP_RELEASE@,$(BLKTAP_RELEASE),g\
-	    -e s\,@KERNEL_VERSION@,$(KERNEL_VERSION),g\
 	    -e \\,%changelog,rchangelog.tmp        \
 	    < blktap.spec.in                       \
 	    > $(RPM_SPECSDIR)/blktap.spec
diff --git a/mk/blktap.spec.in b/mk/blktap.spec.in
index 5834919..b8f81df 100644
--- a/mk/blktap.spec.in
+++ b/mk/blktap.spec.in
@@ -1,7 +1,3 @@
-%{!?kernel_version: %define kernel_version @KERNEL_VERSION@}
-
-%define uname %{kernel_version}%{?flavour}
-
 Summary: blktap user space utilities
 Name: blktap
 Version: @BLKTAP_VERSION@
@@ -13,7 +9,7 @@ Source0: %{name}-%{version}.tar.bz2
 Patch1: %{name}-udev-ignore-tapdevs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Obsoletes: xen-blktap
-BuildRequires: e2fsprogs-devel, kernel-xen-devel, libaio-devel
+BuildRequires: e2fsprogs-devel, libaio-devel
 %description
 This package contains the blktap userspace utilities
 
@@ -31,7 +27,7 @@ This package contains the blktap development libraries and header files.
 %patch1 -p1
 
 %build
-%{__make} KBUILD=/lib/modules/%{uname}/build
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT