Author: rathann Update of /cvs/free/rpms/omnibook-kmod/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv24646/F-12 Modified Files: .cvsignore sources Added Files: omnibook-kmod-a300d.patch omnibook-kmod-warnings.patch omnibook-kmod.spec Log Message: - initial import into release branches omnibook-kmod-a300d.patch: acpi.c | 1 + laptop.h | 9 +++++++++ 2 files changed, 10 insertions(+) --- NEW FILE omnibook-kmod-a300d.patch --- diff -up _kmod_build_2.6.30.5-43.fc11.x86_64/acpi.c.a300d _kmod_build_2.6.30.5-43.fc11.x86_64/acpi.c --- _kmod_build_2.6.30.5-43.fc11.x86_64/acpi.c.a300d 2009-07-14 09:52:28.000000000 +0200 +++ _kmod_build_2.6.30.5-43.fc11.x86_64/acpi.c 2009-09-17 19:27:31.000000000 +0200 @@ -66,6 +66,7 @@ static char ec_dev_list[][20] = { "\\_SB.PCI0.LPCB.EC0", "\\_SB.PCI0.LPC0.EC0", + "\\_SB_.PCI0.LPC_.EC0", }; /* TSX205 HCI and display handles */ diff -up _kmod_build_2.6.30.5-43.fc11.x86_64/laptop.h.a300d _kmod_build_2.6.30.5-43.fc11.x86_64/laptop.h --- _kmod_build_2.6.30.5-43.fc11.x86_64/laptop.h.a300d 2009-03-09 18:17:06.000000000 +0100 +++ _kmod_build_2.6.30.5-43.fc11.x86_64/laptop.h 2009-09-17 19:27:01.000000000 +0200 @@ -637,6 +637,15 @@ static struct dmi_system_id omnibook_id }, { .callback = dmi_matched, + .ident = "Toshiba Satellite A300", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A300"), + }, + .driver_data = (void*) TSA105 + }, + { + .callback = dmi_matched, .ident = "Toshiba Satellite P100", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), omnibook-kmod-warnings.patch: acpi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- NEW FILE omnibook-kmod-warnings.patch --- diff -up omnibook-2.20090714svn288/acpi.c.warn omnibook-2.20090714svn288/acpi.c --- omnibook-2.20090714svn288/acpi.c.warn 2009-07-14 09:52:28.000000000 +0200 +++ omnibook-2.20090714svn288/acpi.c 2009-09-17 19:34:52.000000000 +0200 @@ -758,11 +758,11 @@ static int set_tsx205_wireless_status(co { int retval; int raw_state = !!(state & WIFI_STA); + u32 in[HCI_WORDS] = { HCI_SET, HCI_RF_CONTROL, raw_state, HCI_WIRELESS_POWER, 0, 0 }; + u32 out[HCI_WORDS]; dprintk("set_wireless raw_state: %x\n", raw_state); - u32 in[HCI_WORDS] = { HCI_SET, HCI_RF_CONTROL, raw_state, HCI_WIRELESS_POWER, 0, 0 }; - u32 out[HCI_WORDS]; hci_raw(in, out); raw_state |= !!(state & BT_STA) << 0x1; /* bit 1 */ @@ -1011,10 +1011,12 @@ static int omnibook_hci_set_hotkeys(cons { u32 in[HCI_WORDS] = { 0, 0, 0, 0, 0, 0 }; u32 out[HCI_WORDS]; + acpi_status status; in[0] = HCI_SET; in[1] = HCI_HOTKEY_EVENT; in[2] = (state & HKEY_FN) ? 1 : 0; - acpi_status status = hci_raw(in, out); + + status = hci_raw(in, out); dprintk("set_hotkeys (Fn interface) raw_state: %x\n", in[2]); --- NEW FILE omnibook-kmod.spec --- # (un)define the next line to either build for the newest or all current kernels #define buildforkernels newest %define buildforkernels current #define buildforkernels akmods %define svn 1 # name should have a -kmod suffix Name: omnibook-kmod Version: 2.20090714 Release: 0.2.svn288%{?dist} Summary: Kernel module for HP Omnibook/Pavillon, Toshiba Satellite and Compal laptops Group: System Environment/Kernel License: GPLv2 URL: http://sourceforge.net/projects/omnibook/ %if %{svn} # svn export -r288 https://omnibook.svn.sourceforge.net/svnroot/omnibook/omnibook/trunk omnibook-2.20090714 Source0: omnibook-%{version}.tar.xz %else Source0: http://downloads.sourceforge.net/project/omnibook/omnibook%20kernel%20mod... %endif # silence some warnings: http://sourceforge.net/tracker/?func=detail&aid=2703528&group_id=... Patch0: %{name}-warnings.patch # add support for Toshiba Satellite A300D: http://sourceforge.net/tracker/?func=detail&aid=2841062&group_id=... Patch1: %{name}-a300d.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # get the proper build-sysbuild package from the repo, which # tracks in all the kernel-devel packages 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 Linux kernel module for many HP Omnibook/Pavillon, Toshiba Satellite (with Phoenix BIOS) and Compal laptops. It is based on the module found in the 'omke' project. %prep # error out if there was something wrong with kmodtool %{?kmodtool_check} # print kmodtool output for debugging purposes: kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -q -c -T -a 0 # apply patches and do other stuff here pushd omnibook-%{version} %patch0 -p1 -b .warn %patch1 -p1 -b .a300d popd for kernel_version in %{?kernel_versions} ; do cp -a omnibook-%{version} _kmod_build_${kernel_version%%___*} done %build for kernel_version in %{?kernel_versions}; do make %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*} modules done %install for kernel_version in %{?kernel_versions}; do # doesn't work # make install -C "${kernel_version##*___}" DESTDIR=${RPM_BUILD_ROOT} KMODPATH=%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} install -D -m 755 _kmod_build_${kernel_version%%___*}/omnibook.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/omnibook.ko done %{?akmod_install} %clean rm -rf $RPM_BUILD_ROOT %changelog * Thu Jan 07 2010 Dominik Mierzejewski <rpm(a)greysector.net&gt; 2.20090714-0.2.svn288 - drop unnecessary ExclusiveArch - drop double BR: kmodtool * Wed Sep 16 2009 Dominik Mierzejewski <rpm(a)greysector.net&gt; 2.20090714-0.1.svn288 - initial build for RPM Fusion Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/omnibook-kmod/F-12/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Dec 2009 18:57:30 -0000 1.1 +++ .cvsignore 9 Jan 2010 19:52:13 -0000 1.2 @@ -0,0 +1 @@ +omnibook-2.20090714.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/omnibook-kmod/F-12/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Dec 2009 18:57:30 -0000 1.1 +++ sources 9 Jan 2010 19:52:13 -0000 1.2 @@ -0,0 +1 @@ +c5846f9eb93bca376d2887c7fffe87a3 omnibook-2.20090714.tar.xz