Hello community, here is the log from the commit of package omnibook for openSUSE:Factory checked in at Wed Sep 21 17:12:59 CEST 2011.
-------- --- omnibook/omnibook.changes 2010-04-06 08:44:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/omnibook/omnibook.changes 2011-09-21 14:15:22.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 21 12:13:26 UTC 2011 - [email protected] + +- Update to new git snapshot 20110911 + * Apply patch from Ryan Martin <[email protected]> to fix + alignment issue with kernel >= 2.6.33 +- Drop backlight-2.6.34-omnibook-20090628.patch, applied upstream +- Fix compilation with kernel 3.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- backlight-2.6.34-omnibook-20090628.patch omnibook-2.20100406.tar.bz2 New: ---- omnibook-2.20110911.tar.bz2 omnibook-kernel-3.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ omnibook.spec ++++++ --- /var/tmp/diff_new_pack.YXZ0ih/_old 2011-09-21 17:12:51.000000000 +0200 +++ /var/tmp/diff_new_pack.YXZ0ih/_new 2011-09-21 17:12:51.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package omnibook (Version 20100406) +# spec file for package omnibook # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,31 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild # nodebuginfo Name: omnibook -BuildRequires: kernel-syms module-init-tools -Summary: Kernel modules for Omnibooks -Version: 20100406 +Version: 20110911 Release: 1 -Group: Hardware/Other License: GPLv2+ -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Summary: Kernel modules for Omnibooks Url: http://sourceforge.net/projects/omnibook -AutoReqProv: on +Group: Hardware/Other # Tar archive created from git://omnibook.git.sourceforge.net/gitroot/omnibook/omnibook Source: %{name}-2.%{version}.tar.bz2 Source2: preamble -Patch4: backlight-2.6.34-omnibook-20090628.patch +Patch1: omnibook-kernel-3.0.patch +BuildRequires: kernel-syms +BuildRequires: module-init-tools +BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 %suse_kernel_module_package -p %_sourcedir/preamble um %package -n omnibook-KMP -Group: Hardware/Other License: GPLv2+ Summary: Kernel modules for Omnibooks from omke-project +Group: Hardware/Other %description Linux kernel modules for several HP Omnibooks/HP Pavilion, HP/Compaq @@ -47,27 +46,17 @@ machines. This module include ac, battery, fan, lcd, ec, onetouch, temperature, touchpad and util support. - - -Authors: --------- - So�s P�ter <[email protected]> - %description -n omnibook-KMP Linux kernel modules for several HP Omnibooks/HP Pavilion, HP/Compaq nx*, Compal, Fujitsu Siemens Amilo, Acer Aspire and Toshiba Satellite machines. This module include ac, battery, fan, lcd, ec, onetouch, temperature, touchpad and util support. - - -Authors: --------- - So�s P�ter <[email protected]> - %prep -%setup -n %{name}-2.%{version} -%patch4 -p1 +%setup -q -n %{name}-2.%{version} +%if %suse_version >= 1210 +%patch1 +%endif %build cd .. @@ -82,14 +71,11 @@ %install cd .. # install kernel modules -export INSTALL_MOD_PATH=$RPM_BUILD_ROOT +export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=updates for flavor in %flavors_to_build; do make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \ M=$PWD/obj/$flavor done -%clean -rm -rf $RPM_BUILD_ROOT - %changelog ++++++ omnibook-2.20100406.tar.bz2 -> omnibook-2.20110911.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/ac.c new/omnibook-2.20110911/ac.c --- old/omnibook-2.20100406/ac.c 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/ac.c 2011-09-21 14:07:43.000000000 +0200 @@ -42,7 +42,7 @@ {0,} }; -struct omnibook_feature __declared_feature ac_driver = { +static struct omnibook_feature __declared_feature ac_driver = { .name = "ac", #ifdef CONFIG_OMNIBOOK_LEGACY .enabled = 1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/acpi.c new/omnibook-2.20110911/acpi.c --- old/omnibook-2.20100406/acpi.c 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/acpi.c 2011-09-21 14:07:43.000000000 +0200 @@ -758,11 +758,11 @@ { 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 @@ { 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]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/cooling.c new/omnibook-2.20110911/cooling.c --- old/omnibook-2.20100406/cooling.c 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/cooling.c 2011-09-21 14:07:43.000000000 +0200 @@ -80,7 +80,7 @@ {0,} }; -struct omnibook_feature __declared_feature cooling_driver = { +static struct omnibook_feature __declared_feature cooling_driver = { .name = "cooling", .enabled = 1, .read = omnibook_cooling_read, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/README.Debian new/omnibook-2.20110911/debian/README.Debian --- old/omnibook-2.20100406/debian/README.Debian 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/README.Debian 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -omnibook for Debian -------------------- - -Please see docs/README for a description of the omnibook kernel module. - -The Debian omnibook source package provides omnibook-source, package -which provides the source for the kernel module. - -The omnibook-source package can be used in several ways, - - - Using the make-kpkg(1) command provided by the kernel-package Debian - package. This will produce a corresponding omnibook-modules package for - the Debian kernel-image package that you are using. - See the "modules_image" section of the make-kpkg(1) man page. - - - Using module-assistant. Simply issue the following command (as root): - $ module-assistant auto-install omnibook - Please see the module-assistant documentation for futher details. - - - Changing to the /usr/src/modules/omnibook/ directory and building as - the README file instructs using "make; make install". This will build - and install a module specific to the system you are building on and is - not under control of the packaging system. - -If your are not using module-assisatant, you have to unpack -/usr/src/omnibook-source.tar.bz2 to /usr/src. - - -- Peter Soos <[email protected]>, Wed, 25 Jan 2006 21:06:28 +0100 - -- Julien Valroff <[email protected]> Sun, 07 Oct 2007 10:38:07 +0200 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/changelog new/omnibook-2.20110911/debian/changelog --- old/omnibook-2.20100406/debian/changelog 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/changelog 1970-01-01 01:00:00.000000000 +0100 @@ -1,191 +0,0 @@ -omnibook (2:2.20070211+svn20090714b-4) UNRELEASED; urgency=low - - * Bump Debian policy version to 3.8.4 - - -- Julien Valroff <[email protected]> Fri, 01 Jan 2010 17:59:41 +0100 - -omnibook (2:2.20070211+svn20090714b-3) unstable; urgency=low - - * Converted source package to 3.0 (quilt) format - * Added watch file - * Fixed build dependencies - * Adjusted module standards version to 3.8.3 - - -- Julien Valroff <[email protected]> Fri, 01 Jan 2010 17:51:34 +0100 - -omnibook (2:2.20070211+svn20090714b-2) unstable; urgency=low - - * Bumped Standards Version to 3.8.3 (no changes needed) - - -- Julien Valroff <[email protected]> Fri, 21 Aug 2009 14:01:34 +0200 - -omnibook (2:2.20070211+svn20090714b-1) unstable; urgency=low - - * New SVN snapshot: - + fix build issue induced by previous patches - + fix build with kernel >= 2.6.30 - - -- Julien Valroff <[email protected]> Tue, 14 Jul 2009 18:17:49 +0200 - -omnibook (2:2.20070211+svn20090714-1) unstable; urgency=low - - * New SVN snapshot: - + Applied patches from Azael Avalos <[email protected]> - to add support to Satellite X205 and other laptops based on - ICH8 - * New Standards version 3.8.2 - * Bumped DH compat to 7 - * Updated copyright information - * Now use dh_prep instead of dh_clean -k - - -- Julien Valroff <[email protected]> Tue, 14 Jul 2009 10:03:00 +0200 - -omnibook (2:2.20070211+svn20090227-1) unstable; urgency=low - - * New SVN snapshot - + Applied patch from Danny Kukawka <[email protected]> to - fix compiler warning about use uninitialized variable - + Applied patch from Danny Kukawka <[email protected]> to - fix build the driver on older kernel versions - - * New Standards version 3.8.0 - no further changes needed - * Updated copryight information - - -- Julien Valroff <[email protected]> Fri, 27 Feb 2009 19:57:35 +0100 - -omnibook (2:2.20070211+svn20071217-1) unstable; urgency=low - - * New SVN snapshot (r271) - * Added amd64 as a compatible architecture for the module - * New Standards version 3.7.3 - no further changes needed - - -- Julien Valroff <[email protected]> Mon, 17 Dec 2007 18:00:29 +0100 - -omnibook (2:2.20070211+svn20071006-1) unstable; urgency=low - - * New SVN snapshot (r264): - + Update for acpi and backlight API changes in linux 2.6.23 - * First upload to Debian (Closes: #445602): - + Improved debian/copyright - + Bumped debhelper compat to version 5 - + Added myself as maintainer - + Updated README.Debian - * debian/control: - + Moved Homepage to own field (from pseudo-field in long description) - + Added Vcs-* fields - - -- Julien Valroff <[email protected]> Thu, 29 Nov 2007 18:30:27 +0100 - -omnibook (2:2.20070211+svn20070905-1) unstable; urgency=low - - * Added dependency on dpatch - * [debian/rules]: - - Fixed lintian warning in the clean target - - -- Julien Valroff <[email protected]> Wed, 05 Sep 2007 20:25:13 +0200 - -omnibook (2:2.20070211+svn20070526-1) unstable; urgency=low - - * New SVN snapshot (r259): - + Fixed compilation issue with kernel 2.6.21 - + DMI signature added: - Toshiba Satellite P25 (ectype 11) - Toshiba Satellite M60 (ectype 12) - * Added patch to disable debug for SVN snasphot - - -- Julien Valroff <[email protected]> Sat, 26 May 2007 15:19:57 +0200 - -omnibook (2:2.20070211-1) unstable; urgency=low - - * New upstream release: - + For ectype 12 (Satellite M40X, M70, M100, ...): - - improved bluetooth control - - cooling method control - - CPU throttling ( ACPI T-States) - + Full hotkeys support for Tecra S1 - + Bluetooth control for Ectype 14 (Satellite A100, A105, M115, ...) - * Updated homepage in long description - - -- Julien Valroff <[email protected]> Mon, 12 Feb 2007 18:50:05 +0100 - -omnibook (2:2.20060921+svn20061202-1) unstable; urgency=low - - * New SVN snapshot (r228) - - -- Julien Valroff <[email protected]> Sat, 2 Dec 2006 10:17:07 +0100 - -omnibook (2:2.20060921+svn20061112-1) unstable; urgency=low - - * SVN snapshot: - + Disabled Acer support - + Fixed and improved bluetooth handling for TSM30X class laptop - + DMI signature added: - HP Pavilion ze4500 (ectype 7) - Toshiba Satellite 1130 (ectype 1) - Toshiba Satellite A75 (ectype 12) - Toshiba Tecra A4 (ectype 13) - + Implemented Volume down,up and Mute buttons polling for ectype 2 - + Implemented ectype 13 Fn hotkeys handling. - * changed compression of the sources in /usr/src/ to bzip2 - - -- Julien Valroff <[email protected]> Sat, 11 Nov 2006 14:08:47 +0100 - -omnibook (2:2.20060921-1) unstable; urgency=low - - * New upstream release: - + Expand display and hotkeys features - + Added support for more laptops - + Code cleanups - + Minor bug fixes - - -- Julien Valroff <[email protected]> Mon, 25 Sep 2006 08:14:59 +0200 - -omnibook (2:2.20060817-1) unstable; urgency=low - - * New upstream release - * [01_makfefile.dpatch] Removed - fixed upstream - * Changed defaut STEM value to linux (follows kernel-package) - * Uses dh_installmodules for maintainance scripts - - -- Julien Valroff <[email protected]> Mon, 11 Sep 2006 18:00:50 +0200 - -omnibook (2:2.20060809-2) unstable; urgency=low - - * Include copyright and Debian changelog in omnibook-module - * Fix Makefile issue in a more elegant way - - -- Julien Valroff <[email protected]> Thu, 10 Aug 2006 10:16:47 +0200 - -omnibook (2:2.20060809-1) unstable; urgency=low - - * New upstream release: - + Addeed autodetection of the Toshiba Satellite M40X laptop - - -- Julien Valroff <[email protected]> Thu, 10 Aug 2006 09:40:45 +0200 - -omnibook (2:2.20060806-1) unstable; urgency=low - - * New upstream branch - Mathieu Bérard launched new project - * Added myself as co-maintainer - * Bumped upstream version and use epoch to ensure upgrades - * [debian/rules]: - + Clean-ups - + Recommends linux-image or kernel-image - * [debian/control] Improved long description - * [debian/post*.modules.in] Fixed bashisms - * Added patch to fix install target in Makefile - - -- Julien Valroff <[email protected]> Thu, 10 Aug 2006 01:35:38 +0200 - -omnibook (20060126-1) unstable; urgency=low - - * Minor build inconveniences corrected. - - -- Daniel Gimpelevich <[email protected]> Sun, 18 Jun 2006 12:28:55 -0700 - -omnibook (20060126-0) unstable; urgency=low - - * Locally built. - - -- Péter Soós <[email protected]> Wed, 25 Jan 2006 21:06:28 +0100 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/compat new/omnibook-2.20110911/debian/compat --- old/omnibook-2.20100406/debian/compat 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/control new/omnibook-2.20110911/debian/control --- old/omnibook-2.20100406/debian/control 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/control 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -Source: omnibook -Section: misc -Priority: optional -Maintainer: Julien Valroff <[email protected]> -Build-Depends: debhelper (>> 7.0.0) -Build-Depends-Indep: bzip2 -Standards-Version: 3.8.4 -Homepage: http://omnibook.sf.net -Vcs-Svn: https://omnibook.svn.sourceforge.net/svnroot/omnibook/omnibook/trunk -Vcs-Browser: http://omnibook.svn.sourceforge.net/viewvc/omnibook/ - -Package: omnibook-source -Architecture: all -Depends: debhelper (>= 7.0.0), make, module-assistant, kernel-package, bzip2 -Description: Source for the omnibook driver - This package contains the loadable kernel modules for the HP OmniBooks, - Pavilions, Toshiba Satellites and some other laptops manufactured by - Compal Electronics, Inc as ODM. - . - This module is only compatible with Linux kernels >= 2.6.9 - . - Kernel source is required to compile this module. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/control.modules.in new/omnibook-2.20110911/debian/control.modules.in --- old/omnibook-2.20100406/debian/control.modules.in 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/control.modules.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -Source: omnibook -Section: misc -Priority: optional -Maintainer: Julien Valroff <[email protected]> -Build-Depends: debhelper (>> 7.0.0) -Standards-Version: 3.8.4 - -Package: omnibook-module-_KVERS_ -Architecture: i386 amd64 -Recommends: _STEM_-image-_KVERS_ -Provides: omnibook-module -Description: omnibook module for Linux (kernel _KVERS_) - This package contains the loadable kernel modules for the HP OmniBooks, - Pavilions, Toshiba Satellites and some other laptops manufactured by - Compal Electronics, Inc as ODM. - . - This package contains the compiled kernel modules for _KVERS_ - . - If you have compiled your own kernel, you will most likely need to build - your own omnibook-module. The omnibook-source package has been - provided for use with the Debian kernel-package utility to produce a version - of omnibook-module for your kernel. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/copyright new/omnibook-2.20110911/debian/copyright --- old/omnibook-2.20100406/debian/copyright 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/copyright 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -This package was debianized by Peter Soos <[email protected]> on -Wed, 25 Jan 2006 21:06:28 +0100. -Debian package was improved by Julien Valroff <[email protected]> - -It was downloaded from http://sourceforge.net/projects/omnibook - -Copyright Holder: 2006-2007 Mathieu Bérard <[email protected]> - -dump.c: - Copyright (C) 2004-2005 Borislav Deianov <[email protected]> - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -The Debian packaging is - Copyright (C) 2006 Peter Soos <[email protected]> - Copyright (C) 2006-2010 Julien Valroff <[email protected]> -It is licensed under the GPL, version 2. - -You should have received a copy of the GNU General Public License with -the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2; -if not, write to the Free Software Foundation, Inc., 51 Franklin St, -Fifth Floor, Boston, MA 02110-1301, USA. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/docs new/omnibook-2.20110911/debian/docs --- old/omnibook-2.20100406/debian/docs 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/docs 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -doc/BUGS -doc/CREDITS -doc/README -misc/hotkeys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/patches/01_disable-debug.diff new/omnibook-2.20110911/debian/patches/01_disable-debug.diff --- old/omnibook-2.20100406/debian/patches/01_disable-debug.diff 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/patches/01_disable-debug.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -Description: Disable debug flag -Author: Julien Valroff <[email protected]> -Forwarded: not-needed - -diff -urNad omnibook~/Makefile omnibook/Makefile ---- omnibook~/Makefile 2007-04-01 11:37:03.000000000 +0200 -+++ omnibook/Makefile 2007-05-26 15:20:41.000000000 +0200 -@@ -29,7 +29,7 @@ - #Uncomment and set to force debug behavior - #NOTE: Default (commented) behavior is to enable debug in trunk or branch svn - # snapshot and to disable it for release --#OMNIBOOK_WANT_DEBUG=n -+OMNIBOOK_WANT_DEBUG=n - - #comment to disable backlight device support - OMNIBOOK_WANT_BACKLIGHT=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/patches/series new/omnibook-2.20110911/debian/patches/series --- old/omnibook-2.20100406/debian/patches/series 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -01_disable-debug.diff diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/rules new/omnibook-2.20110911/debian/rules --- old/omnibook-2.20100406/debian/rules 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,133 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -# Name of the source package -psource := omnibook-source - -# The short upstream name, used for the module source directory -sname := omnibook - -# prefix of the target package name -PACKAGE=omnibook-module - -### end KERNEL SETUP - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - - -build-arch: configure-stamp build-arch-stamp -build-arch-stamp: - dh_testdir - touch build-arch-stamp - -build-indep: configure-stamp build-indep-stamp -build-indep-stamp: - dh_testdir - - touch build-indep-stamp - -build: build-arch build-indep - -clean: - dh_testdir - rm -f build-arch-stamp build-indep-stamp configure-stamp - - dh_clean - -install: DH_OPTIONS= -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Create the directories to install the source into - dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian - cp debian/compat debian/rules debian/changelog \ - debian/control debian/copyright debian/*.modules.in \ - debian/$(psource)/usr/src/modules/$(sname)/debian - cp Makefile *.c *.h *.lds debian/$(psource)/usr/src/modules/$(sname) - - cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules - dh_install - -# Build architecture-independent files here. -# Pass -i to all debhelper commands in this target to reduce clutter. -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installchangelogs -i doc/ChangeLog - dh_installdocs -i - dh_installexamples -i - dh_installman -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_installdeb -i - dh_shlibdeps -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - -# modifieable for experiments or debugging m-a -MA_DIR ?= /usr/share/modass -# load generic variable handling --include $(MA_DIR)/include/generic.make -# load default rules, including kdist, kdist_image, ... --include $(MA_DIR)/include/common-rules.make - -ifndef KPKG_STEM -STEM:=linux -else -STEM:=${KPKG_STEM} -endif - -kdist_clean: prep-deb-files - [ ! -f Makefile ] || $(MAKE) KSRC=$(KSRC) clean - dh_clean - -kdist_config: prep-deb-files - sed -i -e 's/_STEM_/$(STEM)/g' debian/control - -binary-modules: kdist_config prep-deb-files - dh_testroot - dh_prep - dh_installdirs lib/modules/$(KVERS)/extra - - # Build the module - $(MAKE) KSRC=$(KSRC) KVERS=$(KVERS) - - # Install the module - $(MAKE) install KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) INSTDIR=extra DEPMOD="/bin/true" - - dh_installdocs - dh_compress - dh_installmodules - dh_installchangelogs - dh_fixperms - dh_installdeb - dh_gencontrol -- -v$(VERSION) - dh_md5sums - dh_builddeb --destdir=$(DEB_DESTDIR) - dh_prep - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure binary-modules kdist kdist_config kdist_image kdist_clean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/source/format new/omnibook-2.20110911/debian/source/format --- old/omnibook-2.20100406/debian/source/format 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/source/format 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.0 (quilt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/debian/watch new/omnibook-2.20110911/debian/watch --- old/omnibook-2.20100406/debian/watch 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/debian/watch 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -version=3 -http://sf.net/omnibook/omnibook-(.*)\.tar\.gz - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/doc/ChangeLog new/omnibook-2.20110911/doc/ChangeLog --- old/omnibook-2.20100406/doc/ChangeLog 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/doc/ChangeLog 2011-09-21 14:07:43.000000000 +0200 @@ -13,6 +13,8 @@ to add support to Satellite X205 and other laptops based on ICH8 * Fix build with kernel >= 2.6.30 +* Apply patch from Tiago Batista <[email protected]> to fix + backlight compilation issue with kernel >= 2.6.34 2.20070211 Mathieu Bérard <[email protected]> * Disable Acer support, acerhk module should provided better diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/ec.c new/omnibook-2.20110911/ec.c --- old/omnibook-2.20100406/ec.c 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/ec.c 2011-09-21 14:07:43.000000000 +0200 @@ -169,7 +169,7 @@ if (retval < 0) return retval; - *state = !!(raw_state) & DISPLAY_CRT_DET; + *state = !!(raw_state & DISPLAY_CRT_DET); return DISPLAY_CRT_DET; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/init.c new/omnibook-2.20110911/init.c --- old/omnibook-2.20100406/init.c 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/init.c 2011-09-21 14:07:43.000000000 +0200 @@ -216,6 +216,8 @@ for (i = 0; tbl[i].ectypes; i++) { if (omnibook_ectype & tbl[i].ectypes) { + dprintk("Attempting backend %s init.\n", + tbl[i].io_op.backend->name); if (tbl[i].io_op.backend->init && tbl[i].io_op.backend->init(&tbl[i].io_op)) { dprintk("Backend %s init failed, skipping entry.\n", tbl[i].io_op.backend->name); @@ -253,6 +255,7 @@ dprintk("Match failed: disabling %s.\n", feature->name); return -ENODEV; } + dprintk("Match succeeded: continuing with %s.\n", feature->name); feature->io_op = kmalloc(sizeof(struct omnibook_operation), GFP_KERNEL); if (!feature->io_op) return -ENOMEM; @@ -323,10 +326,14 @@ return -ENOMEM; INIT_LIST_HEAD(&omnibook_available_feature->list); + dprintk("Feature range %p - %p\n", _start_features_driver, _end_features_driver); + for (i = 0; i < _end_features_driver - _start_features_driver; i++) { feature = &_start_features_driver[i]; - + dprintk("Testing feature %s at address %p\n", feature->name, feature); + if (!feature->name) + continue; if (!feature->enabled) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/lcd.c new/omnibook-2.20110911/lcd.c --- old/omnibook-2.20100406/lcd.c 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/lcd.c 2011-09-21 14:07:43.000000000 +0200 @@ -33,6 +33,9 @@ static int omnibook_get_backlight(struct backlight_device *bd); static int omnibook_set_backlight(struct backlight_device *bd); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) +static struct backlight_properties props; +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) static struct backlight_ops omnibookbl_ops = { #else /* 2.6.21 */ @@ -146,8 +149,13 @@ } #ifdef CONFIG_OMNIBOOK_BACKLIGHT - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) + memset (&props, 0, sizeof(struct backlight_properties)); + props.max_brightness = omnibook_max_brightness; + omnibook_backlight_device = + backlight_device_register(OMNIBOOK_MODULE_NAME, NULL, (void *)io_op, + &omnibookbl_ops, &props); +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) omnibook_backlight_device = backlight_device_register(OMNIBOOK_MODULE_NAME, NULL, (void *)io_op, &omnibookbl_ops); #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) @@ -161,8 +169,9 @@ printk(O_ERR "Unable to register as backlight device.\n"); return -ENODEV; } - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) + backend_byte_read(io_op, (u8*) &omnibook_backlight_device->props.brightness); +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) omnibook_backlight_device->props.max_brightness = omnibook_max_brightness; backend_byte_read(io_op, (u8*) &omnibook_backlight_device->props.brightness); #else /* < 2.6.21 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/omnibook.h new/omnibook-2.20110911/omnibook.h --- old/omnibook-2.20100406/omnibook.h 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/omnibook.h 2011-09-21 14:07:43.000000000 +0200 @@ -66,6 +66,7 @@ struct omnibook_tbl *tbl; struct omnibook_operation *io_op; struct list_head list; + long pad[3]; }; /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/omnibook-2.20100406/throttling.c new/omnibook-2.20110911/throttling.c --- old/omnibook-2.20100406/throttling.c 2010-01-30 09:05:48.000000000 +0100 +++ new/omnibook-2.20110911/throttling.c 2011-09-21 14:07:43.000000000 +0200 @@ -68,7 +68,7 @@ {0,} }; -struct omnibook_feature __declared_feature throttle_driver = { +static struct omnibook_feature __declared_feature throttle_driver = { .name = "throttling", .enabled = 1, .read = omnibook_throttle_read, ++++++ omnibook-kernel-3.0.patch ++++++ --- polling.c 2010-01-30 09:05:48.000000000 +0100 +++ polling.c 2011-09-21 14:06:13.219085575 +0200 @@ -125,7 +125,7 @@ if(!key_polling_enabled) goto out; - cancel_rearming_delayed_workqueue(omnibook_wq, &omnibook_poll_work); + cancel_delayed_work_sync(&omnibook_poll_work); dprintk("Scancode emulation for volume buttons disabled.\n"); key_polling_enabled = 0; @@ -188,7 +188,7 @@ { mutex_lock(&poll_mutex); if(key_polling_enabled) - cancel_rearming_delayed_workqueue(omnibook_wq, &omnibook_poll_work); + cancel_delayed_work_sync(&omnibook_poll_work); mutex_unlock(&poll_mutex); return 0; } --- Makefile 2011-09-21 14:11:07.063085540 +0200 +++ Makefile 2011-09-21 14:11:40.273085536 +0200 @@ -125,13 +125,7 @@ ifeq ($(OMNIBOOK_WANT_BACKLIGHT),y) ifdef CONFIG_BACKLIGHT_CLASS_DEVICE -# we support backlight interface only after 2.6.16 -ifeq ($(shell if [ $(SUBLEVEL) -gt 16 ] ; then echo -n 'y'; fi),y) EXTRA_CFLAGS += -DCONFIG_OMNIBOOK_BACKLIGHT -else -$(warning "Backlight support in only supported for kernel version newer than 2.6.16") -$(warning "Disabling backlight sysfs interface") -endif endif endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
