Skip to contentSkip to conversation

Fix filespath for dylan

PATCH In review [email protected] 2 participants 7 messages Aug 11, 2013 – Aug 12, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Fix filespath for dylan

From: Ian Reinhart Geiser <[email protected]>

The old way of setting THISDIR in a bbappend clobbers THISDIR for other layers. This change makes it use the new way that is done in dylan.

---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
recipes-bsp/formfactor/formfactor_0.0.bbappend +2 -3
index 4b8d0e6..491d403 100644
@@ -1,3 +1,2 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+PRINC := "${@int(PRINC) + 1}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 2/2 Fix filespath for dylan

From: Ian Reinhart Geiser <[email protected]>

The old way of setting THISDIR in a bbappend clobbers THISDIR for other layers. This change makes it use the new way that is done in dylan.

---
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +2 -5
index 1615df3..491d403 100644
@@ -1,5 +1,2 @@
-PRINC = "2"
-
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+PRINC := "${@int(PRINC) + 1}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
Signature · 1 line
1.7.9.5
#2 lore raw
Quoted 16 lines · On Sun, Aug 11, 2013 at 07:41:35PM -0400, [email protected] wrote:

From: Ian Reinhart Geiser <[email protected]>

The old way of setting THISDIR in a bbappend clobbers THISDIR for other layers. This change makes it use the new way that is done in dylan.

---
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +0 -0
index 1615df3..491d403 100644

recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend line 2

Quoted 7 lines
recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +2 -5
@@ -1,5 +1,2 @@
-PRINC = "2"
-
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+PRINC := "${@int(PRINC) + 1}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

Same here - _append is more appropriate.

Signature · 1 line
Denys
#3 lore raw
In reply to [email protected]
Quoted 5 lines · On Sun, Aug 11, 2013 at 07:41:34PM -0400, [email protected] wrote:

From: Ian Reinhart Geiser <[email protected]>

The old way of setting THISDIR in a bbappend clobbers THISDIR for other layers. This change makes it use the new way that is done in dylan.

Thanks! I've been meaning to fix those for quite some time, but there was always something more important... :)

Quoted 10 lines
---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
recipes-bsp/formfactor/formfactor_0.0.bbappend +0 -0
index 4b8d0e6..491d403 100644

recipes-bsp/formfactor/formfactor_0.0.bbappend line 2

Quoted 5 lines
recipes-bsp/formfactor/formfactor_0.0.bbappend +2 -3
@@ -1,3 +1,2 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+PRINC := "${@int(PRINC) + 1}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

The above should be _append since that is what =. operand does and also since the colon is at the end.

Signature · 1 line
Denys
author
#4 lore raw

I can fix and resubmit. I found it while porting our 8148 build to Dylan. Thanks!

Quoted 41 lines

-----Original Message-----
From: Denys Dmytriyenko [mailto:[email protected]]
Sent: Sunday, August 11, 2013 11:30 PM
To: Ian Geiser
Cc: [email protected]
Subject: Re: [meta-ti] [PATCH 1/2] Fix filespath for dylan

Quoted 5 lines · On Sun, Aug 11, 2013 at 07:41:34PM -0400, [email protected] wrote:

From: Ian Reinhart Geiser <[email protected]>

The old way of setting THISDIR in a bbappend clobbers THISDIR for other layers. This change makes it use the new way that is done in dylan.

Thanks! I've been meaning to fix those for quite some time, but there was always something more important... :)

Review

Quoted 6 lines
---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/recipes-bsp/formfactor/formfactor_0.0.bbappend

recipes-bsp/formfactor/formfactor_0.0.bbappend line 2

Quoted 9 lines

index 4b8d0e6..491d403 100644

recipes-bsp/formfactor/formfactor_0.0.bbappend +2 -3
@@ -1,3 +1,2 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+PRINC := "${@int(PRINC) + 1}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

The above should be _append since that is what =. operand does and also since
the colon is at the end.

--
Denys

#5 lore raw
Quoted 2 lines · Ian Geiser

I can fix and resubmit. I found it while porting our 8148 build to Dylan. Thanks!

Actually, never mind, I think I'm wrong on this one - looks like I'm not thinking straight at this late hour... :)

Quoted 42 lines
Quoted 41 lines

-----Original Message-----
From: Denys Dmytriyenko [mailto:[email protected]]
Sent: Sunday, August 11, 2013 11:30 PM
To: Ian Geiser
Cc: [email protected]
Subject: Re: [meta-ti] [PATCH 1/2] Fix filespath for dylan

Quoted 5 lines · On Sun, Aug 11, 2013 at 07:41:34PM -0400, [email protected] wrote:

From: Ian Reinhart Geiser <[email protected]>

The old way of setting THISDIR in a bbappend clobbers THISDIR for other layers. This change makes it use the new way that is done in dylan.

Thanks! I've been meaning to fix those for quite some time, but there was always something more important... :)

Review

Quoted 6 lines
---
 recipes-bsp/formfactor/formfactor_0.0.bbappend |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/recipes-bsp/formfactor/formfactor_0.0.bbappend

recipes-bsp/formfactor/formfactor_0.0.bbappend line 2

Quoted 9 lines

index 4b8d0e6..491d403 100644

recipes-bsp/formfactor/formfactor_0.0.bbappend +2 -3
@@ -1,3 +1,2 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+PRINC := "${@int(PRINC) + 1}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

The above should be _append since that is what =. operand does and also since
the colon is at the end.

--
Denys

author
#6 lore raw
Quoted 4 lines

Actually, never mind, I think I'm wrong on this one - looks like I'm not thinking straight at this late hour... :)

Lol, no problem. BTW, I did these in the Dylan branch, I did not test with master. Is that a problem? I think they are minor enough though.