rpms/kernel-module-thinkpad/devel kernel-module-thinkpad-README.Fedora, NONE, 1.1 kernel-module-thinkpad-percpu.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 kernel-module-thinkpad.spec, 1.6, 1.7 sources, 1.3, 1.4 kernel-module-thinkpad-kmodhelper, 1.1, NONE kernel-module-thinkpad-rpm.patch, 1.1, NONE kernel-module-thinkpad.makedev, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Apr 2 18:01:10 UTC 2005
Author: scop
Update of /cvs/extras/rpms/kernel-module-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5697
Modified Files:
.cvsignore kernel-module-thinkpad.spec sources
Added Files:
kernel-module-thinkpad-README.Fedora
kernel-module-thinkpad-percpu.patch
Removed Files:
kernel-module-thinkpad-kmodhelper
kernel-module-thinkpad-rpm.patch
kernel-module-thinkpad.makedev
Log Message:
Accumulated updates, still not quite ready yet.
--- NEW FILE kernel-module-thinkpad-README.Fedora ---
To grant logged on users needed permissions to the thinkpad device nodes,
add this to your /etc/security/console.perms:
<console> 0600 /dev/thinkpad 0600 root
kernel-module-thinkpad-percpu.patch:
--- NEW FILE kernel-module-thinkpad-percpu.patch ---
--- 2.6/drivers/thinkpadpm.c~ 2004-09-19 12:32:57.000000000 +0300
+++ 2.6/drivers/thinkpadpm.c 2005-01-08 01:18:48.000000000 +0200
@@ -169,11 +169,11 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
#define get_gdt_table() (cpu_gdt_table[get_cpu()])
-#define put_gdt_table() put_cpu()
#else
-#define get_gdt_table() (get_cpu_ptr(cpu_gdt_table))
-#define put_gdt_table() put_cpu_ptr(cpu_gdt_table)
+#include <linux/percpu.h>
+#define get_gdt_table() (per_cpu(cpu_gdt_table, get_cpu()))
#endif
+#define put_gdt_table() put_cpu()
/**
* apm_bios_call - Make an APM BIOS 32bit call
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:39:42 -0000 1.3
+++ .cvsignore 2 Apr 2005 18:01:09 -0000 1.4
@@ -1 +1 @@
-thinkpad_5.0.tar.gz
+thinkpad_5.8.tar.gz
Index: kernel-module-thinkpad.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kernel-module-thinkpad.spec 5 Mar 2005 21:10:22 -0000 1.6
+++ kernel-module-thinkpad.spec 2 Apr 2005 18:01:09 -0000 1.7
@@ -1,49 +1,29 @@
-%{!?ksrc: %define ksrcprv 0}
-%{?ksrc: %define ksrcprv 1}
-%{!?kernel: %define kernel %(uname -r)}
-%{!?ksrc: %define ksrc %(bash %{SOURCE2} srcdir -u %{kernel} -p %{_target_cpu} 2>/dev/null)}
-
-%define kmh() bash %{SOURCE2} %* -u %{kernel} -p %{_target_cpu} -s %{ksrc} 2>/dev/null
-
-%if "%{kernel}" >= "2.5"
- %define k26 1
-%else
- %define k26 0
-%endif
+%{!?kernel: %define kernel %(uname -r)}
+%define ksrc %{_usrsrc}/kernels/%{kernel}-%{_target_cpu}
Name: kernel-module-thinkpad
-Version: 5.0
+Version: 5.8
Release: 1
Summary: IBM ThinkPad support kernel modules
License: GPL
Group: System Environment/Kernel
URL: http://tpctl.sourceforge.net/
-Source0: http://download.sourceforge.net/tpctl/thinkpad_5.0.tar.gz
-Source1: %{name}.makedev
-Source2: %{name}-kmodhelper
-Patch0: %{name}-rpm.patch
+Source0: http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz
+Source1: %{name}-README.Fedora
+Patch0: %{name}-percpu.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i586 i686
-BuildRequires: bash, %{__perl}, MAKEDEV
-%if ! %{ksrcprv}
-BuildRequires: kernel-source = %(%kmh -- verrel)
-%endif
+BuildRequires: kernel-devel-%{_target_cpu} = %{kernel}
%description
IBM ThinkPad support kernel modules.
-
The following rpmbuild options can be used to build this package
for a specific kernel:
--define "kernel <uname -r>"
Specify the `uname -r` string of the target kernel, for example:
- "kernel 2.4.20-5smp". The default is `uname -r` for the running kernel.
---define "ksrc <sourcetree>"
- Specify the kernel source directory, for example:
- "ksrc /lib/modules/2.4.20-5smp/build". The default is
- resolved from <kernel>. You need to define ksrc if you
- try to build against a custom kernel.
+ "kernel 2.6.6-1.435.2.3". The default is `uname -r` for the running kernel.
--target <arch>
Build for the given architecture instead of the default.
@@ -53,85 +33,92 @@
Provides: kernel-module
Provides: %{name} = %{version}-%{release}
Obsoletes: kernel-mod-thinkpad
-Requires(pre): modutils
-%if 0%(%kmh -- rhkernel)
-Requires: /boot/vmlinuz-%{kernel}
-%endif
+Requires(pre): %{_sbindir}/groupadd
+Requires(post): /sbin/depmod
+Requires(postun): /sbin/depmod
+Requires: kernel-%{_target_cpu} = %{kernel}
%description %{kernel}
-IBM ThinkPad support kernel modules. See the end of the Installation
-section in %{_docdir}/%{name}-%{kernel}-%{version}/README
-for instructions how to enable the modules.
+IBM ThinkPad support kernel modules, built for kernel
+%{kernel} (%{_target_cpu}). See
+%{_docdir}/%{name}-%{kernel}-%{version}/README.Fedora
+for post-installation configuration instructions.
%prep
%setup -q -n thinkpad-%{version}
-%patch0 -p1
-if test "%{k26}" = "1" ; then
- # Need to copy the source tree for 2.6
- cp -pR %{ksrc} linux-%{kernel}
- cd linux-%{kernel}
- cp -p %{kcfg} .config
- # Hack to avoid building the whole kernel
- %{__perl} -pi -e 's/^modules:.*$/modules: \$(SUBDIRS)/' Makefile
- # Strip "custom" suffix from Makefile if applicable
- if ! echo %{kernel} | grep 'custom$' ; then
- %{__perl} -pi -e 's/^(\s*EXTRAVERSION.+)custom\s*$/$1/' Makefile
- fi
- cd -
-fi
+%patch0
+install -pm 644 %{SOURCE1} README.Fedora
+%{__perl} -pi -e 's|-O2\s+||' 2.6/drivers/Makefile
%build
-make %{?_smp_mflags} all \
- KVERS=%{kernel} \
-%if %{k26}
- KSRC=`pwd`/linux-%{kernel}
-%else
- KSRC=%{ksrc} \
- CC="%(%kmh -- cc)" \
- KCFLAGS="%(%kmh -- allcflags)"
-%endif
+make %{?_smp_mflags} -C 2.6/drivers KVER=%{kernel} KSRC=%{ksrc} V=1
%install
rm -rf $RPM_BUILD_ROOT
-make install_modules \
- KVERS=%{kernel} \
- DIR_MOD=$RPM_BUILD_ROOT/lib/modules \
- DIR_MOD_VER=$RPM_BUILD_ROOT/lib/modules/%{kernel} \
- DIR_MODULES_VER=$RPM_BUILD_ROOT/lib/modules/%{kernel}
+install -dm 755 $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/thinkpad
+# 744 to allow stripping, will be reset in %%files
+install -pm 744 2.6/drivers/*.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/thinkpad
install -Dpm 644 man/thinkpad.4 $RPM_BUILD_ROOT%{_mandir}/man4/thinkpad.4
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d/thinkpad
-
-/dev/MAKEDEV -M \
- -c $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d \
- -d $RPM_BUILD_ROOT/dev thinkpad | sed "s|$RPM_BUILD_ROOT||g" > devices.list
%clean
rm -rf $RPM_BUILD_ROOT
-%pre %{kernel}
-groupadd -r thinkpad >/dev/null 2>&1 || :
-
%post %{kernel}
-depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
+/sbin/depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
%postun %{kernel}
-depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
+/sbin/depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
-%files %{kernel} -f devices.list
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING README SUPPORTED-MODELS TECHNOTES
-%config %{_sysconfdir}/makedev.d
-/lib/modules/%{kernel}/thinkpad
+%files %{kernel}
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README* SUPPORTED-MODELS TECHNOTES
+%dir /lib/modules/%{kernel}/updates
+%dir /lib/modules/%{kernel}/updates/thinkpad
+%attr(644,root,root) /lib/modules/%{kernel}/updates/thinkpad/*.ko
%{_mandir}/man4/thinkpad.4*
%changelog
+* Sat Apr 2 2005 Ville Skyttä <ville.skytta at iki.fi> - 5.8-1
+- Adjust for FC4 kernel-devel.
+- Drop console.perms munging, document it in README.Fedora instead.
+
+* Sat Jan 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:5.8-0.fdr.3
+- Patch to work with kernel 2.6.10.
+- Drop udev stuff and thinkpad group, intruduce console.perms munging.
+
+* Sun Dec 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:5.8-0.fdr.2
+- Drop support for kernels < 2.6, require udev, clean up specfile.
+- Install modules into /lib/modules/$uname/updates/thinkpad
+ (was /lib/modules/$uname/thinkpad).
+
+* Mon Nov 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:5.8-0.fdr.1
+- Update to 5.8.
+- Patch to work with kernel 2.6.9 (final).
+
+* Wed Sep 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:5.7-0.fdr.1
+- Update to 5.7.
+
+* Sat Sep 11 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:5.6-0.fdr.2
+- Reset module file modes to 644 for 2.6 kernels too.
+- Drop private copy of kmodhelper, use the one in fedora-rpmdevtools instead
+ (2.4 kernels only).
+
+* Tue Sep 7 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:5.6-0.fdr.1
+- Update to 5.6, parmdesc patch applied upstream.
+- Patch to honor kernel optflags for 2.6 kernels.
+
+* Fri Jul 30 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:5.5-0.fdr.1
+- Update to 5.5.
+- Clean up kernel >= 2.6 support.
+
* Sun Mar 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:5.0-0.fdr.4
- Fix README path in %%description (#503).
- Avoid misleading build error message when no kernel-source is installed.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:39:42 -0000 1.3
+++ sources 2 Apr 2005 18:01:09 -0000 1.4
@@ -1 +1 @@
-c49c0e78696c18ec2334e4dbc2b6f068 thinkpad_5.0.tar.gz
+288ab19587bb3a8a4d6097448059b4c6 thinkpad_5.8.tar.gz
--- kernel-module-thinkpad-kmodhelper DELETED ---
--- kernel-module-thinkpad-rpm.patch DELETED ---
--- kernel-module-thinkpad.makedev DELETED ---
More information about the fedora-extras-commits
mailing list