Hello community,
here is the log from the commit of package omnibook
checked in at Thu Mar 13 15:30:28 CET 2008.
--------
--- omnibook/omnibook.changes 2007-10-16 17:19:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/omnibook/omnibook.changes 2008-03-13 15:26:18.311056000 +0100
@@ -1,0 +2,15 @@
+Thu Mar 13 15:12:19 CET 2008 - ro@suse.de
+
+- update to current SVN trunk (20080313):
+ * Fix typo that was preventing debug statements from working
+ * Fix acpi backend for vista-capable BIOS update on TSM70
+ * Various fixes and DMI ids from trackers at sf.net, thanks to the reporters
+ * Ids added: Tecra A6 and Satellite M50
+ * Fix all compile warning in 2.6.24 (-rc4 really)
+ * Fix typo in acpi.c
+ * Updated nbsmi hotkey handling to work with Kernel 2.6.22+
+ * Moved Homepage to own field (from pseudo-field in long description)
+ * Added Satellite A100 to laptop.h
+- fixes build on 2.6.25.rc5
+
+-------------------------------------------------------------------
Old:
----
omnibook-2.20071016.tar.bz2
omnibook-fix-cast.diff
New:
----
omnibook-2.20080313.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ omnibook.spec ++++++
--- /var/tmp/diff_new_pack.Gz9058/_old 2008-03-13 15:30:18.000000000 +0100
+++ /var/tmp/diff_new_pack.Gz9058/_new 2008-03-13 15:30:18.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package omnibook (Version 20071016)
+# spec file for package omnibook (Version 20080313)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,10 +11,11 @@
# norootforbuild
# nodebuginfo
+
Name: omnibook
BuildRequires: kernel-source kernel-syms module-init-tools
Summary: Kernel modules for Omnibooks
-Version: 20071016
+Version: 20080313
Release: 1
Group: Hardware/Other
License: GPL v2 or later
@@ -23,8 +24,7 @@
AutoReqProv: on
Source: %{name}-2.%{version}.tar.bz2
Source2: preamble
-Patch1: omnibook-fix-cast.diff
-Patch2: omnibook-fix-uninitialized.diff
+Patch1: omnibook-fix-uninitialized.diff
ExclusiveArch: %ix86 x86_64
%suse_kernel_module_package -p %_sourcedir/preamble um
@@ -60,7 +60,6 @@
%prep
%setup -n %{name}-2.%{version}
%patch1 -p1
-%patch2 -p1
%build
cd ..
@@ -84,11 +83,24 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
%changelog
-* Tue Oct 16 2007 - dkukawka@suse.de
+* Thu Mar 13 2008 ro@suse.de
+- update to current SVN trunk (20080313):
+ * Fix typo that was preventing debug statements from working
+ * Fix acpi backend for vista-capable BIOS update on TSM70
+ * Various fixes and DMI ids from trackers at sf.net, thanks to the reporters
+ * Ids added: Tecra A6 and Satellite M50
+ * Fix all compile warning in 2.6.24 (-rc4 really)
+ * Fix typo in acpi.c
+ * Updated nbsmi hotkey handling to work with Kernel 2.6.22+
+ * Moved Homepage to own field (from pseudo-field in long description)
+ * Added Satellite A100 to laptop.h
+- fixes build on 2.6.25.rc5
+* Tue Oct 16 2007 dkukawka@suse.de
- update to current SVN trunk (20071016):
- Update for acpi and backlight API changes in linux 2.6.23
-* Wed May 30 2007 - dkukawka@suse.de
+* Wed May 30 2007 dkukawka@suse.de
- update tpo current SVN trunk (20070530):
- Update for post 2.6.21 input handler API change
- Changing P25 to ectype 12
@@ -97,23 +109,23 @@
- omnibook-jiffies.patch
- added patch:
- omnibook-fix-cast.diff: fix cast of enum
-* Wed Apr 04 2007 - dkukawka@suse.de
+* Wed Apr 04 2007 dkukawka@suse.de
- updated to current SVN HEAD to fix build problems/errors
- added module-init-tools to BuildRequires
-* Tue Feb 06 2007 - ro@suse.de
+* Tue Feb 06 2007 ro@suse.de
- update to SVN of 20070205
-* Tue Jan 23 2007 - ro@suse.de
+* Tue Jan 23 2007 ro@suse.de
- update to SVN of 20070123
-* Wed Nov 08 2006 - ro@suse.de
+* Wed Nov 08 2006 ro@suse.de
- add preamble for kernel module packages
-* Wed Oct 11 2006 - lrupp@suse.de
+* Wed Oct 11 2006 lrupp@suse.de
- update to 2.20060921
- clean up after build is finished
-* Wed Aug 30 2006 - ro@suse.de
+* Wed Aug 30 2006 ro@suse.de
- update to 2.20060817 now on own sf project
-* Mon Apr 10 2006 - ro@suse.de
+* Mon Apr 10 2006 ro@suse.de
- added nodebuginfo tag to specfile
-* Fri Apr 07 2006 - dkukawka@suse.de
+* Fri Apr 07 2006 dkukawka@suse.de
- initial package
- added patches:
- omnibook-2.6-integration.patch: modified patch from package
++++++ omnibook-2.20071016.tar.bz2 -> omnibook-2.20080313.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/acpi.c new/omnibook-2.20080313/acpi.c
--- old/omnibook-2.20071016/acpi.c 2007-10-16 16:57:56.000000000 +0200
+++ new/omnibook-2.20080313/acpi.c 2008-03-13 15:03:58.000000000 +0100
@@ -71,8 +71,8 @@
static int omnibook_acpi_bt_remove(struct acpi_device *device, int type);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
-const struct acpi_device_id omnibook_bt_ids[] = {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
+static const struct acpi_device_id omnibook_bt_ids[] = {
{"TOS6205", 0},
{"", 0},
};
@@ -106,6 +106,7 @@
acpi_handle ec_handle; /* Handle on ACPI EC device */
acpi_handle bt_handle; /* Handle on ACPI BT device */
unsigned has_antr_antw:1; /* Are there ANTR/ANTW methods in the EC device ? */
+ unsigned has_doss_dosw:1; /* Are there DOSS/DOSW methods in the EC device ? */
};
/*
@@ -149,17 +150,23 @@
goto error1;
}
- if((acpi_get_handle( dev_handle, "ANTR", &method_handle) == AE_OK) &&
- (acpi_get_handle( dev_handle, "ANTW", &method_handle) == AE_OK))
+ if((acpi_get_handle( dev_handle, GET_WIRELESS_METHOD, &method_handle) == AE_OK) &&
+ (acpi_get_handle( dev_handle, SET_WIRELESS_METHOD, &method_handle) == AE_OK))
priv_data->has_antr_antw = 1;
+
+ if((acpi_get_handle( dev_handle, GET_DISPLAY_METHOD, &method_handle) == AE_OK) &&
+ (acpi_get_handle( dev_handle, SET_DISPLAY_METHOD, &method_handle) == AE_OK))
+ priv_data->has_doss_dosw = 1;
io_op->backend->data = (void *) priv_data;
+ mutex_unlock(&io_op->backend->mutex);
+
/* attempt to register Toshiba bluetooth ACPI driver */
acpi_bus_register_driver(&omnibook_bt_driver);
dprintk("ACPI backend init OK\n");
- mutex_unlock(&io_op->backend->mutex);
+
return 0;
} else {
@@ -182,8 +189,16 @@
struct omnibook_backend *backend;
backend = container_of(ref, struct omnibook_backend, kref);
dprintk("ACPI backend not used anymore: disposing\n");
+
+
+ dprintk("ptr addr: %p driver name: %s\n",&omnibook_bt_driver, omnibook_bt_driver.name);
acpi_bus_unregister_driver(&omnibook_bt_driver);
+
+ mutex_lock(&backend->mutex);
kfree(backend->data);
+ backend->data = NULL;
+ mutex_unlock(&backend->mutex);
+ mutex_destroy(&backend->mutex);
}
static void omnibook_acpi_exit(const struct omnibook_operation *io_op)
@@ -263,6 +278,7 @@
static int omnibook_acpi_bt_add(struct acpi_device *device)
{
+ int retval;
struct acpi_backend_data *priv_data = acpi_backend.data;
dprintk("Enabling found Toshiba Bluetooth ACPI device.\n");
@@ -270,19 +286,26 @@
strcpy(acpi_device_class(device), TOSHIBA_ACPI_BT_CLASS);
/* Save handle in backend private data structure. ugly. */
+
+ mutex_lock(&acpi_backend.mutex);
priv_data->bt_handle = device->handle;
+ retval = set_bt_status(priv_data, 1);
+ mutex_unlock(&acpi_backend.mutex);
- return set_bt_status(priv_data, 1);
+ return retval;
}
static int omnibook_acpi_bt_remove(struct acpi_device *device, int type)
{
int retval;
- struct acpi_backend_data *priv_data = acpi_backend.data;
+ struct acpi_backend_data *priv_data = acpi_backend.data;
+ mutex_lock(&acpi_backend.mutex);
dprintk("Disabling Toshiba Bluetooth ACPI device.\n");
retval = set_bt_status(priv_data, 0);
priv_data->bt_handle = NULL;
+ mutex_unlock(&acpi_backend.mutex);
+
return retval;
}
@@ -384,6 +407,9 @@
int raw_state = 0;
struct acpi_backend_data *priv_data = io_op->backend->data;
+ if(!priv_data->has_doss_dosw)
+ return -ENODEV;
+
retval = omnibook_acpi_execute(priv_data->ec_handle, GET_DISPLAY_METHOD, NULL, &raw_state);
if (retval < 0)
return retval;
@@ -420,6 +446,9 @@
int matched = -1;
struct acpi_backend_data *priv_data = io_op->backend->data;
+ if(!priv_data->has_doss_dosw)
+ return -ENODEV;
+
for (i = 0; i < ARRAY_SIZE(acpi_display_mode_list); i++) {
if (acpi_display_mode_list[i] == state) {
matched = i + 1; /* raw state is array row number + 1 */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/debian/changelog new/omnibook-2.20080313/debian/changelog
--- old/omnibook-2.20071016/debian/changelog 1970-01-01 01:00:00.000000000 +0100
+++ new/omnibook-2.20080313/debian/changelog 2008-03-13 15:03:57.000000000 +0100
@@ -0,0 +1,136 @@
+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 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 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 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 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 Mon, 12 Feb 2007 18:50:05 +0100
+
+omnibook (2:2.20060921+svn20061202-1) unstable; urgency=low
+
+ * New SVN snapshot (r228)
+
+ -- Julien Valroff 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 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 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 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 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 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 Thu, 10 Aug 2006 01:35:38 +0200
+
+omnibook (20060126-1) unstable; urgency=low
+
+ * Minor build inconveniences corrected.
+
+ -- Daniel Gimpelevich Sun, 18 Jun 2006 12:28:55 -0700
+
+omnibook (20060126-0) unstable; urgency=low
+
+ * Locally built.
+
+ -- Péter Soós Wed, 25 Jan 2006 21:06:28 +0100
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/debian/compat new/omnibook-2.20080313/debian/compat
--- old/omnibook-2.20071016/debian/compat 1970-01-01 01:00:00.000000000 +0100
+++ new/omnibook-2.20080313/debian/compat 2007-10-18 18:35:01.000000000 +0200
@@ -0,0 +1 @@
+5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/debian/control new/omnibook-2.20080313/debian/control
--- old/omnibook-2.20071016/debian/control 1970-01-01 01:00:00.000000000 +0100
+++ new/omnibook-2.20080313/debian/control 2008-03-13 15:03:57.000000000 +0100
@@ -0,0 +1,21 @@
+Source: omnibook
+Section: misc
+Priority: optional
+Maintainer: Julien Valroff
+Build-Depends: debhelper (>> 5.0.0), dpatch, bzip2
+Standards-Version: 3.7.3
+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 (>= 4.0.0), make, module-assistant, kernel-package, bzip2, dpatch
+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.20071016/debian/control.modules.in new/omnibook-2.20080313/debian/control.modules.in
--- old/omnibook-2.20071016/debian/control.modules.in 1970-01-01 01:00:00.000000000 +0100
+++ new/omnibook-2.20080313/debian/control.modules.in 2008-03-13 15:03:57.000000000 +0100
@@ -0,0 +1,23 @@
+Source: omnibook
+Section: misc
+Priority: optional
+Maintainer: Julien Valroff
+Build-Depends: debhelper (>> 5.0.0)
+Standards-Version: 3.7.2
+
+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.20071016/debian/copyright new/omnibook-2.20080313/debian/copyright
--- old/omnibook-2.20071016/debian/copyright 1970-01-01 01:00:00.000000000 +0100
+++ new/omnibook-2.20080313/debian/copyright 2007-10-18 18:35:01.000000000 +0200
@@ -0,0 +1,35 @@
+This package was debianized by Peter Soos on
+Wed, 25 Jan 2006 21:06:28 +0100.
+Debian package was improved by Julien Valroff
+
+It was downloaded from http://sourceforge.net/projects/omnibook
+
+Copyright Holder: 2006-2007 Mathieu Bérard
+
+dump.c:
+ Copyright (C) 2004-2005 Borislav Deianov
+
+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
+ Copyright (C) 2006-2007 Julien Valroff
+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;
+if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/debian/docs new/omnibook-2.20080313/debian/docs
--- old/omnibook-2.20071016/debian/docs 1970-01-01 01:00:00.000000000 +0100
+++ new/omnibook-2.20080313/debian/docs 2007-10-18 18:35:01.000000000 +0200
@@ -0,0 +1,4 @@
+doc/BUGS
+doc/CREDITS
+doc/README
+misc/hotkeys
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/debian/patches/00list new/omnibook-2.20080313/debian/patches/00list
--- old/omnibook-2.20071016/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100
+++ new/omnibook-2.20080313/debian/patches/00list 2007-10-18 18:35:01.000000000 +0200
@@ -0,0 +1 @@
+01_disable-debug
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/debian/patches/01_disable-debug.dpatch new/omnibook-2.20080313/debian/patches/01_disable-debug.dpatch
--- old/omnibook-2.20071016/debian/patches/01_disable-debug.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ new/omnibook-2.20080313/debian/patches/01_disable-debug.dpatch 2007-10-18 18:35:00.000000000 +0200
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_disable-debug.dpatch by
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+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.20071016/debian/README.Debian new/omnibook-2.20080313/debian/README.Debian
--- old/omnibook-2.20071016/debian/README.Debian 1970-01-01 01:00:00.000000000 +0100
+++ new/omnibook-2.20080313/debian/README.Debian 2007-10-18 18:35:01.000000000 +0200
@@ -0,0 +1,30 @@
+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 , Wed, 25 Jan 2006 21:06:28 +0100
+ -- Julien Valroff Sun, 07 Oct 2007 10:38:07 +0200
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/debian/rules new/omnibook-2.20080313/debian/rules
--- old/omnibook-2.20071016/debian/rules 1970-01-01 01:00:00.000000000 +0100
+++ new/omnibook-2.20080313/debian/rules 2007-10-18 18:35:01.000000000 +0200
@@ -0,0 +1,135 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+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: patch configure-stamp build-indep-stamp
+build-indep-stamp:
+ dh_testdir
+
+ touch build-indep-stamp
+
+build: patch build-arch build-indep
+
+clean: unpatch
+ dh_testdir
+ rm -f build-arch-stamp build-indep-stamp configure-stamp
+
+ dh_clean
+
+install: DH_OPTIONS=
+install: patch build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ 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_clean -k
+ 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_clean -k
+
+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.20071016/display.c new/omnibook-2.20080313/display.c
--- old/omnibook-2.20071016/display.c 2007-04-04 14:28:33.000000000 +0200
+++ new/omnibook-2.20080313/display.c 2008-03-13 15:03:58.000000000 +0100
@@ -73,10 +73,18 @@
static int __init omnibook_display_init(struct omnibook_operation *io_op)
{
+ int retval;
+ unsigned int state;
+
/* Disable file writing if unsuported by backend */
if (!io_op->backend->display_set)
display_driver.write = NULL;
- return 0;
+
+ retval = backend_display_get(io_op, &state);
+ if (retval < 0)
+ return retval;
+ else
+ return 0;
}
static struct omnibook_tbl display_table[] __initdata = {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/doc/ChangeLog new/omnibook-2.20080313/doc/ChangeLog
--- old/omnibook-2.20071016/doc/ChangeLog 2007-05-30 19:21:47.000000000 +0200
+++ new/omnibook-2.20080313/doc/ChangeLog 2007-10-18 18:35:03.000000000 +0200
@@ -1,7 +1,7 @@
Changelog file for omnibook package:
------------------------------------
-2.20070404 Mathieu Bérard
+2.XXXXXXXX Mathieu Bérard
* DMI signature added:
Toshiba Satellite P25 (ectype 11)
Toshiba Satellite M60 (ectype 12)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/hotkeys.c new/omnibook-2.20080313/hotkeys.c
--- old/omnibook-2.20071016/hotkeys.c 2007-04-04 14:28:33.000000000 +0200
+++ new/omnibook-2.20080313/hotkeys.c 2008-03-13 15:03:58.000000000 +0100
@@ -99,7 +99,7 @@
}
static const char pretty_name[][27] = {
- "Onetouch buttons",
+ "Onetouch buttons are",
"Multimedia hotkeys are",
"Fn hotkeys are",
"Stick key is",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/init.c new/omnibook-2.20080313/init.c
--- old/omnibook-2.20071016/init.c 2007-04-04 14:28:33.000000000 +0200
+++ new/omnibook-2.20080313/init.c 2008-03-13 15:03:58.000000000 +0100
@@ -82,7 +82,7 @@
enum omnibook_ectype_t omnibook_ectype = NONE;
-static char *laptop_model __initdata;
+static const char *laptop_model __initdata;
static int omnibook_userset = 0;
@@ -132,9 +132,13 @@
extern struct omnibook_feature _start_features_driver[];
extern struct omnibook_feature _end_features_driver[];
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
static int __init dmi_matched(struct dmi_system_id *dmi)
+#else
+static int __init dmi_matched(const struct dmi_system_id *dmi)
+#endif
{
- omnibook_ectype = (int)dmi->driver_data;
+ omnibook_ectype = (enum omnibook_ectype_t)dmi->driver_data;
if (dmi->ident)
laptop_model = (char *)dmi->ident;
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/laptop.h new/omnibook-2.20080313/laptop.h
--- old/omnibook-2.20071016/laptop.h 2007-05-30 19:20:43.000000000 +0200
+++ new/omnibook-2.20080313/laptop.h 2008-03-13 15:03:58.000000000 +0100
@@ -18,7 +18,11 @@
#define HP_SIGNATURE "Hewlett-Packard"
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
static int __init dmi_matched(struct dmi_system_id *dmi);
+#else
+static int __init dmi_matched(const struct dmi_system_id *dmi);
+#endif
static struct dmi_system_id omnibook_ids[] __initdata = {
{
@@ -624,6 +628,15 @@
},
{
.callback = dmi_matched,
+ .ident = "Toshiba Satellite A100",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A100"),
+ },
+ .driver_data = (void*) TSA105
+ },
+ {
+ .callback = dmi_matched,
.ident = "Toshiba Satellite P100",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -687,6 +700,15 @@
},
{
.callback = dmi_matched,
+ .ident = "Toshiba Satellite M50",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M50"),
+ },
+ .driver_data = (void*) TSM70
+ },
+ {
+ .callback = dmi_matched,
.ident = "Toshiba Satellite M60",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -794,6 +816,15 @@
.driver_data = (void*) TSM40
},
{
+ .callback = dmi_matched,
+ .ident = "Toshiba Tecra A6",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "TECRA A6"),
+ },
+ .driver_data = (void*) TSM70
+ },
+ {
.callback = dmi_matched,
.ident = "Toshiba Equium A110",
.matches = {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/lcd.c new/omnibook-2.20080313/lcd.c
--- old/omnibook-2.20071016/lcd.c 2007-10-16 16:57:56.000000000 +0200
+++ new/omnibook-2.20080313/lcd.c 2008-03-13 15:03:58.000000000 +0100
@@ -128,12 +128,13 @@
* and previous versions of this driver (wrongly) assumed it was 10 for
* all models.
*
+ * XE3GF
* TSM30X
* TSM70
* TSM40
* TSA105
*/
- if (omnibook_ectype & (TSM70 | TSM30X | TSM40 | TSA105))
+ if (omnibook_ectype & (XE3GF | TSM70 | TSM30X | TSM40 | TSA105))
omnibook_max_brightness = 7;
else {
omnibook_max_brightness = 10;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/Makefile new/omnibook-2.20080313/Makefile
--- old/omnibook-2.20071016/Makefile 2007-10-16 17:00:13.000000000 +0200
+++ new/omnibook-2.20080313/Makefile 2007-10-18 18:35:05.000000000 +0200
@@ -18,8 +18,8 @@
#Module informations
MODULE_NAME = omnibook
-MODULE_VERSION = 2.20071016
-MODULE_BRANCH = release
+MODULE_VERSION = 2.20070211
+MODULE_BRANCH = trunk
# Out-of-tree configuration
ifndef CONFIG_OMNIBOOK
@@ -106,7 +106,7 @@
sed -i "s|^\(2\.\)X\{8\}|\1$(TODAY)|" doc/ChangeLog
-release:
+release: clean version
mkdir -p ../$(MODULE_NAME)-2.$(TODAY)
cp -a *.h *.c *.lds Makefile doc misc ../$(MODULE_NAME)-2.$(TODAY)
rm -f ../$(MODULE_NAME)-2.$(TODAY).tar ../$(MODULE_NAME)-2.$(TODAY).tar.gz
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/misc/dmi_strings.txt new/omnibook-2.20080313/misc/dmi_strings.txt
--- old/omnibook-2.20071016/misc/dmi_strings.txt 2007-04-04 14:28:33.000000000 +0200
+++ new/omnibook-2.20080313/misc/dmi_strings.txt 2008-03-13 15:03:57.000000000 +0100
@@ -292,6 +292,18 @@
Board Version: Null
---------------------------------------------
+Toshiba Satellite M50------------------------
+
+BIOS Vendor: TOSHIBA
+BIOS Version: V2.10
+BIOS Release: 05/08/2006
+System Vendor: TOSHIBA
+Product Name: Satellite M50
+Version: PSM51E-01C011IT
+Board Vendor: TOSHIBA
+Board Name: Null
+
+---------------------------------------------
Toshiba Satellite M60 -----------------------
BIOS Vendor: TOSHIBA
@@ -392,6 +404,18 @@
Board Name: Version A0
---------------------------------------------
+Toshiba Tecra A6 ----------------------------
+
+BIOS Vendor: TOSHIBA
+BIOS Version: V2.70
+BIOS Release: 04/26/2007
+System Vendor: TOSHIBA
+Product Name: TECRA A6
+Version: PTA60U-0FK00D
+Board Vendor: TOSHIBA
+Board Name: Null
+
+---------------------------------------------
Toshiba Tecra S2 ----------------------------
BIOS Vendor: TOSHIBA
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/nbsmi.c new/omnibook-2.20080313/nbsmi.c
--- old/omnibook-2.20071016/nbsmi.c 2007-05-30 19:20:44.000000000 +0200
+++ new/omnibook-2.20080313/nbsmi.c 2008-03-13 15:03:58.000000000 +0100
@@ -336,6 +336,7 @@
#endif
{
struct input_handle *handle;
+ int error;
/* the 0x0001 vendor magic number is found in atkbd.c */
if(!(dev->id.bustype == BUS_I8042 && dev->id.vendor == 0x0001))
@@ -363,14 +364,38 @@
handle->name = "omnibook_scancode_hook";
handle->private = handler->private;
- input_open_device(handle);
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,21))
+ error = input_register_handle(handle);
+ if (error) {
+ dprintk("register_handle failed\n");
+ goto out_nobind_free;
+ }
+ error = input_open_device(handle);
+ if (error) {
+ dprintk("register_handle failed\n");
+ input_unregister_handle(handle);
+ goto out_nobind_free;
+ }
+
+#else
+ status=input_open_device(handle);
+ if (error==0) dprintk("Input device opened\n");
+ else {
+ dprintk("opening input device failed\n");
+ goto out_nobind_free;
+ }
+#endif
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,21))
return 0;
+out_nobind_free:
+ kfree(handle);
out_nobind:
return -ENODEV;
#else
return handle;
+out_nobind_free:
+ kfree(handle);
out_nobind:
return NULL;
#endif
@@ -380,6 +405,9 @@
{
dprintk("hook_disconnect.\n");
input_close_device(handle);
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,21))
+ input_unregister_handle(handle);
+#endif
kfree(handle);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/omnibook.h new/omnibook-2.20080313/omnibook.h
--- old/omnibook-2.20071016/omnibook.h 2007-04-04 14:28:33.000000000 +0200
+++ new/omnibook-2.20080313/omnibook.h 2008-03-13 15:03:58.000000000 +0100
@@ -116,8 +116,15 @@
struct omnibook_feature *omnibook_find_feature(char *name);
void omnibook_report_key(struct input_dev *dev, unsigned int keycode);
+/*
+ * __attribute_used__ is not defined anymore in 2.6.24
+ * but __used appeared only in 2.6.22
+ */
+#ifndef __used
+#define __used __attribute_used__
+#endif
-#define __declared_feature __attribute__ (( __section__(".features"), __aligned__(__alignof__ (struct omnibook_feature)))) __attribute_used__
+#define __declared_feature __attribute__ (( __section__(".features"), __aligned__(__alignof__ (struct omnibook_feature)))) __used
/*
* yet another printk wrapper
@@ -126,7 +133,7 @@
#define O_WARN KERN_WARNING OMNIBOOK_MODULE_NAME ": "
#define O_ERR KERN_ERR OMNIBOOK_MODULE_NAME ": "
-#ifdef OMNIBOOK_DEBUG
+#ifdef CONFIG_OMNIBOOK_DEBUG
#define dprintk(fmt, args...) printk(KERN_INFO "%s: " fmt, OMNIBOOK_MODULE_NAME, ## args)
#define dprintk_simple(fmt, args...) printk(fmt, ## args)
#else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/omnibook-2.20071016/polling.c new/omnibook-2.20080313/polling.c
--- old/omnibook-2.20071016/polling.c 2007-05-30 19:20:44.000000000 +0200
+++ new/omnibook-2.20080313/polling.c 2008-03-13 15:03:58.000000000 +0100
@@ -60,7 +60,7 @@
__backend_byte_write(key_polling_driver.io_op, 0);
mutex_unlock(&key_polling_driver.io_op->backend->mutex);
-#ifdef OMNIBOOK_DEBUG
+#ifdef CONFIG_OMNIBOOK_DEBUG
if (unlikely(q0a & XE3GC_SLPB_MASK))
dprintk("Sleep button pressed.\n");
if (unlikely(q0a & XE3GC_F5_MASK))
@@ -144,7 +144,7 @@
len += sprintf(buffer + len, "Volume buttons polling is %s.\n",
(key_polling_enabled) ? "enabled" : "disabled");
-#ifdef OMNIBOOK_DEBUG
+#ifdef CONFIG_OMNIBOOK_DEBUG
if(key_polling_enabled)
len += sprintf(buffer + len, "Will poll in %i msec.\n",
jiffies_to_msecs(omnibook_poll_work.timer.expires - jiffies));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org