Changeset 2376

Timestamp:

Feb 27, 2013, 3:29:59 AM (11 years ago)

Author:

andersk

Message:

Use DKMS for OpenAFS

Location:

trunk/server/fedora

Files:

• Makefile (modified) (1 diff)
• specs/openafs.spec.patch (modified) (9 diffs)
• specs/scripts-base.spec (modified) (1 diff)

trunk/server/fedora/Makefile

@@ -178 +178 @@
 kvariants = ''
 openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants $(kvariants)" --define "kernvers $(kernvers)"
-openafs: rpmbuild_args += $(openafs_rpmbuild_args)
+openafs: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 1" --define "build_modules 0"
 openafs-kernel: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 0" --define "build_modules 1"
 

trunk/server/fedora/specs/openafs.spec.patch

@@ -34 +34 @@
  %if 0%{?fedora} >= 15
  Requires: systemd-units
-@@ -403,6 +410,7 @@
+@@ -382,6 +389,7 @@
+ %package -n dkms-%{name}
+ Summary:        DKMS-ready kernel source for AFS distributed filesystem
+ Group:          Development/Kernel
++Provides:       scripts-dkms-%{name}
+ Provides:       openafs-kernel = %{version}
+ %if %{fedorakmod}
+ Provides: %{name}-kmod = %{version}
+@@ -403,6 +411,7 @@
  
  %if %{build_authlibs}
@@ -42 +50 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +427,7 @@
+@@ -419,6 +428,7 @@
  %endif
  
@@ -50 +58 @@
  Requires: openafs-authlibs = %{version}-%{release}
  %endif
-@@ -437,6 +446,7 @@
+@@ -437,6 +447,7 @@
  libraries.
  
@@ -58 +66 @@
  Group: Development/Filesystems
  Requires: openafs = %{version}-%{release}
-@@ -466,6 +476,7 @@
+@@ -466,6 +477,7 @@
  administrators.
  
@@ -66 +74 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{version}
-@@ -515,6 +526,7 @@
+@@ -515,6 +527,7 @@
  
  %if %{krb5support}
@@ -74 +82 @@
  Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -541,7 +553,7 @@
+@@ -541,7 +554,7 @@
  %if %{build_modules}
  
@@ -83 +91 @@
  %else
  
-@@ -698,6 +710,11 @@
+@@ -698,6 +711,11 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -95 +103 @@
  #
  # building
-@@ -869,6 +886,8 @@
+@@ -869,6 +887,8 @@
  %endif
  %endif
@@ -104 +112 @@
         --prefix=%{_prefix} \
         --libdir=%{_libdir} \
-@@ -1278,6 +1297,13 @@
+@@ -1257,6 +1277,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*

trunk/server/fedora/specs/scripts-base.spec

@@ -12 +12 @@
 Requires: accountadm
 Requires: execsys
-Requires: scripts-kmod-openafs
+Requires: scripts-dkms-openafs
 Requires: %{all_archs scripts-krb5-libs}
 Requires: scripts-httpd