packages: prl-tools/prl-tools.spec - fix prl_fs module name, install modpro...

glen glen at pld-linux.org
Thu Apr 19 19:05:00 CEST 2012


Author: glen                         Date: Thu Apr 19 17:05:00 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix prl_fs module name, install modprobe blacklist file

---- Files affected:
packages/prl-tools:
   prl-tools.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/prl-tools/prl-tools.spec
diff -u packages/prl-tools/prl-tools.spec:1.2 packages/prl-tools/prl-tools.spec:1.3
--- packages/prl-tools/prl-tools.spec:1.2	Thu Apr 19 18:53:00 2012
+++ packages/prl-tools/prl-tools.spec	Thu Apr 19 19:04:54 2012
@@ -71,6 +71,8 @@
 	isoinfo -R -i $image_file -x $file > .$file
 done
 
+cat version
+
 %{__tar} -xzf kmods/prl_mod.tar* -C kmods
 
 cat << 'EOF' > kmods/prl_eth/pvmnet/Makefile
@@ -87,8 +89,8 @@
 EOF
 
 cat << EOF > kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/Makefile
-obj-m := prl_tg.o
-prl_tg-objs := super.o inode.o file.o interface.o
+obj-m := prl_fs.o
+prl_fs-objs := super.o inode.o file.o interface.o
 
 EXTRA_CFLAGS += -I$(pwd)/kmods/prl_fs
 EXTRA_CFLAGS += -DPRLFS_IGET
@@ -96,10 +98,10 @@
 
 %build
 %if %{with kernel}
-%build_kernel_modules -C kmods/prl_eth/pvmnet -m prl_eth
-%build_kernel_modules -C kmods/prl_tg/Toolgate/Guest/Linux/prl_tg -m prl_tg
-%build_kernel_modules -C kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs -m prl_tg
-%build_kernel_modules -C kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze -m prl_fs_freeze
+%build_kernel_modules -m prl_eth -C kmods/prl_eth/pvmnet
+%build_kernel_modules -m prl_tg -C kmods/prl_tg/Toolgate/Guest/Linux/prl_tg
+%build_kernel_modules -m prl_fs -C kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs
+%build_kernel_modules -m prl_fs_freeze -C kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze
 %endif
 
 %if %{with userspace}
@@ -111,9 +113,11 @@
 %if %{with kernel}
 %install_kernel_modules -d misc -m kmods/prl_eth/pvmnet/prl_eth
 %install_kernel_modules -d misc -m kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg
-# same module name, try renaming
-%install_kernel_modules -d misc -m kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_tg -s prl_fs
+%install_kernel_modules -d misc -m kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_fs
 %install_kernel_modules -d misc -m kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze
+
+install -d $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}
+cp -p installer/blacklist-parallels.conf $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}
 %endif
 
 %if %{with userspace}
@@ -133,10 +137,11 @@
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-misc-prl
 %defattr(644,root,root,755)
+/etc/modprobe.d/%{_kernel_ver}/blacklist-parallels.conf
 /lib/modules/%{_kernel_ver}/misc/prl_eth.ko*
+/lib/modules/%{_kernel_ver}/misc/prl_fs.ko*
 /lib/modules/%{_kernel_ver}/misc/prl_fs_freeze.ko*
 /lib/modules/%{_kernel_ver}/misc/prl_tg.ko*
-/lib/modules/%{_kernel_ver}/misc/prl_tg-prl_fs.ko*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -145,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/04/19 17:04:54  glen
+- fix prl_fs module name, install modprobe blacklist file
+
 Revision 1.2  2012/04/19 16:53:00  glen
 - builds with 2.6.16 as well
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/prl-tools/prl-tools.spec?r1=1.2&r2=1.3



More information about the pld-cvs-commit mailing list