/[smeserver]/rpms/ppp-kmod/sme7/ppp-kmod.spec

Diff of /rpms/ppp-kmod/sme7/ppp-kmod.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.21 by snetram,
Mon Apr 20 20:12:32 2009 UTC
+Revision 1.27 by slords,
Tue Jun  1 16:33:47 2010 UTC
 Line 1
- # $Id: ppp-kmod.spec,v 1.20 2009/04/13 14:43:10 snetram Exp $
+ # $Id: ppp-kmod.spec,v 1.26 2010/04/21 16:05:33 slords Exp $
+ # Define the kmod package name here.
+ %define  kmod_name ppp
- Source10: kmodtool2
- %define kmodtool bash %{SOURCE10}
- %{!?kversion: %define kversion 2.6.9-78.0.17.EL}
  # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
  # --define "kversion 2.6.16-1.2096_FC5"
+ %{!?kversion: %define kversion 2.6.9-89.0.20.EL}
- %define kmod_name ppp
+ Name:    %{kmod_name}-kmod
- %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
+ Version: 1.0.2
+ Release: 8%{?dist}
+ Group:   System Environment/Kernel
+ License: GPL
+ Summary: %{kmod_name} kernel modules
+ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ ExclusiveArch: i586 i686 x86_64
+ # Sources.
+ Source0:  kernel_ppp_mppe-%{version}-src.tgz
+ Source10: kmodtool-%{kmod_name}
+ # Patches.
+ Patch1: ppp-725ad2a8f1358bff885414f5e91d253c99921ddc.patch
+ Patch2: ppp-44315cc76567e2d911d56091665637e305af182d.patch
+ Patch3: ppp-kmod-1.0.2-padfix.patch
+ # Define the variants for each architecture.
  %define upvar ""
- %ifarch i586 i686 x86_64
+ %define smpvar  smp
- %define smpvar smp
- %endif
  %ifarch i686
  %define hugememvar hugemem
  %define xenvar xenU
-Line 21 
 Source10: kmodtool2
+Line 37 
 Source10: kmodtool2
  %define largesmpvar largesmp
  %define xenvar xenU
  %endif
- %{!?kvariants: %define kvariants %{?upvar} %{?smpvar} %{?hugememvar} %{?largesmpvar} %{?xenvar}}
- # hint: this can he overridden with "--define kvariant foo bar" on the rpmbuild command line, e.g.
+ # If kvariants isn't defined on the rpmbuild line, build all variants for this architecture.
- # --define 'kvariant "" smp'
+ %{!?kvariants: %define kvariants %{?upvar} %{?smpvar}  %{?xenvar} %{?hugememvar} %{?largesmpvar}}
- Name:           %{kmod_name}-kmod
+ # Magic hidden here.
- Version:        1.0.2
+ %define kmodtool sh %{SOURCE10}
- Release:        3.%(echo %{kverrel} | tr - _)
+ %{expand:%(%{kmodtool} rpmtemplate_kmp %{kmod_name} %{kversion} %{kvariants} 2>/dev/null)}
- Summary:        %{kmod_name} kernel modules
- Group:          System Environment/Kernel
- License:        GPL
- Source0:        kernel_ppp_mppe-%{version}-src.tgz
- BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- ExclusiveArch:  i586 i686 x86_64
  %description
  %{summary}.
