From 84683d42a65c850cdf93aa962a85035db252d772 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathieu=20B=C3=A9rard?= Date: Sun, 6 Aug 2006 20:33:15 +0000 Subject: [PATCH] Polish before release --- Makefile | 8 ++++---- doc/ChangeLog | 6 ++++-- doc/INSTALL | 3 +-- misc/omnibook-integration.patch | 30 ++++++++++++++++-------------- omnibook.h | 2 +- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index e9998b4..bf8a57d 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ clean: make -C $(KSRC) M=$(PWD) clean $(RM) *~ "#*#" .swp $(RM) -r debian/omnibook-source *-stamp - $(RM) -r Modules.symvers + $(RM) -r Module.symvers (cd misc/obtest; $(RM) obtest *.o) @@ -94,8 +94,8 @@ kinstall: $(RM) -r $(KMODDIR) $(RM) $(KINCDIR)/omnibook.h $(MKDIR) $(KMODDIR) - $(INSTALL) *.c $(KMODDIR) - $(INSTALL) apmemu.h ec.h init.h $(KMODDIR) + $(INSTALL) *.c sections.lds $(KMODDIR) + $(INSTALL) apmemu.h compat.h ec.h laptop.h $(KMODDIR) $(INSTALL) omnibook.h $(KINCDIR) $(MKDIR) $(KDOCDIR) $(INSTALL) doc/README doc/README-OneTouch $(KDOCDIR) @@ -104,7 +104,7 @@ kpatch: kinstall (cd $(KSRC); patch -p1 < $(BDIR)/misc/omnibook-integration.patch) deb: clean - dch -v 2-$(TODAY) + dch -v 1:2-$(TODAY) fakeroot dpkg-buildpackage diff --git a/doc/ChangeLog b/doc/ChangeLog index 1187627..dc9f378 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ Changelog file for omnibook package: ------------------------------------ -2006-XX-XX Mathieu Bérard +2-20060806 Mathieu Bérard * Make the module linux 2.6 only Kernel versions from 2.6.8 to a least 2.6.17 are supported Code for compatibility with kernels older than 2.6.17 is @@ -26,11 +26,12 @@ Changelog file for omnibook package: Also make more use of Kbuild * Use sscanf and simple_stro{u}l for strings parsing instead of custom code * Run lindent for better conformance with kernel coding style -* Add very limited support for Toshiba M40 (more info needed) +* Add very limited support for some Toshiba M40 (more info needed) * Use bitmasks for EC types matching, this change is transparent for the user (e.g. one can still use ectype=num module parameter) Rationale: Reduce the size of the omnibook_feature struct * Polish Debian support: Use module-assistant and fix all Lintian warning + Fix building against non-running kernel (Thanks to Daniel Gimpelevich) * Update documentation and omnibook-integration.patch * Fix spinlock usage: they can be used unconditionally as they are automatically optimized out at build-time on UP. This should improve PREEMPT safety @@ -40,6 +41,7 @@ Changelog file for omnibook package: * Add a new feature for testers: dump Dump was stolen from the ibm_acpi driver It is disabled by default +* Bump version to 2-YYYYMMDD 2006-05-15 Thomas Perl * Added support for xe4500's "audio mute" led diff --git a/doc/INSTALL b/doc/INSTALL index 3c9cde3..028127a 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -20,8 +20,7 @@ Step 2 Run `make install' as the super-user. This will install omnibook.ko kernel module into modules directory of your currently running kernel - (usually in /lib/modules/version_of_your_kernel) and runs `depmod -a' to - rebuild module dependency database. + (usually in /lib/modules/version_of_your_kernel). You may install and load the module with `make load' command. In this case you may skip Step 3. diff --git a/misc/omnibook-integration.patch b/misc/omnibook-integration.patch index 3ea9500..3d046dc 100644 --- a/misc/omnibook-integration.patch +++ b/misc/omnibook-integration.patch @@ -1,7 +1,7 @@ -diff -Nru linux-2.6.15/arch/i386/Kconfig linux-2.6.15-omnibook/arch/i386/Kconfig ---- linux-2.6.15/arch/i386/Kconfig 2006-01-03 04:21:10.000000000 +0100 -+++ linux-2.6.15-omnibook/arch/i386/Kconfig 2006-03-12 22:49:21.251157801 +0100 -@@ -320,6 +320,42 @@ +diff -Nru linux-2.6.17/arch/i386/Kconfig linux-2.6.17-omnibook/arch/i386/Kconfig +--- linux-2.6.17/arch/i386/Kconfig 2006-06-18 03:49:35.000000000 +0200 ++++ linux-2.6.17-omnibook/arch/i386/Kconfig 2006-08-04 17:09:26.680717114 +0200 +@@ -334,6 +334,42 @@ Say Y if you intend to run this kernel on a Toshiba portable. Say N otherwise. @@ -44,18 +44,18 @@ diff -Nru linux-2.6.15/arch/i386/Kconfig linux-2.6.15-omnibook/arch/i386/Kconfig config I8K tristate "Dell laptop support" ---help--- -diff -Nru linux-2.6.15/drivers/misc/Makefile linux-2.6.15-omnibook/drivers/misc/Makefile ---- linux-2.6.15/drivers/misc/Makefile 2006-01-03 04:21:10.000000000 +0100 -+++ linux-2.6.15-omnibook/drivers/misc/Makefile 2006-03-12 22:39:59.517415488 +0100 +diff -Nru linux-2.6.17/drivers/misc/Makefile linux-2.6.17-omnibook/drivers/misc/Makefile +--- linux-2.6.17/drivers/misc/Makefile 2006-06-18 03:49:35.000000000 +0200 ++++ linux-2.6.17-omnibook/drivers/misc/Makefile 2006-08-04 17:09:26.681716962 +0200 @@ -5,3 +5,5 @@ obj-$(CONFIG_IBM_ASM) += ibmasm/ obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ +obj-$(CONFIG_OMNIBOOK) += omnibook/ + -diff -Nru linux-2.6.15/drivers/misc/omnibook/Makefile linux-2.6.15-omnibook/drivers/misc/omnibook/Makefile ---- linux-2.6.15/drivers/misc/omnibook/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.15-omnibook/drivers/misc/omnibook/Makefile 2006-03-12 22:43:34.087553100 +0100 +diff -Nru linux-2.6.17/drivers/misc/omnibook/Makefile linux-2.6.17-omnibook/drivers/misc/omnibook/Makefile +--- linux-2.6.17/drivers/misc/omnibook/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.17-omnibook/drivers/misc/omnibook/Makefile 2006-08-04 17:09:26.684716506 +0200 @@ -0,0 +1,27 @@ + +# Makefile -- makefile for the HP OmniBook support module @@ -78,9 +78,11 @@ diff -Nru linux-2.6.15/drivers/misc/omnibook/Makefile linux-2.6.15-omnibook/driv +# +# Note 2! The CFLAGS definitions are now in the main makefile... + ++EXTRA_LDFLAGS += $(src)/sections.lds +obj-$(CONFIG_OMNIBOOK) += omnibook.o + -+omnibook-objs := ac.o battery.o blank.o display.o dock.o ec.o fan.o \ -+fan_policy.o init.o lcd.o onetouch.o temperature.o touchpad.o dump.o info.o \ -+watch.o apmemu.o -+ ++omnibook-objs := ac.o battery.o blank.o display.o dock.o \ ++ec.o fan.o fan_policy.o init.o lcd.o onetouch.o \ ++temperature.o touchpad.o dump.o info.o \ ++apmemu.o muteled.o ++ diff --git a/omnibook.h b/omnibook.h index 8d41a5b..355df08 100644 --- a/omnibook.h +++ b/omnibook.h @@ -25,7 +25,7 @@ */ #define OMNIBOOK_MODULE_NAME "omnibook" -#define OMNIBOOK_MODULE_VERSION "20060126" +#define OMNIBOOK_MODULE_VERSION "2-20000000" /* * EC types -- 2.43.5