Skip to contentSkip to conversation

hand the TEMPLATECONF local over to setup-builddir

PATCH In review Marcus Müller 4 participants 8 messages Sep 22, 2015 – Dec 16, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hand the TEMPLATECONF local over to setup-builddir

---
 oe-init-build-env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
oe-init-build-env +1 -1
index 6fee5f7..b7e2918 100755
@@ -45,7 +45,7 @@ fi
 OEROOT=`readlink -f "$OEROOT"`
 export OEROOT
 . $OEROOT/scripts/oe-buildenv-internal && \
-     $OEROOT/scripts/oe-setup-builddir && \
+     TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \
      [ -n "$BUILDDIR" ] && cd "$BUILDDIR"
 unset OEROOT
 unset BBPATH
Signature · 1 line
2.4.3
#1 lore raw
Quoted 11 lines · Marcus Müller
---
 oe-init-build-env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
oe-init-build-env +0 -0
index 6fee5f7..b7e2918 100755

oe-init-build-env fi · line 51

Quoted 8 lines
oe-init-build-env +1 -1
@@ -45,7 +45,7 @@ fi
 OEROOT=`readlink -f "$OEROOT"`
 export OEROOT
 . $OEROOT/scripts/oe-buildenv-internal && \
-     $OEROOT/scripts/oe-setup-builddir && \
+     TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \
      [ -n "$BUILDDIR" ] && cd "$BUILDDIR"
 unset OEROOT
 unset BBPATH

I think this patch is a good candidate for back-porting to the fido branch. If I understand correctly it allows a user prepared $TEMPLATECONF directory to be used by oe-setup-builddir.

#2 lore raw

Hello,

Quoted 3 lines

If I understand correctly it allows a user prepared $TEMPLATECONF directory
to be used by oe-setup-builddir.

Indeed; the point is that oe-setup-builddir was definitely meant to be used with a TEMPLATECONF set by the user; in bash, the TEMPLATECONF local variable is automatically passed on from oe-init-build-env to oe-setup-builddir¹, but in zsh, this doesn't work without explicitely declaring that should happen (which is the only thing my patch does).

Best regards,
Marcus

¹ not quite sure how; it's a local to the calling script and shouldn't be a local or env variable to the callee, IMHO.

#3 lore raw
Quoted 10 lines · Marcus Müller

Hello,

Quoted 3 lines

If I understand correctly it allows a user prepared $TEMPLATECONF directory
to be used by oe-setup-builddir.

Indeed; the point is that oe-setup-builddir was definitely meant to be used with a TEMPLATECONF set by the user; in bash, the TEMPLATECONF local variable is automatically passed on from oe-init-build-env to oe-setup-builddir¹, but in zsh, this doesn't work without explicitely declaring that should happen (which is the only thing my patch does).

Quoted 6 lines

Best regards,
Marcus

¹ not quite sure how; it's a local to the calling script and shouldn't be a local or env variable to the callee, IMHO.

Hello Marcus,

FWIW, I did some test cases to understand the differences.

With bash 4.3.11, and the examples below,
cases A and B will pass along TEMPLATECONF, but case C does not. Your patch makes case C work as well.

# A:

TEMPLATECONF=$HOME/my-template-dir source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

# B:
export TEMPLATECONF=$HOME/my-template-dir; source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

# C:
TEMPLATECONF=$HOME/my-template-dir; source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

And with zsh 5.0.2, case B will pass along TEMPLATECONF, but cases A and C do not.
Your patch makes cases A and C work as well with zsh.

I did not expect case A to be different than case C for bash, but it apparently works differently than I thought.

Best regards,
Lee

#4 lore raw
Quoted 35 lines · Lee Nipper

On Tue, Sep 22, 2015 at 1:45 PM, Marcus Müller <[email protected] <mailto:[email protected]>> wrote:

Hello,
> If I understand correctly it allows a user prepared $TEMPLATECONF > directory
> to be used by oe-setup-builddir.
Indeed; the point is that oe-setup-builddir was definitely meant to be used with a TEMPLATECONF set by the user; in bash, the TEMPLATECONF local variable is automatically passed on from oe-init-build-env to oe-setup-builddir¹, but in zsh, this doesn't work without explicitely declaring that should happen (which is the only thing my patch does).

Best regards,
Marcus

¹ not quite sure how; it's a local to the calling script and shouldn't be a local or env variable to the callee, IMHO.

Hello Marcus,

FWIW, I did some test cases to understand the differences.

With bash 4.3.11, and the examples below,
cases A and B will pass along TEMPLATECONF, but case C does not. Your patch makes case C work as well.

# A:

TEMPLATECONF=$HOME/my-template-dir source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

# B:
export TEMPLATECONF=$HOME/my-template-dir; source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

Quoted 8 lines

# C:
TEMPLATECONF=$HOME/my-template-dir; source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

And with zsh 5.0.2, case B will pass along TEMPLATECONF, but cases A and C do not. Your patch makes cases A and C work as well with zsh.

I did not expect case A to be different than case C for bash, but it apparently works differently than I thought.

This is indeed expected behaviour - environment variables defined on the command line before the command itself are local to that command's execution only.

