[PATCH 0/2] [P/omap4] debian.ti-omap4/control* housekeeping

[Paolo Pisati-5]

A fix and a cleanup for debian.ti-omap4/control.stub&c:

1) make linux-ti-omap4-headers provide linux-headers (thus fixing packages depending on it like dkms)

2) garbage collect unused entries

BugLink: http://bugs.launchpad.net/bugs/960770

Paolo Pisati (2):
  UBUNTU: linux-ti-omap4-headers provides linux-headers too
  UBUNTU: gargabe collect unused entries in control.stub.in

 debian.ti-omap4/control.d/flavour-control.stub |    4 +-
 debian.ti-omap4/control.stub.in                |   61 +-----------------------
 2 files changed, 3 insertions(+), 62 deletions(-)

--
1.7.9.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Paolo Pisati-5]

And while here switch kernel version from 2.6 to 3.

Signed-off-by: Paolo Pisati <[hidden email]>
---
 debian.ti-omap4/control.d/flavour-control.stub |    4 ++--
 debian.ti-omap4/control.stub.in                |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian.ti-omap4/control.d/flavour-control.stub b/debian.ti-omap4/control.d/flavour-control.stub
index e41051e..82d8e6c 100644
--- a/debian.ti-omap4/control.d/flavour-control.stub
+++ b/debian.ti-omap4/control.d/flavour-control.stub
@@ -26,7 +26,7 @@ Architecture: ARCH
 Section: kernel
 Priority: optional
 Pre-Depends: dpkg (>= 1.10.24)
-Provides: linux-image, linux-image-2.6, fuse-module, =PROVIDES=
+Provides: linux-image, linux-image-3, fuse-module, =PROVIDES=
 Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), crda (>= 1.1.1-1ubuntu2) | wireless-crda
 Conflicts: hotplug (<< 0.0.20040105-1)
 Recommends: BOOTLOADER
@@ -52,7 +52,7 @@ Architecture: ARCH
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0), linux-headers-PKGVER-ABINUM, ${shlibs:Depends}
-Provides: SRCPKGNAME-headers, SRCPKGNAME-headers-2.6
+Provides: linux-headers, linux-headers-3, SRCPKGNAME-headers, SRCPKGNAME-headers-3
 Description: Linux kernel headers for version PKGVER on DESC
  This package provides kernel header files for version PKGVER on
  DESC.
diff --git a/debian.ti-omap4/control.stub.in b/debian.ti-omap4/control.stub.in
index 3a47de5..fb62bfe 100644
--- a/debian.ti-omap4/control.stub.in
+++ b/debian.ti-omap4/control.stub.in
@@ -60,7 +60,7 @@ Architecture: armel armhf
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, coreutils | fileutils (>= 4.0)
-Provides: SRCPKGNAME-headers, SRCPKGNAME-headers-2.6
+Provides: linux-headers, linux-headers-3, SRCPKGNAME-headers, SRCPKGNAME-headers-3
 Description: Header files related to Linux kernel version PKGVER
  This package provides kernel header files for version PKGVER, for sites
  that want the latest kernel headers. Please read
--
1.7.9.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Paolo Pisati-5]

Signed-off-by: Paolo Pisati <[hidden email]>
---
 debian.ti-omap4/control.stub.in |   59 ---------------------------------------
 1 files changed, 0 insertions(+), 59 deletions(-)

diff --git a/debian.ti-omap4/control.stub.in b/debian.ti-omap4/control.stub.in
index fb62bfe..dd29130 100644
--- a/debian.ti-omap4/control.stub.in
+++ b/debian.ti-omap4/control.stub.in
@@ -8,53 +8,6 @@ Build-Depends-Indep: xmlto, docbook-utils, ghostscript, transfig, bzip2, sharuti
 Build-Conflicts: findutils (= 4.4.1-1ubuntu1)
 Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-maverick.git
 
