[packages/vpb-driver] - fix build without userspace

baggins baggins at pld-linux.org
Tue Feb 5 14:54:48 CET 2013


commit 9a1e97002f0a6d9b349c6cce11804dd59e53397f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Feb 5 14:54:38 2013 +0100

    - fix build without userspace

 vpb-driver.spec | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/vpb-driver.spec b/vpb-driver.spec
index 260434b..fe048b1 100644
--- a/vpb-driver.spec
+++ b/vpb-driver.spec
@@ -131,18 +131,34 @@ cd ..
 %configure \
 	%{?with_pri:--with-pri} \
 	--enable-shared
+
+%if %{without userspace}
+%{__make} -C src \
+	%{?with_kernel:KSRC=%{_kernelsrcdir}} \
+	VPATH=%{_libdir}
+%else
 %{__make} \
 	%{?with_kernel:KSRC=%{_kernelsrcdir}} \
 	VPATH=%{_libdir}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%if %{without userspace}
+%{__make} -C src install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	%{?with_kernel:KSRC=%{_kernelsrcdir}}
+
+install -d $RPM_BUILD_ROOT/etc/modprobe.d
+install src/libvpb/blunt-axe.conf $RPM_BUILD_ROOT/etc/modprobe.d
+
+%else
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	%{?with_kernel:KSRC=%{_kernelsrcdir}}
 
-%if %{with userspace}
 # let rpm generate dependencies
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib*.so*
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vpb-driver.git/commitdiff/9a1e97002f0a6d9b349c6cce11804dd59e53397f



More information about the pld-cvs-commit mailing list