Patchwork [Quantal,SRU,pull-request] Misc linux-backports-modules cleanup

login
register
mail settings
Submitter Leann Ogasawara
Date Oct. 19, 2012, 1:49 p.m.
Message ID <50815A73.7030201@canonical.com>
Download mbox | patch
Permalink /patch/192702/
State New
Headers show

Comments

Leann Ogasawara - Oct. 19, 2012, 1:49 p.m.
On 10/19/2012 05:40 AM, Tim Gardner wrote:
> On 10/18/2012 03:00 PM, Leann Ogasawara wrote:
>> BugLink: http://bugs.launchpad.net/bugs/1068125
>> BugLink: http://bugs.launchpad.net/bugs/1068283
>>
>> == Quantal SRU Justification ==
>> The following pull request performs some misc cleanup for the
>> linux-backports-modules package for Quantal.
>>
>> The first patch makes the compat-wireless firmware udev helper file
>> names version and ABI specific.  We allow multiple upstream versions of
>> the compat-wireless stack to be packaged and installed.  There currently
>> exists a potential for conflicts with some of the compat-wireless
>> firmware udev helper file names due to the files only being ABI
>> specific, but not version specific, with respect to their naming
>> convention.  Fix this by making these both version and ABI specific.
>>
>
> I am not convinced this is necessary. All subsequent CW packages
> _must_ conflict, therefore you can never get into a state of clashing
> udev firmware helpers. Refer to the complex conflict relationships in
> Lucid LBM.

Hrm, seems we need our Conflicts: set up for Precise LBM too.  But
that's beyond the scope of this patch set.  I'll send a follow on patch
for that.

> Its possible that you could get into trouble if you force installed a
> kernel and CW package from another release that had the same ABI. To
> avoid that conflict you'd have to distinguish the udev helpers names
> by release name _and_ ABI. I'm not sure that scenario is worth the
> complexity.

While I agree it's not a common scenario to encounter, it seemed a
harmless enough change to at least prevent a potential conflict and
issue.  We already make the udev helper file names ABI and flavor
specific, so why not take that extra precaution and tack on the release
version as well.

>
>> The second patch removes all udebs and udeb creation logic from LBM.
>> LBM is an elective install and not part of any default server or netboot
>> installation.  It is therefore unnecessary to provide an
>> updates-modules.udeb (it was empty anyways) nor have anything to do with
>> udeb creation in general for that matter.
>>
>
> Shouldn't this patch also remove debian/d-i ?

Yep, I totally missed the obvious there.  We no longer have a need for
the kernel-versions.in file that remains in d-i.  The following patch
removes d-i/kernel-versions.in and cleans up any misc references to it
as well.  Once that's removed, git takes care of the rest for getting
rid of d-i.  I've pushed this to my pull-request branch.  Let me know if
you prefer I just squash it with the original patch.

Thanks,
Leann

From baa3fce92747794552eca1806ed73727baf32142 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 19 Oct 2012 06:31:08 -0700
Subject: [PATCH] UBUNTU: Remove debian/d-i

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

LBM is an elective install and not part of any default server or netboot
installation.  We should remove debian/d-i as it is unnecessary.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 debian/d-i/kernel-versions.in |    4 ----
 debian/rules                  |    5 ++---
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 debian/d-i/kernel-versions.in
Tim Gardner - Oct. 19, 2012, 2:44 p.m.
On 10/19/2012 07:49 AM, Leann Ogasawara wrote:
> On 10/19/2012 05:40 AM, Tim Gardner wrote:
>> On 10/18/2012 03:00 PM, Leann Ogasawara wrote:
>>> BugLink: http://bugs.launchpad.net/bugs/1068125
>>> BugLink: http://bugs.launchpad.net/bugs/1068283
>>>
>>> == Quantal SRU Justification ==
>>> The following pull request performs some misc cleanup for the
>>> linux-backports-modules package for Quantal.
>>>
>>> The first patch makes the compat-wireless firmware udev helper file
>>> names version and ABI specific.  We allow multiple upstream versions of
>>> the compat-wireless stack to be packaged and installed.  There currently
>>> exists a potential for conflicts with some of the compat-wireless
>>> firmware udev helper file names due to the files only being ABI
>>> specific, but not version specific, with respect to their naming
>>> convention.  Fix this by making these both version and ABI specific.
>>>
>>
>> I am not convinced this is necessary. All subsequent CW packages
>> _must_ conflict, therefore you can never get into a state of clashing
>> udev firmware helpers. Refer to the complex conflict relationships in
>> Lucid LBM.
> 
> Hrm, seems we need our Conflicts: set up for Precise LBM too.  But
> that's beyond the scope of this patch set.  I'll send a follow on patch
> for that.
> 