-#Package: SRCPKGNAME-source-PKGVER
-#Architecture: all
-#Section: devel
-#Priority: optional
-#Provides: SRCPKGNAME-source, SRCPKGNAME-source-2.6
-#Depends: ${misc:Depends}, binutils, bzip2, coreutils | fileutils (>= 4.0)
-#Recommends: libc-dev, gcc, make
-#Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev
-#Description: Linux kernel source for version PKGVER with Ubuntu patches
-# This package provides the source code for the Linux kernel version
-# PKGVER.
-# .
-# This package is mainly meant for other packages to use, in order to build
-# custom flavours.
-# .
-# If you wish to use this package to create a custom Linux kernel, then it
-# is suggested that you investigate the package kernel-package, which has
-# been designed to ease the task of creating kernel image packages.
-# .
-# If you are simply trying to build third-party modules for your kernel,
-# you do not want this package. Install the appropriate linux-headers
-# package instead.
-
-#Package: SRCPKGNAME-doc
-#Architecture: all
-#Section: doc
-#Priority: optional
-#Depends: ${misc:Depends}
-#Conflicts: SRCPKGNAME-doc-2.6
-#Replaces: SRCPKGNAME-doc-2.6
-#Description: Linux kernel specific documentation for version PKGVER
-# This package provides the various documents in the PKGVER kernel
-# Documentation/ subdirectory.  These document kernel subsystems, APIs, device
-# drivers, and so on.  See
-# /usr/share/doc/SRCPKGNAME-doc/00-INDEX for a list of what is
-# contained in each file.
-
-#Package: SRCPKGNAME-tools-common
-#Architecture: all
-#Section: admin
-#Priority: optional
-#Depends: ${misc:Depends}
-#Replaces: SRCPKGNAME-tools (<= 2.6.32-16.25)
-#Description: Linux kernel specific tools for version PKGVER
-# This package provides the architecture independent parts for kernel
-# version locked tools in the PKGVER kernel source.
-
 Package: linux-headers-PKGVER-ABINUM
 Architecture: armel armhf
 Section: devel
@@ -66,18 +19,6 @@ Description: Header files related to Linux kernel version PKGVER
  that want the latest kernel headers. Please read
  /usr/share/doc/linux-headers-PKGVER-ABINUM/debian.README.gz for details
 
-#Package: linux-libc-dev
-#Architecture: armel armhf
-#Depends: ${misc:Depends}
-#Conflicts: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), amd64-libs-dev (<= 1.1), SRCPKGNAME-kernel-headers
-#Replaces: libc6-dev (<< 2.3.2.ds1-6), libc6.1-dev (<< 2.3.2.ds1-6), dvb-dev (<< 1.0.1-6), SRCPKGNAME-kernel-headers, libdrm-dev
-#Provides: SRCPKGNAME-kernel-headers
-#Description: Linux Kernel Headers for development
-# This package provides headers from the Linux kernel.  These headers
-# are used by the installed headers for GNU glibc and other system
-# libraries. They are NOT meant to be used to build third-party modules for
-# your kernel. Use SRCPKGNAME-headers-* packages for that.
-
 Package: SRCPKGNAME-tools-PKGVER-ABINUM
 Architecture: armel armhf
 Section: devel
--
1.7.9.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Tim Gardner-8]

On 03/22/2012 06:11 AM, Paolo Pisati wrote:

> A fix and a cleanup for debian.ti-omap4/control.stub&c:
>
> 1) make linux-ti-omap4-headers provide linux-headers (thus fixing packages depending on it like dkms)
>
> 2) garbage collect unused entries
>
> BugLink: http://bugs.launchpad.net/bugs/960770
>
> Paolo Pisati (2):
>    UBUNTU: linux-ti-omap4-headers provides linux-headers too
>    UBUNTU: gargabe collect unused entries in control.stub.in
>
>   debian.ti-omap4/control.d/flavour-control.stub |    4 +-
>   debian.ti-omap4/control.stub.in                |   61 +-----------------------
>   2 files changed, 3 insertions(+), 62 deletions(-)
>

