rpms/slmodem-kmod/devel slmodem-kmod-Makefile.patch, NONE, 1.1 slmodem-kmod-ungrab.patch, NONE, 1.1 slmodem-kmod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Andreas Thienemann ixs at rpmfusion.org
Thu Oct 16 21:21:33 CEST 2008


Author: ixs

Update of /cvs/nonfree/rpms/slmodem-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2969/devel

Modified Files:
	.cvsignore sources 
Added Files:
	slmodem-kmod-Makefile.patch slmodem-kmod-ungrab.patch 
	slmodem-kmod.spec 
Log Message:
Initial package import

slmodem-kmod-Makefile.patch:

--- NEW FILE slmodem-kmod-Makefile.patch ---
diff -up slmodem-2.9.11-20080817/drivers/Makefile.orig slmodem-2.9.11-20080817/drivers/Makefile
--- slmodem-2.9.11-20080817/drivers/Makefile.orig	2008-10-15 22:22:57.000000000 +0200
+++ slmodem-2.9.11-20080817/drivers/Makefile	2008-10-15 22:45:25.000000000 +0200
@@ -16,7 +16,7 @@
 #KBUILD_VERBOSE=1
 #export KBUILD_VERBOSE
 
-KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
+KERNEL_DIR:=$(KSRC)
 SUBLEVEL:=$(shell echo $(KERNEL_DIR) | cut -d. -f3 | cut -d. -f1 | cut -d-  -f1)
 # slusb support ends at 2.6.24
 AGE:=$(shell if [ "$(SUBLEVEL)" -gt 24 ] ;then echo NEW;fi)

slmodem-kmod-ungrab.patch:

--- NEW FILE slmodem-kmod-ungrab.patch ---
diff -up ungrab-winmodem-20080126/Makefile.orig ungrab-winmodem-20080126/Makefile
--- ungrab-winmodem-20080126/Makefile.orig	2008-10-15 22:11:12.000000000 +0200
+++ ungrab-winmodem-20080126/Makefile	2008-10-15 22:11:38.000000000 +0200
@@ -1,23 +1,10 @@
-
-KERNEL_VER:=$(shell uname -r)
-KERNEL_DIR:=/lib/modules/$(KERNEL_VER)/build
-INSTALL_DIR:=/lib/modules/$(KERNEL_VER)/extra
-
 obj-m := ungrab-winmodem.o
 
 
 all:
-	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd)
+	$(MAKE) modules -C $(KSRC) SUBDIRS=$(shell pwd)
 
 clean:
 	$(RM) *.o *.ko *.mod.* .*.cmd *~
 	$(RM) -r .tmp_versions
 
-install: all
-	install -D -m 644 ungrab-winmodem.ko $(INSTALL_DIR)/ungrab-winmodem.ko
-	/sbin/depmod -a
-uninstall:
-	modprobe -r ungrab-winmodem ; echo -n
-	$(RM) $(INSTALL_DIR)/ungrab-winmodem.ko
-	/sbin/depmod -a
-


--- NEW FILE slmodem-kmod.spec ---
# (un)define the next line to either build for the newest or all current kernels
%define buildforkernels newest
#define buildforkernels newest
#define buildforkernels akmod

%define   filever 2.9.11-20080817
%define   datetag 20080817
%define   ungrab_datetag 20080126


Name:           slmodem-kmod
Version:        2.9.11
Release:        25%{?dist}
Summary:        Proprietary SmartLink softmodem kernel drivers

Group:          System Environment/Kernel
License:        Distributable
# Outdated
# URL:          http://www.smlink.com/content.aspx?id=132
URL:            http://linmodems.technion.ac.il/packages/smartlink/
Source0:        http://linmodems.technion.ac.il/packages/smartlink/slmodem-%{filever}.tar.gz
Source1:        http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-%{ungrab_datetag}.tar.gz

Patch0:         slmodem-kmod-Makefile.patch
Patch10:        slmodem-kmod-ungrab.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# ppc and ppc64 disabled -- upstream package only contains 32bit-x86 blob
# Kernel module can be built for x86_64 but a 32bit userland is necessary
# This is not done though, as it is rather hackish.
ExclusiveArch:  i586 i686

# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires:  %{_bindir}/kmodtool

%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }

# kmodtool does its magic here
%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }

%description
%{summary}

%prep
# error out if there was something wrong with kmodtool
%{?kmodtool_check}

# print kmodtool output for debugging purposes:
kmodtool  --target %{_target_cpu}  --repo %{repo} --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null

%setup -q -c -T -a 0
%setup -q -D -T -a 1

# apply patches and do other stuff here
# pushd foo-%{version}
# #patch0 -p1 -b .suffix
# popd
pushd slmodem-%{filever}
%patch0 -p 1 -b .Make
popd