Signature · 4 lines
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------
#5 lore raw
In reply to Lee Nipper

Hello Lee,

wow, thanks for clearing testing this; actually, to trigger my personal need for a patch, variant # A was used.

Cheers,
Marcus

Quoted 53 lines · Lee Nipper

On Tue, Sep 22, 2015 at 1:45 PM, Marcus Müller <[email protected] <mailto:[email protected]>> wrote:

Hello,
> If I understand correctly it allows a user prepared $TEMPLATECONF > directory
> to be used by oe-setup-builddir.
Indeed; the point is that oe-setup-builddir was definitely meant to be used with a TEMPLATECONF set by the user; in bash, the TEMPLATECONF local variable is automatically passed on from oe-init-build-env to oe-setup-builddir¹, but in zsh, this doesn't work without explicitely declaring that should happen (which is the only thing my patch does).

Best regards,
Marcus

¹ not quite sure how; it's a local to the calling script and shouldn't be a local or env variable to the callee, IMHO.

Hello Marcus,

FWIW, I did some test cases to understand the differences.

With bash 4.3.11, and the examples below,
cases A and B will pass along TEMPLATECONF, but case C does not. Your patch makes case C work as well.

# A:

TEMPLATECONF=$HOME/my-template-dir source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

# B:
export TEMPLATECONF=$HOME/my-template-dir; source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

# C:
TEMPLATECONF=$HOME/my-template-dir; source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

And with zsh 5.0.2, case B will pass along TEMPLATECONF, but cases A and C do not.
Your patch makes cases A and C work as well with zsh.

I did not expect case A to be different than case C for bash, but it apparently works differently than I thought.

Best regards,
Lee

#6 lore raw

Ping!
Attaching a version of the patch that works with current master; without the fix, oe-init-build-env simply doesn't work with zsh.

It really isn't a big patch, so if you need me to correct anything, please don't hesitate to point me to it; I'm totally new to openembedded, so if my contribution doesn't meet OE expectations, I won't object to any criticism :)

Best regards,
Marcus

Quoted 58 lines · Marcus Müller

Hello Lee,

wow, thanks for clearing testing this; actually, to trigger my personal need for a patch, variant # A was used.

Cheers,
Marcus

On 22.09.2015 22:25, Lee Nipper wrote:

Quoted 10 lines · Marcus Müller

Hello,

Quoted 3 lines

If I understand correctly it allows a user prepared $TEMPLATECONF directory
to be used by oe-setup-builddir.

Indeed; the point is that oe-setup-builddir was definitely meant to be used with a TEMPLATECONF set by the user; in bash, the TEMPLATECONF local variable is automatically passed on from oe-init-build-env to oe-setup-builddir¹, but in zsh, this doesn't work without explicitely declaring that should happen (which is the only thing my patch does).

Quoted 6 lines

Best regards,
Marcus

¹ not quite sure how; it's a local to the calling script and shouldn't be a local or env variable to the callee, IMHO.

Hello Marcus,

FWIW, I did some test cases to understand the differences.

With bash 4.3.11, and the examples below,
cases A and B will pass along TEMPLATECONF, but case C does not. Your patch makes case C work as well.

# A:

TEMPLATECONF=$HOME/my-template-dir source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

# B:
export TEMPLATECONF=$HOME/my-template-dir; source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

# C:
TEMPLATECONF=$HOME/my-template-dir; source ~/openembedded-core/oe-init-build-env $HOME/my-build-dir

And with zsh 5.0.2, case B will pass along TEMPLATECONF, but cases A and C do not.
Your patch makes cases A and C work as well with zsh.

Quoted 8 lines

I did not expect case A to be different than case C for bash, but it apparently works differently than I thought.

Best regards,
Lee

From 12da2fbe29219a29cb61b11b1561e6625ad7ef85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20M=C3=BCller?= <[email protected]>
Date: Mon, 7 Dec 2015 11:48:40 +0100
Subject: [PATCH] hand the TEMPLATECONF local over to setup-builddir

---
 oe-init-build-env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
oe-init-build-env +1 -1
index 6fee5f7..b7e2918 100755
@@ -45,7 +45,7 @@ fi
 OEROOT=`readlink -f "$OEROOT"`
 export OEROOT
 . $OEROOT/scripts/oe-buildenv-internal && \
-     $OEROOT/scripts/oe-setup-builddir && \
+     TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \
      [ -n "$BUILDDIR" ] && cd "$BUILDDIR"
 unset OEROOT
 unset BBPATH
Signature · 1 line
2.4.3
#7 lore raw
In reply to Marcus Müller

Ping. Marcus works with me and he is nagging me about this.

Quoted 18 lines · Marcus Müller
---
 oe-init-build-env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
oe-init-build-env +1 -1
index 6fee5f7..b7e2918 100755
@@ -45,7 +45,7 @@ fi
 OEROOT=`readlink -f "$OEROOT"`
 export OEROOT
 . $OEROOT/scripts/oe-buildenv-internal && \
-     $OEROOT/scripts/oe-setup-builddir && \
+     TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir && \
      [ -n "$BUILDDIR" ] && cd "$BUILDDIR"
 unset OEROOT
 unset BBPATH