There is no use having a 'Conflicts:' until there is a package with
which to conflict, i.e., compat-wireless-3.7.

>> Its possible that you could get into trouble if you force installed a
>> kernel and CW package from another release that had the same ABI. To
>> avoid that conflict you'd have to distinguish the udev helpers names
>> by release name _and_ ABI. I'm not sure that scenario is worth the
>> complexity.
> 
> While I agree it's not a common scenario to encounter, it seemed a
> harmless enough change to at least prevent a potential conflict and
> issue.  We already make the udev helper file names ABI and flavor
> specific, so why not take that extra precaution and tack on the release
> version as well.
> 

Because its pedantic and OCD ? Because it solves a problem that cannot
exist ?

>>
>>> The second patch removes all udebs and udeb creation logic from LBM.
>>> LBM is an elective install and not part of any default server or netboot
>>> installation.  It is therefore unnecessary to provide an
>>> updates-modules.udeb (it was empty anyways) nor have anything to do with
>>> udeb creation in general for that matter.
>>>
>>
>> Shouldn't this patch also remove debian/d-i ?
> 
> Yep, I totally missed the obvious there.  We no longer have a need for
> the kernel-versions.in file that remains in d-i.  The following patch
> removes d-i/kernel-versions.in and cleans up any misc references to it
> as well.  Once that's removed, git takes care of the rest for getting
> rid of d-i.  I've pushed this to my pull-request branch.  Let me know if
> you prefer I just squash it with the original patch.
> 
> Thanks,
> Leann
> 
> From baa3fce92747794552eca1806ed73727baf32142 Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara@canonical.com>
> Date: Fri, 19 Oct 2012 06:31:08 -0700
> Subject: [PATCH] UBUNTU: Remove debian/d-i
> 
> BugLink: http://bugs.launchpad.net/bugs/1068125
> 
> LBM is an elective install and not part of any default server or netboot
> installation.  We should remove debian/d-i as it is unnecessary.
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> ---
>  debian/d-i/kernel-versions.in |    4 ----
>  debian/rules                  |    5 ++---
>  2 files changed, 2 insertions(+), 7 deletions(-)
>  delete mode 100644 debian/d-i/kernel-versions.in
> 
> diff --git a/debian/d-i/kernel-versions.in b/debian/d-i/kernel-versions.in
> deleted file mode 100644
> index 78e02fa..0000000
> --- a/debian/d-i/kernel-versions.in
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# arch	version		flavour		installedname			suffix	bdep
> -amd64	PKGVER-ABINUM	generic		PKGVER-ABINUM-generic		-	
> -i386	PKGVER-ABINUM	generic		PKGVER-ABINUM-generic		-	
> -lpia	PKGVER-ABINUM	lpia		PKGVER-ABINUM-lpia		-	
> diff --git a/debian/rules b/debian/rules
> index a8a5fb2..83de94c 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -54,12 +54,11 @@ clean: debian/control.stub
>  include debian/rules.d/2-binary-arch.mk
>  
>  # Misc stuff
> -debian/control.stub: debian/d-i/kernel-versions.in	\
> -		debian/scripts/control-create		\
> +debian/control.stub: debian/scripts/control-create		\
>  		debian/control.stub.in			\
>  		debian/changelog			\
>  		$(wildcard debian/control.d/*)
> -	for i in debian/d-i/kernel-versions.in debian/control.stub.in; do	\
> +	for i in debian/control.stub.in; do					\
>  	  new=`echo $$i | sed 's/\.in$$//'`;					\
>  	  cat $$i | sed -e 's/PKGVER/$(pkgversion)/g' -e 's/ABINUM/$(abinum)/g' > \
>  		$$new;								\
> 

Applied 'UBUNTU: Remove udebs and udeb creation logic' and 'UBUNTU:
Remove debian/d-i'
Leann Ogasawara - Oct. 19, 2012, 3:50 p.m.
On 10/19/2012 07:44 AM, Tim Gardner wrote:
> On 10/19/2012 07:49 AM, Leann Ogasawara wrote:
>> On 10/19/2012 05:40 AM, Tim Gardner wrote:
>>> On 10/18/2012 03:00 PM, Leann Ogasawara wrote:
>>>> BugLink: http://bugs.launchpad.net/bugs/1068125
>>>> BugLink: http://bugs.launchpad.net/bugs/1068283
>>>>
>>>> == Quantal SRU Justification ==
>>>> The following pull request performs some misc cleanup for the
>>>> linux-backports-modules package for Quantal.
>>>>
>>>> The first patch makes the compat-wireless firmware udev helper file
>>>> names version and ABI specific.  We allow multiple upstream versions of
>>>> the compat-wireless stack to be packaged and installed.  There currently
>>>> exists a potential for conflicts with some of the compat-wireless
>>>> firmware udev helper file names due to the files only being ABI
>>>> specific, but not version specific, with respect to their naming
>>>> convention.  Fix this by making these both version and ABI specific.
>>>>
>>> I am not convinced this is necessary. All subsequent CW packages
>>> _must_ conflict, therefore you can never get into a state of clashing
>>> udev firmware helpers. Refer to the complex conflict relationships in
>>> Lucid LBM.
>> Hrm, seems we need our Conflicts: set up for Precise LBM too.  But
>> that's beyond the scope of this patch set.  I'll send a follow on patch
>> for that.
>>
> There is no use having a 'Conflicts:' until there is a package with
> which to conflict, i.e., compat-wireless-3.7.

Indeed for Quantal LBM that's the case.  For Precise LBM though we
already have cw-3.3, cw-3.4, cw-3.5, and cw-3.6 but no Conflicts set for
any of them.

>
>>> Its possible that you could get into trouble if you force installed a
>>> kernel and CW package from another release that had the same ABI. To
>>> avoid that conflict you'd have to distinguish the udev helpers names
>>> by release name _and_ ABI. I'm not sure that scenario is worth the
>>> complexity.
>> While I agree it's not a common scenario to encounter, it seemed a
>> harmless enough change to at least prevent a potential conflict and
>> issue.  We already make the udev helper file names ABI and flavor
>> specific, so why not take that extra precaution and tack on the release
>> version as well.
>>
> Because its pedantic and OCD ? Because it solves a problem that cannot
> exist ?

To be honest, I'm ambivalent to the change so am fine if we ignore it.

>
>>>> The second patch removes all udebs and udeb creation logic from LBM.
>>>> LBM is an elective install and not part of any default server or netboot
>>>> installation.  It is therefore unnecessary to provide an
>>>> updates-modules.udeb (it was empty anyways) nor have anything to do with
>>>> udeb creation in general for that matter.
>>>>
>>> Shouldn't this patch also remove debian/d-i ?
>> Yep, I totally missed the obvious there.  We no longer have a need for
>> the kernel-versions.in file that remains in d-i.  The following patch
>> removes d-i/kernel-versions.in and cleans up any misc references to it
>> as well.  Once that's removed, git takes care of the rest for getting
>> rid of d-i.  I've pushed this to my pull-request branch.  Let me know if
>> you prefer I just squash it with the original patch.
>>
>> Thanks,
>> Leann
>>
>> From baa3fce92747794552eca1806ed73727baf32142 Mon Sep 17 00:00:00 2001
>> From: Leann Ogasawara <leann.ogasawara@canonical.com>
>> Date: Fri, 19 Oct 2012 06:31:08 -0700
>> Subject: [PATCH] UBUNTU: Remove debian/d-i
>>
>> BugLink: http://bugs.launchpad.net/bugs/1068125
>>
>> LBM is an elective install and not part of any default server or netboot
>> installation.  We should remove debian/d-i as it is unnecessary.
>>
>> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
>> ---
>>  debian/d-i/kernel-versions.in |    4 ----
>>  debian/rules                  |    5 ++---
>>  2 files changed, 2 insertions(+), 7 deletions(-)
>>  delete mode 100644 debian/d-i/kernel-versions.in
>>
>> diff --git a/debian/d-i/kernel-versions.in b/debian/d-i/kernel-versions.in
>> deleted file mode 100644
>> index 78e02fa..0000000
>> --- a/debian/d-i/kernel-versions.in
>> +++ /dev/null
>> @@ -1,4 +0,0 @@
>> -# arch	version		flavour		installedname			suffix	bdep
>> -amd64	PKGVER-ABINUM	generic		PKGVER-ABINUM-generic		-	
>> -i386	PKGVER-ABINUM	generic		PKGVER-ABINUM-generic		-	
>> -lpia	PKGVER-ABINUM	lpia		PKGVER-ABINUM-lpia		-	
>> diff --git a/debian/rules b/debian/rules
>> index a8a5fb2..83de94c 100755
>> --- a/debian/rules
>> +++ b/debian/rules
>> @@ -54,12 +54,11 @@ clean: debian/control.stub
>>  include debian/rules.d/2-binary-arch.mk
>>  
>>  # Misc stuff
>> -debian/control.stub: debian/d-i/kernel-versions.in	\
>> -		debian/scripts/control-create		\
>> +debian/control.stub: debian/scripts/control-create		\
>>  		debian/control.stub.in			\
>>  		debian/changelog			\
>>  		$(wildcard debian/control.d/*)
>> -	for i in debian/d-i/kernel-versions.in debian/control.stub.in; do	\
>> +	for i in debian/control.stub.in; do					\
>>  	  new=`echo $$i | sed 's/\.in$$//'`;					\
>>  	  cat $$i | sed -e 's/PKGVER/$(pkgversion)/g' -e 's/ABINUM/$(abinum)/g' > \
>>  		$$new;								\
>>
> Applied 'UBUNTU: Remove udebs and udeb creation logic' and 'UBUNTU:
> Remove debian/d-i'
>

Thanks,
Leann
Tim Gardner - Oct. 19, 2012, 3:54 p.m.
On 10/19/2012 09:50 AM, Leann Ogasawara wrote:
> On 10/19/2012 07:44 AM, Tim Gardner wrote:
>> On 10/19/2012 07:49 AM, Leann Ogasawara wrote:
>>> On 10/19/2012 05:40 AM, Tim Gardner wrote:
>>>> On 10/18/2012 03:00 PM, Leann Ogasawara wrote:
>>>>> BugLink: http://bugs.launchpad.net/bugs/1068125
>>>>> BugLink: http://bugs.launchpad.net/bugs/1068283
>>>>>
>>>>> == Quantal SRU Justification ==
>>>>> The following pull request performs some misc cleanup for the
>>>>> linux-backports-modules package for Quantal.
>>>>>
>>>>> The first patch makes the compat-wireless firmware udev helper file
>>>>> names version and ABI specific.  We allow multiple upstream versions of
>>>>> the compat-wireless stack to be packaged and installed.  There currently
>>>>> exists a potential for conflicts with some of the compat-wireless
>>>>> firmware udev helper file names due to the files only being ABI
>>>>> specific, but not version specific, with respect to their naming
>>>>> convention.  Fix this by making these both version and ABI specific.
>>>>>
>>>> I am not convinced this is necessary. All subsequent CW packages
>>>> _must_ conflict, therefore you can never get into a state of clashing
>>>> udev firmware helpers. Refer to the complex conflict relationships in
>>>> Lucid LBM.
>>> Hrm, seems we need our Conflicts: set up for Precise LBM too.  But
>>> that's beyond the scope of this patch set.  I'll send a follow on patch
>>> for that.
>>>
>> There is no use having a 'Conflicts:' until there is a package with
>> which to conflict, i.e., compat-wireless-3.7.
> 
> Indeed for Quantal LBM that's the case.  For Precise LBM though we
> already have cw-3.3, cw-3.4, cw-3.5, and cw-3.6 but no Conflicts set for
> any of them.
> 

Whoops. There is a disaster waiting for a place to happen. You gonna
write that patch ?

rtg
Leann Ogasawara - Oct. 19, 2012, 4:12 p.m.
On 10/19/2012 08:54 AM, Tim Gardner wrote:
> On 10/19/2012 09:50 AM, Leann Ogasawara wrote:
>> On 10/19/2012 07:44 AM, Tim Gardner wrote:
>>> On 10/19/2012 07:49 AM, Leann Ogasawara wrote:
>>>> On 10/19/2012 05:40 AM, Tim Gardner wrote:
>>>>> On 10/18/2012 03:00 PM, Leann Ogasawara wrote:
>>>>>> BugLink: http://bugs.launchpad.net/bugs/1068125
>>>>>> BugLink: http://bugs.launchpad.net/bugs/1068283
>>>>>>
>>>>>> == Quantal SRU Justification ==
>>>>>> The following pull request performs some misc cleanup for the
>>>>>> linux-backports-modules package for Quantal.
>>>>>>
>>>>>> The first patch makes the compat-wireless firmware udev helper file
>>>>>> names version and ABI specific.  We allow multiple upstream versions of
>>>>>> the compat-wireless stack to be packaged and installed.  There currently
>>>>>> exists a potential for conflicts with some of the compat-wireless
>>>>>> firmware udev helper file names due to the files only being ABI
>>>>>> specific, but not version specific, with respect to their naming
>>>>>> convention.  Fix this by making these both version and ABI specific.
>>>>>>
>>>>> I am not convinced this is necessary. All subsequent CW packages
>>>>> _must_ conflict, therefore you can never get into a state of clashing
>>>>> udev firmware helpers. Refer to the complex conflict relationships in
>>>>> Lucid LBM.
>>>> Hrm, seems we need our Conflicts: set up for Precise LBM too.  But
>>>> that's beyond the scope of this patch set.  I'll send a follow on patch
>>>> for that.
>>>>
>>> There is no use having a 'Conflicts:' until there is a package with
>>> which to conflict, i.e., compat-wireless-3.7.
>> Indeed for Quantal LBM that's the case.  For Precise LBM though we
>> already have cw-3.3, cw-3.4, cw-3.5, and cw-3.6 but no Conflicts set for
>> any of them.
>>
> Whoops. There is a disaster waiting for a place to happen. You gonna
> write that patch ?

Yep.  I'll get it sent to the list shortly.

Thanks,
Leann

Patch

diff --git a/debian/d-i/kernel-versions.in b/debian/d-i/kernel-versions.in
deleted file mode 100644
index 78e02fa..0000000
--- a/debian/d-i/kernel-versions.in
+++ /dev/null
@@ -1,4 +0,0 @@ 
-# arch	version		flavour		installedname			suffix	bdep
-amd64	PKGVER-ABINUM	generic		PKGVER-ABINUM-generic		-	
-i386	PKGVER-ABINUM	generic		PKGVER-ABINUM-generic		-	
-lpia	PKGVER-ABINUM	lpia		PKGVER-ABINUM-lpia		-	
diff --git a/debian/rules b/debian/rules
index a8a5fb2..83de94c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,12 +54,11 @@  clean: debian/control.stub
 include debian/rules.d/2-binary-arch.mk
 
 # Misc stuff
-debian/control.stub: debian/d-i/kernel-versions.in	\
-		debian/scripts/control-create		\
+debian/control.stub: debian/scripts/control-create		\
 		debian/control.stub.in			\
 		debian/changelog			\
 		$(wildcard debian/control.d/*)
-	for i in debian/d-i/kernel-versions.in debian/control.stub.in; do	\
+	for i in debian/control.stub.in; do					\
 	  new=`echo $$i | sed 's/\.in$$//'`;					\
 	  cat $$i | sed -e 's/PKGVER/$(pkgversion)/g' -e 's/ABINUM/$(abinum)/g' > \
 		$$new;								\