pushd ungrab-winmodem-%{ungrab_datetag}
%patch10 -p 1 -b .Make
popd

for kernel_version  in %{?kernel_versions} ; do
    cp -a slmodem-%{filever} _kmod_build_${kernel_version%%___*}
    cp -a ungrab-winmodem-%{ungrab_datetag} _kmod_build_${kernel_version%%___*}/ungrab-winmodem
done


%build
for kernel_version  in %{?kernel_versions} ; do
    pushd  _kmod_build_${kernel_version%%___*}/drivers
    make %{?_smp_mflags} \
        KSRC=${kernel_version##*___} \
        KVERS=${kernel_version%%___*}
    popd

    pushd _kmod_build_${kernel_version%%___*}/ungrab-winmodem
    make %{?_smp_mflags} \
        KSRC="${kernel_version##*___}" \
        KVERS=%${kernel_version%%___*}
    popd
done


%install
rm -rf %{buildroot}
for kernel_version  in %{?kernel_versions} ; do
    install -p -D -m 0755 _kmod_build_${kernel_version%%___*}/drivers/slamr.ko %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/slamr.ko
    test -f _kmod_build_${kernel_version%%___*}/drivers/slusb.ko && install -p -D -m 0755 _kmod_build_${kernel_version%%___*}/drivers/slusb.ko %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/slusb.ko
    install -p -D -m 0755 _kmod_build_${kernel_version%%___*}/ungrab-winmodem/ungrab-winmodem.ko %{buildroot}/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ungrab-winmodem.ko
done

%{?akmod_install}


%clean
rm -rf %{buildroot}


%changelog
* Thu Oct 16 2008 Andreas Thienemann <andreas at bawue.net> - 2.9.11-25
- Updated to recent upstream kernel
- Prevent build failure on kernels > 2.6.24

* Sat Jan 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-24
- rebuild for new kmodtools, akmod adjustments

* Mon Jan 21 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-23
- build akmods package

* Thu Dec 20 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-22
- rebuilt for 2.6.21-2952.fc8xen 2.6.23.9-85.fc8

* Mon Dec 03 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-21
- rebuilt for 2.6.23.8-63.fc8 2.6.21-2952.fc8xen

* Sat Nov 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-20
- rebuilt for 2.6.23.1-49.fc8

* Mon Nov 05 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-19
- rebuilt for F8 kernels

* Wed Oct 31 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-18
- rebuilt for latest kernels

* Tue Oct 30 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-17
- rebuilt for latest kernels

* Sun Oct 28 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-16
- rebuilt for latest kernels
- adjust to rpmfusion and new kmodtool

* Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-15
- rebuilt for latest kernels

* Tue Oct 23 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-14
- rebuilt for latest kernels

* Mon Oct 22 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-13
- rebuilt for latest kernels

* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-12
- rebuilt for latest kernels

* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-11
- rebuilt for latest kernels

* Fri Oct 12 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-10
- rebuilt for latest kernels

* Thu Oct 11 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-9
- rebuilt for latest kernels

* Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.9.11-8
- rebuilt for latest kernels

* Tue Oct 09 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.9.11-7
- rebuilt for latest kernels

* Sun Oct 07 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> 
- build for rawhide kernels as of today

* Wed Oct 03 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.9.11-5.20070813
- update for new kmod-helper stuff
- build for newest kernels

* Sun Sep 09 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.9.11-4.20070813
- Convert to new kmods stuff from livna for testing it
- Rebuild for F8T2 and rawhide

* Sat Sep 08 2007 Andreas Thienemann <andreas at bawue.net> - 2.9.11-3.20070813
- Updated to the newest snapshot

* Wed Feb 07 2007 Andreas Thienemann <andreas at bawue.net> - 2.9.11-2.20070204
- Updated to the newest snapshot
- Cleaned up the .spec and incorporated some changes from thl
- Used new kmodtool script as suggested by thl

* Fri Apr 28 2006 Andreas Thienemann <andreas at bawue.net> - 2.9.11-1
- Initial Package, inspired by fglrx-kmod


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Oct 2008 12:03:02 -0000	1.1
+++ .cvsignore	16 Oct 2008 19:21:33 -0000	1.2
@@ -0,0 +1,2 @@
+slmodem-2.9.11-20080817.tar.gz
+ungrab-winmodem-20080126.tar.gz


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Oct 2008 12:03:02 -0000	1.1
+++ sources	16 Oct 2008 19:21:33 -0000	1.2
@@ -0,0 +1,2 @@
+37da7d0fe98f1a51adbbc8b81b0981a4  slmodem-2.9.11-20080817.tar.gz
+25244ef3924566866f4fae2feca78218  ungrab-winmodem-20080126.tar.gz



More information about the rpmfusion-commits mailing list