EA-1001: Rework such that rpmbuild of the source rpm works without defining 'kernel_v...

diff --git a/mk/Makefile b/mk/Makefile
index 8427bf7e35e44c603c270af0d56c1154bfa9285b..4eec6ed09556cd15904fba3285cea6039f9254f2 100644 (file)
--- a/mk/Makefile
+++ b/mk/Makefile
@@ -58,6 +58,7 @@ $(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
@@ -65,8 +66,7 @@ $(RPM_SPECSDIR)/blktap.spec: blktap.spec.in $(RPM_SPECSDIR)/.dirstamp
 
 $(RPM_BUILD_COOKIE): $(RPM_DIRECTORIES) $(SOURCES)
        $(RPMBUILD) --target $(DOMAIN0_ARCH_OPTIMIZED) \
-                   -ba $(RPM_SPECSDIR)/blktap.spec    \
-                   --define "kernel_version $(KERNEL_VERSION)"
+                   -ba $(RPM_SPECSDIR)/blktap.spec 
        @touch $@
 
 $(MY_SOURCES)/MANIFEST: $(MY_SOURCES_DIRSTAMP)

diff --git a/mk/blktap.spec.in b/mk/blktap.spec.in
index e6ab0f65c5e0b58427ccb6b9c9746710b731869a..a46062fa17459bac24b4e5bbe14fa8dd79df43a7 100644 (file)
--- a/mk/blktap.spec.in
+++ b/mk/blktap.spec.in
@@ -1,3 +1,5 @@
+%{!?kernel_version: %define kernel_version @KERNEL_VERSION@}
+
 %define uname %{kernel_version}%{?flavour}
 
 Summary: blktap user space utilities
@@ -11,7 +13,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
+BuildRequires: e2fsprogs-devel, kernel-xen-devel, libaio-devel
 %description
 This package contains the blktap userspace utilities