Ricardo - I think the correct fix for this is to add omap4 specific
recommends to dkms. Can you add this patch to dkms and give it a try ?

rtg
--
Tim Gardner [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Ricardo Salveti de Araujo-7]

On Thu, Mar 22, 2012 at 4:12 PM, Tim Gardner <[hidden email]> wrote:

> On 03/22/2012 06:11 AM, Paolo Pisati wrote:
>>
>> A fix and a cleanup for debian.ti-omap4/control.stub&c:
>>
>> 1) make linux-ti-omap4-headers provide linux-headers (thus fixing packages
>> depending on it like dkms)
>>
>> 2) garbage collect unused entries
>>
>> BugLink: http://bugs.launchpad.net/bugs/960770
>>
>> Paolo Pisati (2):
>>   UBUNTU: linux-ti-omap4-headers provides linux-headers too
>>   UBUNTU: gargabe collect unused entries in control.stub.in
>>
>>  debian.ti-omap4/control.d/flavour-control.stub |    4 +-
>>  debian.ti-omap4/control.stub.in                |   61
>> +-----------------------
>>  2 files changed, 3 insertions(+), 62 deletions(-)
>>
>
> Ricardo - I think the correct fix for this is to add omap4 specific
> recommends to dkms. Can you add this patch to dkms and give it a try ?

We could, but then the question is why this package should not provide
linux-headers?

I know it's not coming from the official tree, but as this will happen
with all the flavours we currently have (armada, ac100, linaro, etc).
It might be good to fix it for all by just expecting the
flavour-linux-headers to also provide linux-headers itself.

What do you say?

Thanks,
--
Ricardo Salveti de Araujo

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Tim Gardner-2]

On 03/22/2012 01:16 PM, Ricardo Salveti wrote:

> On Thu, Mar 22, 2012 at 4:12 PM, Tim Gardner <[hidden email]> wrote:
>> On 03/22/2012 06:11 AM, Paolo Pisati wrote:
>>>
>>> A fix and a cleanup for debian.ti-omap4/control.stub&c:
>>>
>>> 1) make linux-ti-omap4-headers provide linux-headers (thus fixing packages
>>> depending on it like dkms)
>>>
>>> 2) garbage collect unused entries
>>>
>>> BugLink: http://bugs.launchpad.net/bugs/960770
>>>
>>> Paolo Pisati (2):
>>>   UBUNTU: linux-ti-omap4-headers provides linux-headers too
>>>   UBUNTU: gargabe collect unused entries in control.stub.in
>>>
>>>  debian.ti-omap4/control.d/flavour-control.stub |    4 +-
>>>  debian.ti-omap4/control.stub.in                |   61
>>> +-----------------------
>>>  2 files changed, 3 insertions(+), 62 deletions(-)
>>>
>>
>> Ricardo - I think the correct fix for this is to add omap4 specific
>> recommends to dkms. Can you add this patch to dkms and give it a try ?
>
> We could, but then the question is why this package should not provide
> linux-headers?
>
> I know it's not coming from the official tree, but as this will happen
> with all the flavours we currently have (armada, ac100, linaro, etc).
> It might be good to fix it for all by just expecting the
> flavour-linux-headers to also provide linux-headers itself.
>
> What do you say?
>
> Thanks,

I don't think its the right solution. According to the Debian Policy
manual Provides: is meant to maintain the dependency graph when a newer
(and renamed) package provides the same support.

In this case, your powervr dkms package has a hard dependency on
linux-headers-omap4, and there is no other package that provides that
support.

I think the real issue are the Recommends: in the dkms package itself.
Given that it is now being used with a variety of kernels, the
recommendations are kind of bogus. Adding a new linux-image* and
linux-headers* recommendation for every new flavour of kernel doesn't
really scale. If dkms dropped all of its recommendations then I don't
think you'd be having the issue where apt-get wants to install
superfluous packages.

rtg
--
Tim Gardner [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team