Patchwork [1/1] UBUNTU: [Config] control.stub is an intermediate product not a dependancy

login
register
mail settings
Submitter Andy Whitcroft
Date May 2, 2012, 4:58 p.m.
Message ID <1335977914-24255-2-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/156492/
State New
Headers show

Comments

Andy Whitcroft - May 2, 2012, 4:58 p.m.
We want to make sure we always regenerate both control and control.stub
whenever we clean.  Otherwise the buildd will use the version of
control.stub generated when we are building the source package.

BugLink: http://bugs.launchpad.net/bugs/992414
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/rules |    1 +
 1 file changed, 1 insertion(+)
Leann Ogasawara - May 2, 2012, 5:10 p.m.
On 05/02/2012 09:58 AM, Andy Whitcroft wrote:
> We want to make sure we always regenerate both control and control.stub
> whenever we clean.  Otherwise the buildd will use the version of
> control.stub generated when we are building the source package.
>
> BugLink: http://bugs.launchpad.net/bugs/992414
> Signed-off-by: Andy Whitcroft<apw@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
> ---
>   debian/rules |    1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/debian/rules b/debian/rules
> index 479b759..c348f3a 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -82,6 +82,7 @@ include $(DROOT)/rules.d/3-binary-indep.mk
>   include $(DROOT)/rules.d/4-checks.mk
>
>   # Misc stuff
> +.PHONY: $(DEBIAN)/control.stub
>   $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in	\
>   		$(DROOT)/scripts/control-create		\
>   		$(DEBIAN)/control.stub.in			\
Tim Gardner - May 2, 2012, 5:18 p.m.
On 05/02/2012 10:58 AM, Andy Whitcroft wrote:
> We want to make sure we always regenerate both control and control.stub
> whenever we clean.  Otherwise the buildd will use the version of
> control.stub generated when we are building the source package.
> 
> BugLink: http://bugs.launchpad.net/bugs/992414
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
> ---
>  debian/rules |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/debian/rules b/debian/rules
> index 479b759..c348f3a 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -82,6 +82,7 @@ include $(DROOT)/rules.d/3-binary-indep.mk
>  include $(DROOT)/rules.d/4-checks.mk
>  
>  # Misc stuff
> +.PHONY: $(DEBIAN)/control.stub
>  $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in	\
>  		$(DROOT)/scripts/control-create		\
>  		$(DEBIAN)/control.stub.in			\

We could likely run this patch (or some variant) all the way back to Hardy.

rtg

Patch

diff --git a/debian/rules b/debian/rules
index 479b759..c348f3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,7 @@  include $(DROOT)/rules.d/3-binary-indep.mk
 include $(DROOT)/rules.d/4-checks.mk
 
 # Misc stuff
+.PHONY: $(DEBIAN)/control.stub
 $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in	\
 		$(DROOT)/scripts/control-create		\
 		$(DEBIAN)/control.stub.in			\