[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

cpad-kernel_0.9-6 fixes build and install failures


The (arguably) good news is that the cpad-kernel package
just uploaded to incoming fixes two fairly serious problems.

The first being a failure if the package is configured to use
the source from a kernel different to the present running one.
The resulting binary -module package appears to be for the
desired kernel, but the modules would in fact be built using
source for the running one.

Fixed with the following patch:

@@ -183,7 +184,7 @@
                    dh_installmodules;                                          \
                    ;;                                                          \
                6)                                                              \
-                   ( cd cpad-2.6 && $(MAKE) );                                 \
+                   ( cd cpad-2.6 && $(MAKE) KVERSION=$(non_epoch_version) );   \
                    dh_install cpad-2.6/cpad.ko lib/modules/$(non_epoch_version)/extra; \
                    ;;                                                          \

The second being it is impossible to install two -module packages
from the 0.9-4 release at the same time, as might be resonably
expected by anyone upgrading a kernel.  The fix is trivial but
most ugly.  The common script needs its own package.   NEW is not
usually the place I'd like to start an appeal for fetching last
minute updates from, but the issues are arguably RC, and the
extra package really is about as trivial as any could possibly be.

The following patch effects that change:

--- debian/control	9 Jan 2005 15:29:46 -0000	1.6
+++ debian/control	27 May 2005 07:26:16 -0000	1.7
@@ -9,6 +9,7 @@
 Section: devel
 Architecture: all
 Depends: make, ${misc:Depends}
+Recommends: cpad-common
 Description: source for the Synaptics cPad driver
  This package provides the source code for the cpad kernel module.  The cpad
  driver will enable use of the middle button and ioctl's for the 1335 LCD
@@ -16,9 +17,15 @@
  kernel headers package or properly configured source for your running kernel
  to create the binary module package, and you'll require userspace tools to
  actually make it do much else.
- .
- This package currently supports Linux 2.4 kernels only, support for 2.6
- kernels will follow soon.
+Package: cpad-common
+Section: libdevel
+Architecture: all
+Description: common files to support the Synaptics cPad driver kernel modules
+ This package provides common files required by the cpad-kernel-module packages
+ that are generated from the cpad-kernel-source package.  You do not need it to
+ install and compile from the cpad-kernel-source package, but you will need it
+ to install and use the -module packages that it creates.
 Package: cpad-kernel-dev
 Section: libdevel

--- debian/cpad.control	8 Aug 2004 18:49:44 -0000	1.5
+++ debian/cpad.control	27 May 2005 07:26:16 -0000	1.6
@@ -7,7 +7,7 @@
 Package: cpad-kernel-module-${kpkg:Kernel-Version}
 Architecture: any
-Depends: ${misc:Depends}
+Depends: cpad-common, ${misc:Depends}
 Provides: cpad-kernel-module
 Description: cpad module for Linux kernel-${kpkg:Kernel-Version}
  This package contains a loadable kernel module for the Synaptics cPad

--- debian/rules        12 Feb 2005 06:15:05 -0000      1.18
+++ debian/rules        27 May 2005 07:34:53 -0000      1.21
@@ -112,6 +112,7 @@
 # default value, when make-kpkg is used it will supply to real value
 MODDIR         = ..
+pcommon  = cpad-common
 pmodules = $(package)-module-$(non_epoch_version)
 psource  = $(package)-source
 pdev     = $(package)-dev
@@ -195,7 +196,6 @@
-       dh_install debian/cpad.hotplug  etc/hotplug.d/input

@@ -251,7 +251,7 @@
        rm -f *-stamp

-install: build install-source install-dev
+install: build install-source install-modules-common install-dev

 install-source: DH_OPTIONS=-p$(psource)
@@ -268,7 +268,6 @@
                   debian/copyright                             \
                   debian/cpad.config                           \
                   debian/cpad.control                          \
-                  debian/cpad.hotplug                          \
                   debian/cpad.modules                          \
                   debian/cpad.postinst                         \
                   debian/cpad.templates                        \
@@ -280,6 +279,14 @@


+install-modules-common: DH_OPTIONS=-p$(pcommon)
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_install debian/cpad.hotplug  etc/hotplug.d/input

 install-dev: DH_OPTIONS=-p$(pdev)

Sorry for that one.  I put a gold star on the brown paper bag for
forgetting to get back to it earlier.  I have no excuse but busy.

The only other changes are the addition of two new translations
just submitted and a grammatical correction to one of the english
debconf notes (that does not invalidate existing translations).
cf the three bugs closed in the changelog extract below.

cpad-kernel (0.9-6) unstable; urgency=low

  * Split out a -common package to contain the hotplug script.
    There really is no other good way to support it and have the
    -modules packages be able to co-exist, though it seems like
    vast overkill for the script it supplies.  This is a very
    reluctant change if we want to push this into Sarge, but
    kernel upgrades are going to be broken for people without it.

 -- Ron Lee <ron@debian.org>  Fri, 27 May 2005 16:56:43 +0930

cpad-kernel (0.9-5) unstable; urgency=high

  * Build fix and i18n updates only.  This should be considered
    for eligibility to Sarge.  High urgency because of the build
    trouble, though its mostly academic since testing is already
    frozen for automatic updates.
    release@d.o will be notified of this one upon upload.
  * Fix trouble with 2.6 builds causing the module to be built
    with the running kernel rather than the specified one, because
    cpad-2.6/Makefile and debian/rules used different version
  * Tidy up the .en wording of the 'moduleorder' debconf note.
    Existing translations are now fuzzy, but the spirit isn't really
    changed, and hopefully the translators already did better than I
    did with that one.  ;-)                          Closes: #310083
    - Added vi.po, thanks to Clytie Siddall.         Closes: #310082
    - Added cs.po, thanks to Martin Sin.             Closes: #306443

 -- Ron Lee <ron@debian.org>  Fri, 27 May 2005 15:17:29 +0930

Nothing else in the archive should depend on this package, so we
should be free to update or bounce it either way as appropriate
by the time someone gets to review this one.


Reply to: