Patchwork [Lucid-LBM,SRU] Fix stupid packaging bug for wwan and input

login
register
mail settings
Submitter Stefan Bader
Date July 21, 2011, 5:24 p.m.
Message ID <1311269063-16860-1-git-send-email-stefan.bader@canonical.com>
Download mbox | patch
Permalink /patch/106114/
State New
Headers show

Comments

Stefan Bader - July 21, 2011, 5:24 p.m.
SRU Justification:

Impact: Due to a missing $ in the rules file, the modules for the
input and wwan subpackages get picked up in a way that places the
server flavour in all of the flavours. This causes the modules to
fail loading on all flavours but the server one (could be slightly
Leann Ogasawara - July 21, 2011, 5:26 p.m.
On Thu, 2011-07-21 at 19:24 +0200, Stefan Bader wrote:
> SRU Justification:
> 
> Impact: Due to a missing $ in the rules file, the modules for the
> input and wwan subpackages get picked up in a way that places the
> server flavour in all of the flavours. This causes the modules to
> fail loading on all flavours but the server one (could be slightly
> different on i386 but similar broken).
> 
> Fix: Change the packaging script to look for the target flavour.
> 
> Testcase: Installing and modprobing fails with an error and modinfo
> would show a different flavour than intended.
> 
> -Stefan
> 
> ---
> 
> From d83cfb3cc4fcb09df86192e24028514c9d2157cb Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader@canonical.com>
> Date: Thu, 21 Jul 2011 19:18:40 +0200
> Subject: [PATCH] UBUNTU: SAUCE: Fix stupid packaging bug for wwan and input
> 
> Brown paper bag time for me. By missing a single but important
> $ the find picked up all the build flavours and only one would
> end up in the package. Not necessarily the one intended...
> 
> BugLink: http://bugs.launchpad.net/bugs/814186
> 
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>

> ---
>  debian/rules.d/2-binary-arch.mk |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index f97ec86..21aa0c8 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -180,7 +180,7 @@ endif
>  	# Build the wwan-drivers packages.
>  	#
>  	install -d $(wwmoddir)/updates/wwan
> -	find $(builddir)/build-*/wwan-drivers -type f -name '*.ko' |	       \
> +	find $(builddir)/build-$*/wwan-drivers -type f -name '*.ko' |	       \
>  	while read f; do						       \
>  		install -v $$f $(wwmoddir)/updates/wwan/;		       \
>  		strip --strip-debug $(wwmoddir)/updates/wwan/$$(basename $$f); \
> @@ -218,7 +218,7 @@ endif
>  	# Build the input-drivers package.
>  	#
>  	install -d $(immoddir)/updates/input
> -	find $(builddir)/build-*/input-drivers -type f -name '*.ko' |	       \
> +	find $(builddir)/build-$*/input-drivers -type f -name '*.ko' |	       \
>  	while read f; do						       \
>  		install -v $$f $(immoddir)/updates/input/;		       \
>  		strip --strip-debug $(immoddir)/updates/input/$$(basename $$f);\
> -- 
> 1.7.4.1
> 
>
Andy Whitcroft - July 21, 2011, 5:48 p.m.
On Thu, Jul 21, 2011 at 07:24:23PM +0200, Stefan Bader wrote:
> SRU Justification:
> 
> Impact: Due to a missing $ in the rules file, the modules for the
> input and wwan subpackages get picked up in a way that places the
> server flavour in all of the flavours. This causes the modules to
> fail loading on all flavours but the server one (could be slightly
> different on i386 but similar broken).
> 
> Fix: Change the packaging script to look for the target flavour.
> 
> Testcase: Installing and modprobing fails with an error and modinfo
> would show a different flavour than intended.
> 
> -Stefan
> 
> ---
> 
> From d83cfb3cc4fcb09df86192e24028514c9d2157cb Mon Sep 17 00:00:00 2001
> From: Stefan Bader <stefan.bader@canonical.com>
> Date: Thu, 21 Jul 2011 19:18:40 +0200
> Subject: [PATCH] UBUNTU: SAUCE: Fix stupid packaging bug for wwan and input
> 
> Brown paper bag time for me. By missing a single but important
> $ the find picked up all the build flavours and only one would
> end up in the package. Not necessarily the one intended...
> 
> BugLink: http://bugs.launchpad.net/bugs/814186
> 
> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
> ---
>  debian/rules.d/2-binary-arch.mk |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index f97ec86..21aa0c8 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -180,7 +180,7 @@ endif
>  	# Build the wwan-drivers packages.
>  	#
>  	install -d $(wwmoddir)/updates/wwan
> -	find $(builddir)/build-*/wwan-drivers -type f -name '*.ko' |	       \
> +	find $(builddir)/build-$*/wwan-drivers -type f -name '*.ko' |	       \
>  	while read f; do						       \
>  		install -v $$f $(wwmoddir)/updates/wwan/;		       \
>  		strip --strip-debug $(wwmoddir)/updates/wwan/$$(basename $$f); \
> @@ -218,7 +218,7 @@ endif
>  	# Build the input-drivers package.
>  	#
>  	install -d $(immoddir)/updates/input
> -	find $(builddir)/build-*/input-drivers -type f -name '*.ko' |	       \
> +	find $(builddir)/build-$*/input-drivers -type f -name '*.ko' |	       \
>  	while read f; do						       \
>  		install -v $$f $(immoddir)/updates/input/;		       \
>  		strip --strip-debug $(immoddir)/updates/input/$$(basename $$f);\

/me hands you a brown paper bag.

Clearly wrong, the fix seems appropriate.

Acked-by: Andy Whitcroft <apw@canonical.com>

-apw
Stefan Bader - July 21, 2011, 5:52 p.m.
Applied and pushed to lucid-lbm master

Patch

different on i386 but similar broken).

Fix: Change the packaging script to look for the target flavour.

Testcase: Installing and modprobing fails with an error and modinfo
would show a different flavour than intended.

-Stefan

---

From d83cfb3cc4fcb09df86192e24028514c9d2157cb Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Thu, 21 Jul 2011 19:18:40 +0200
Subject: [PATCH] UBUNTU: SAUCE: Fix stupid packaging bug for wwan and input

Brown paper bag time for me. By missing a single but important
$ the find picked up all the build flavours and only one would
end up in the package. Not necessarily the one intended...

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

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 debian/rules.d/2-binary-arch.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index f97ec86..21aa0c8 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -180,7 +180,7 @@  endif
 	# Build the wwan-drivers packages.
 	#
 	install -d $(wwmoddir)/updates/wwan
-	find $(builddir)/build-*/wwan-drivers -type f -name '*.ko' |	       \
+	find $(builddir)/build-$*/wwan-drivers -type f -name '*.ko' |	       \
 	while read f; do						       \
 		install -v $$f $(wwmoddir)/updates/wwan/;		       \
 		strip --strip-debug $(wwmoddir)/updates/wwan/$$(basename $$f); \
@@ -218,7 +218,7 @@  endif
 	# Build the input-drivers package.
 	#
 	install -d $(immoddir)/updates/input
-	find $(builddir)/build-*/input-drivers -type f -name '*.ko' |	       \
+	find $(builddir)/build-$*/input-drivers -type f -name '*.ko' |	       \
 	while read f; do						       \
 		install -v $$f $(immoddir)/updates/input/;		       \
 		strip --strip-debug $(immoddir)/updates/input/$$(basename $$f);\