Patchwork [lucid/fsl-imx51] UBUNTU: [Config] Use debian.env earlier

login
register
mail settings
Submitter Herton Ronaldo Krzesinski
Date Oct. 14, 2011, 5:57 p.m.
Message ID <1318615031-5667-2-git-send-email-herton.krzesinski@canonical.com>
Download mbox | patch
Permalink /patch/119881/
State New
Headers show

Comments

Herton Ronaldo Krzesinski - Oct. 14, 2011, 5:57 p.m.
From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>

Until now, we were creating debian.env upon first debian/rules run. This
is incompatible with our tools, which expects debian.env to be available
always, commited in the repository. This is a minimal change to have
always debian.env present (ideally we could move debian.fsl-imx51/rules
to debian/rules, but not doing this at this stage for fsl-imx51).

Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
---
 debian.fsl-imx51/rules |    2 +-
 debian/debian.env      |    1 +
 debian/rules           |    5 +----
 3 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 debian/debian.env
Tim Gardner - Oct. 15, 2011, 10:24 a.m.
On 10/14/2011 06:57 PM, Herton R. Krzesinski wrote:
> From: Herton Ronaldo Krzesinski<herton.krzesinski@canonical.com>
>
> Until now, we were creating debian.env upon first debian/rules run. This
> is incompatible with our tools, which expects debian.env to be available
> always, commited in the repository. This is a minimal change to have
> always debian.env present (ideally we could move debian.fsl-imx51/rules
> to debian/rules, but not doing this at this stage for fsl-imx51).
>
> Signed-off-by: Herton Ronaldo Krzesinski<herton.krzesinski@canonical.com>
> ---
>   debian.fsl-imx51/rules |    2 +-
>   debian/debian.env      |    1 +
>   debian/rules           |    5 +----
>   3 files changed, 3 insertions(+), 5 deletions(-)
>   create mode 100644 debian/debian.env
>
> diff --git a/debian.fsl-imx51/rules b/debian.fsl-imx51/rules
> index a948445..b2a4573 100755
> --- a/debian.fsl-imx51/rules
> +++ b/debian.fsl-imx51/rules
> @@ -8,7 +8,7 @@
>   #
>
>   ifeq ($(DEBIAN),)
> -DEBIAN=debian.fsl-imx51
> +DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }'<debian/debian.env)
>   endif
>
>   # dpkg-buildpackage passes options that are incomptatible
> diff --git a/debian/debian.env b/debian/debian.env
> new file mode 100644
> index 0000000..8da47bb
> --- /dev/null
> +++ b/debian/debian.env
> @@ -0,0 +1 @@
> +DEBIAN=debian.fsl-imx51
> diff --git a/debian/rules b/debian/rules
> index 7268387..105c60c 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -8,15 +8,12 @@
>   #
>
>   ifeq ($(DEBIAN),)
> -DEBIAN=debian.fsl-imx51
> +DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }'<debian/debian.env)
>   endif
>
> -DENV=debian/debian.env
> -
>   printdebian:
>   	@echo "$(DEBIAN)"
>
>   # Debian Build System targets
>   %:
> -	@if [ ! -f $(DENV) ] ; then echo DEBIAN=$(DEBIAN)>  $(DENV); chmod +x $(DENV); fi
>   	@$(MAKE) --no-print-directory -f $(DEBIAN)/rules $@ DEBIAN=$(DEBIAN)
Andy Whitcroft - Oct. 19, 2011, 1:41 p.m.
On Fri, Oct 14, 2011 at 02:57:11PM -0300, Herton R. Krzesinski wrote:
> From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
> 
> Until now, we were creating debian.env upon first debian/rules run. This
> is incompatible with our tools, which expects debian.env to be available
> always, commited in the repository. This is a minimal change to have
> always debian.env present (ideally we could move debian.fsl-imx51/rules
> to debian/rules, but not doing this at this stage for fsl-imx51).
> 
> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>

Looks to do what we want.  More consistancy is always good so:

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

-apw
Herton Ronaldo Krzesinski - Oct. 21, 2011, 1:37 p.m.
Applied to lucid/fsl-imx51

On Fri, Oct 14, 2011 at 02:57:11PM -0300, Herton R. Krzesinski wrote:
> From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
> 
> Until now, we were creating debian.env upon first debian/rules run. This
> is incompatible with our tools, which expects debian.env to be available
> always, commited in the repository. This is a minimal change to have
> always debian.env present (ideally we could move debian.fsl-imx51/rules
> to debian/rules, but not doing this at this stage for fsl-imx51).
> 
> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
> ---
>  debian.fsl-imx51/rules |    2 +-
>  debian/debian.env      |    1 +
>  debian/rules           |    5 +----
>  3 files changed, 3 insertions(+), 5 deletions(-)
>  create mode 100644 debian/debian.env
> 
> diff --git a/debian.fsl-imx51/rules b/debian.fsl-imx51/rules
> index a948445..b2a4573 100755
> --- a/debian.fsl-imx51/rules
> +++ b/debian.fsl-imx51/rules
> @@ -8,7 +8,7 @@
>  #
>  
>  ifeq ($(DEBIAN),)
> -DEBIAN=debian.fsl-imx51
> +DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env)
>  endif
>  
>  # dpkg-buildpackage passes options that are incomptatible
> diff --git a/debian/debian.env b/debian/debian.env
> new file mode 100644
> index 0000000..8da47bb
> --- /dev/null
> +++ b/debian/debian.env
> @@ -0,0 +1 @@
> +DEBIAN=debian.fsl-imx51
> diff --git a/debian/rules b/debian/rules
> index 7268387..105c60c 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -8,15 +8,12 @@
>  #
>  
>  ifeq ($(DEBIAN),)
> -DEBIAN=debian.fsl-imx51
> +DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env)
>  endif
>  
> -DENV=debian/debian.env
> -
>  printdebian:
>  	@echo "$(DEBIAN)"
>  
>  # Debian Build System targets
>  %:
> -	@if [ ! -f $(DENV) ] ; then echo DEBIAN=$(DEBIAN) > $(DENV); chmod +x $(DENV); fi
>  	@$(MAKE) --no-print-directory -f $(DEBIAN)/rules $@ DEBIAN=$(DEBIAN)
> -- 
> 1.7.4.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>

Patch

diff --git a/debian.fsl-imx51/rules b/debian.fsl-imx51/rules
index a948445..b2a4573 100755
--- a/debian.fsl-imx51/rules
+++ b/debian.fsl-imx51/rules
@@ -8,7 +8,7 @@ 
 #
 
 ifeq ($(DEBIAN),)
-DEBIAN=debian.fsl-imx51
+DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env)
 endif
 
 # dpkg-buildpackage passes options that are incomptatible
diff --git a/debian/debian.env b/debian/debian.env
new file mode 100644
index 0000000..8da47bb
--- /dev/null
+++ b/debian/debian.env
@@ -0,0 +1 @@ 
+DEBIAN=debian.fsl-imx51
diff --git a/debian/rules b/debian/rules
index 7268387..105c60c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,15 +8,12 @@ 
 #
 
 ifeq ($(DEBIAN),)
-DEBIAN=debian.fsl-imx51
+DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' <debian/debian.env)
 endif
 
-DENV=debian/debian.env
-
 printdebian:
 	@echo "$(DEBIAN)"
 
 # Debian Build System targets
 %:
-	@if [ ! -f $(DENV) ] ; then echo DEBIAN=$(DEBIAN) > $(DENV); chmod +x $(DENV); fi
 	@$(MAKE) --no-print-directory -f $(DEBIAN)/rules $@ DEBIAN=$(DEBIAN)