Changeset 2376


Ignore:
Timestamp:
Feb 27, 2013, 3:29:59 AM (10 years ago)
Author:
andersk
Message:
Use DKMS for OpenAFS
Location:
trunk/server/fedora
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/Makefile

    r2371 r2376  
    178178kvariants = ''
    179179openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants $(kvariants)" --define "kernvers $(kernvers)"
    180 openafs: rpmbuild_args += $(openafs_rpmbuild_args)
     180openafs: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 1" --define "build_modules 0"
    181181openafs-kernel: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 0" --define "build_modules 1"
    182182
  • trunk/server/fedora/specs/openafs.spec.patch

    r2371 r2376  
    3434 %if 0%{?fedora} >= 15
    3535 Requires: systemd-units
    36 @@ -403,6 +410,7 @@
     36@@ -382,6 +389,7 @@
     37 %package -n dkms-%{name}
     38 Summary:        DKMS-ready kernel source for AFS distributed filesystem
     39 Group:          Development/Kernel
     40+Provides:       scripts-dkms-%{name}
     41 Provides:       openafs-kernel = %{version}
     42 %if %{fedorakmod}
     43 Provides: %{name}-kmod = %{version}
     44@@ -403,6 +411,7 @@
    3745 
    3846 %if %{build_authlibs}
     
    4250 Group: Networking/Filesystems
    4351 
    44 @@ -419,6 +427,7 @@
     52@@ -419,6 +428,7 @@
    4553 %endif
    4654 
     
    5058 Requires: openafs-authlibs = %{version}-%{release}
    5159 %endif
    52 @@ -437,6 +446,7 @@
     60@@ -437,6 +447,7 @@
    5361 libraries.
    5462 
     
    5866 Group: Development/Filesystems
    5967 Requires: openafs = %{version}-%{release}
    60 @@ -466,6 +476,7 @@
     68@@ -466,6 +477,7 @@
    6169 administrators.
    6270 
     
    6674 Group: Networking/Filesystems
    6775 Provides: openafs-kernel = %{version}
    68 @@ -515,6 +526,7 @@
     76@@ -515,6 +527,7 @@
    6977 
    7078 %if %{krb5support}
     
    7482 Requires: openafs = %{version}
    7583 Group: Networking/Filesystems
    76 @@ -541,7 +553,7 @@
     84@@ -541,7 +554,7 @@
    7785 %if %{build_modules}
    7886 
     
    8391 %else
    8492 
    85 @@ -698,6 +710,11 @@
     93@@ -698,6 +711,11 @@
    8694 #%setup -q -n %{srcdir}
    8795 %setup -q -b 1 -n %{srcdir}
     
    95103 #
    96104 # building
    97 @@ -869,6 +886,8 @@
     105@@ -869,6 +887,8 @@
    98106 %endif
    99107 %endif
     
    104112        --prefix=%{_prefix} \
    105113        --libdir=%{_libdir} \
    106 @@ -1278,6 +1297,13 @@
     114@@ -1257,6 +1277,13 @@
    107115 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
    108116 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
  • trunk/server/fedora/specs/scripts-base.spec

    r2363 r2376  
    1212Requires: accountadm
    1313Requires: execsys
    14 Requires: scripts-kmod-openafs
     14Requires: scripts-dkms-openafs
    1515Requires: %{all_archs scripts-krb5-libs}
    1616Requires: scripts-httpd
Note: See TracChangeset for help on using the changeset viewer.