- %{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
  %prep
  %setup -q -c
- cd kernel_ppp_mppe-%{version}
+ pushd kernel_ppp_mppe-%{version}
- ./pre_build.sh %{_usrsrc}/kernels/%{kverrel}-%{_target_cpu} . . %{kverrel}
+ ./pre_build.sh lib/modules/"%{kversion}${kvariant:+$kvariant}"/build . . %{kversion}${kvariant:+$kvariant}
+ %patch1 -p3
+ %patch2 -p3
+ %patch3
  patch -p1 < patches/linux-2.6.2-pad.patch
  patch -p1 < patches/02-ppp_generic.c.patch
  patch -p1 < patches/03-ppp_mppe_compress.c.patch
  patch -p1 < patches/04-ppp_mppe_compress.c_license.patch
- cd ..
+ popd
  for kvariant in %{kvariants} ; do
      cp -a kernel_ppp_mppe-%{version} _kmod_build_$kvariant
  done
  %build
- rm -rf $RPM_BUILD_ROOT
  for kvariant in %{kvariants} ; do
-     ks=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
+ #    ksrc=%{_usrsrc}/kernels/%{kversion}${kvariant:+-$kvariant}-%{_target_cpu}
-     make -C $ks SUBDIRS=${PWD}/_kmod_build_$kvariant modules
+ #    pushd _kmod_build_$kvariant
-     make -C $ks SUBDIRS=${PWD}/_kmod_build_$kvariant modules_install \
+ #    make -C "${ksrc}" modules M=$PWD
-         INSTALL_MOD_PATH=$RPM_BUILD_ROOT modinst_dir='$(MODLIB)/updates/'%{kmod_name}
+ #    popd
+     ksrc=/lib/modules/"%{kversion}${kvariant:+$kvariant}"/build
+     cd _kmod_build_$kvariant
+     # make TOPDIR=${ksrc} modules %{?_smp_mflags}
+     make -C "${ksrc}" SUBDIRS=${PWD} modules %{?_smp_mflags}
+     cd ..
  done
- chmod +x $RPM_BUILD_ROOT/lib/modules/*/updates/%{kmod_name}/*.ko
+ %install
+ export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
+ export INSTALL_MOD_DIR=extra/%{kmod_name}
+ for kvariant in %{kvariants} ; do
+ #    ksrc=%{_usrsrc}/kernels/%{kversion}${kvariant:+-$kvariant}-%{_target_cpu}
+ #    pushd _kmod_build_$kvariant
+ #    make -C "${ksrc}" modules_install M=$PWD
+ #    install -d ${INSTALL_MOD_PATH}/usr/lib/debug
+ #    popd
+     ksrc=/lib/modules/"%{kversion}${kvariant:+$kvariant}"/build
+     cd _kmod_build_$kvariant
+     make -C ${ksrc} SUBDIRS=`pwd` INSTALL_MOD_PATH=$RPM_BUILD_ROOT modinst_dir='$(MODLIB)/extra/'%{kmod_name} modules_install
+     # make TOPDIR=${ksrc} INSTALL_MOD_PATH=$RPM_BUILD_ROOT INSTALL_MOD_DIR=extra/%{kmod_name}/ modules_install %{?_smp_mflags}
+     cd ..
+     mkdir -p ${INSTALL_MOD_PATH}/usr/share/doc/kmod-%{kmod_name}/%{kversion}/
+     find ${INSTALL_MOD_PATH}/lib/modules/"%{kversion}${kvariant:+$kvariant}"/ -type f -name \*.ko | sed "s,${INSTALL_MOD_PATH},," \
+         > ${INSTALL_MOD_PATH}/usr/share/doc/kmod-%{kmod_name}/%{kversion}/"modules${kvariant:+-$kvariant}"
+ done
+ # Strip the module(s).
+ find ${INSTALL_MOD_PATH} -type f -name \*.ko -exec strip --strip-debug \{\} \;
+ # Override where module comes from.
+ mkdir -p ${INSTALL_MOD_PATH}/etc/depmod.d/
+ find ${INSTALL_MOD_PATH}/lib/modules/ -type f -name \*.ko -printf '%f\n' \
+     | sed 's,\.ko,,' | sort -u | xargs -ri echo "override {} * weak-updates/%{kmod_name}" \
+     >> ${INSTALL_MOD_PATH}/etc/depmod.d/%{kmod_name}.conf
  %clean
  rm -rf $RPM_BUILD_ROOT
  %changelog
+ * Tue Jun 01 2010 Shad L. Lords <slords@mail.com> 1.0.2-8.sme
+ - Make weak-updates default for pulling module [SME: 5982]
+ - Fix previous script to not error on uninstall [SME: 5448]
+ * Wed Apr 21 2010 Shad L. Lords <slords@mail.com> 1.0.2-7.sme
+ - Update scriptlets to not call rpm [SME: 5448]
+ * Tue Dec 1 2009 Shad L. Lords <slords@mail.com> 1.0.2-6.sme
+ - Update kmod to fix buffer too small errors [SME: 5628]
+ * Tue Oct 26 2009 Shad L. Lords <slords@mail.com> 1.0.2-5.sme
+ - Make preuninstall script not fail on upgrade
+ * Tue May 26 2009 Shad L. Lords <slords@mail.com> 1.0.2-4.sme
+ - Initial build of the kABI-tracking version from 1.0.4.
+ - Modified spec and kmodtool(-ppp)
+ - Note: weak-modules became available as of CentOS-4.7
+ - Strip the module(s) added
  * Thu Feb  5 2009 Shad L. Lords <slords@mail.com>
  - Fix post scripts [SME: 4864]
-Line 76 
 rm -rf $RPM_BUILD_ROOT
+Line 137 
 rm -rf $RPM_BUILD_ROOT
  * Fri Dec 01 2006 Shad L. Lords <slords@mail.com>
  - Initial package.

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1