1:53 p.m.
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1170
Modified Files:
staging-kmod.spec
Log Message:
downgrade to the current stable version before rebuilding for new 2.6.31 based kernel
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-12/staging-kmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- staging-kmod.spec 28 Feb 2010 13:06:15 -0000 1.27
+++ staging-kmod.spec 28 Feb 2010 13:53:39 -0000 1.28
@@ -6,22 +6,18 @@
%define buildforkernels newest
# which drivers to built
-%global stgdrvs ASUS_OLED EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070
RT3090 RTL8187SE RTL8192SU RTL8192E SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
-# todo: VIDEO_CX25821
-
-# makes handling for rc kernels a whole lot easier:
-#global prever rc8
+%global stgdrvs AGNX ASUS_OLED EPL ET131X FB_UDL HECI LINE6_USB RT2860 RT2870 RT3070
RTL8187SE RTL8192SU SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655
Name: staging-kmod
-Version: 2.6.32.8
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.2
+Version: 2.6.31.5
+Release: 3%{?dist}.4
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
License: GPLv2
URL: http://www.kernel.org/
# a script to create this archive is part of staging-kmod-addons
-Source0: linux-staging-%{version}%{?prever:-%{prever}}.tar.bz2
+Source0: linux-staging-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{_bindir}/kmodtool
@@ -44,11 +40,11 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel, as those otherweise will get
build
-sed -i 's|.*at76.*||'
linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
+sed -i 's|.*at76.*||' linux-staging-%{version}/drivers/staging/Makefile
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules
for
for kernel_version in %{?kernel_versions} ; do
- cp -a linux-staging-%{version}%{?prever:-%{prever}}/
_kmod_build_${kernel_version%%___*}
+ cp -a linux-staging-%{version}/drivers/staging/ _kmod_build_${kernel_version%%___*}
done
@@ -57,17 +53,10 @@
for module in %{stgdrvs} ; do
configops="CONFIG_${module}=m"
case "${module}" in
- HYPERV)
- ( [[ "%{_target_cpu}" == "ppc" ]] || [[
"%{_target_cpu}" == "ppc64" ]] ) && continue
- configops="${configops} CONFIG_${module}_STORAGE=m CONFIG_${module}_BLOCK=m
CONFIG_${module}_NET=m"
- ;;
PRISM2_USB)
# does not build on ppc and ppc64 as of 011109; tested with 2.6.31.5
( [[ "%{_target_cpu}" == "ppc" ]] || [[
"%{_target_cpu}" == "ppc64" ]] ) && continue
;;
- RT3090)
- configops="${configops} -I ${PWD}/_kmod_build_${kernel_version%%___*}/"
- ;;
RTL8192SU)
# does not build on ppc and ppc64 as of 011109; tested with 2.6.31.5
( [[ "%{_target_cpu}" == "ppc" ]] || [[
"%{_target_cpu}" == "ppc64" ]] ) && continue
@@ -77,13 +66,10 @@
( [[ "%{_target_cpu}" == "ppc" ]] || [[
"%{_target_cpu}" == "ppc64" ]] ) && continue
;;
VIDEO_GO7007)
- configops="${configops} CONFIG_${module}_USB=m"
- ;;
- VIDEO_CX25821)
- configops="${configops} CONFIG_${module}_ALSA=m"
+ configops="CONFIG_${module}=m CONFIG_${module}_USB=m"
;;
esac
- make %{?_smp_mflags} -C "${kernel_version##*___}"
SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/ modules ${configops}
+ make %{?_smp_mflags} -C "${kernel_version##*___}"
SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/ modules ${configops}
done
done
@@ -92,7 +78,7 @@
rm -rf ${RPM_BUILD_ROOT}
for kernel_version in %{?kernel_versions}; do
mkdir -p
${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
- install -D -m 755 _kmod_build_${kernel_version%%___*}/drivers/staging/*/*.ko
${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ install -D -m 755 _kmod_build_${kernel_version%%___*}/*/*.ko
${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
done
# akmods hint:
# no akomds for now; packager is working on a solution where each driver will get its own
akmod
@@ -104,19 +90,37 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
%changelog
-* Sun Feb 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.32.8-1.2
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-3.4
+- rebuild for new kernel
+
+* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-3.3
+- rebuild for new kernel
+
+* Wed Feb 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-3.2
+- rebuild for new kernel
+
+* Tue Feb 09 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-3.1
+- fix thinko that made some modules not getting build (#1076)
+
+* Sat Jan 30 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-2.11
+- rebuild for new kernel
+
+* Wed Jan 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-2.10
+- rebuild for new kernel
+
+* Sat Dec 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-2.9
- rebuild for new kernel
-* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32.8-1
-- update to 2.6.32.8 for updates-testing kernel
-- disable hv on ppc as it's useless and does not build
-
-* Sun Dec 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.32-0.1.rc1
-- enable HYPERV, RT3090, RTL8192E, VT6656
-- drop AGNX, dropped upstream
-- point to drivers/staging/ explicitely
-- support RC's better
+* Thu Dec 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-2.8
+- rebuild for new kernel
+
+* Sun Dec 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-2.7
+- rebuild for new kernel
+
+* Wed Nov 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-2.6
+- rebuild for new kernel
* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.31.5-2.5
- rebuild for new kernel, disable i586 builds