Skip to contentSkip to conversation

u-boot: Fix appending to RDEPENDS

PATCH Applied Jonathan Liu 4 participants 4 messages Nov 1, 2016 – Nov 12, 2016

lore
Share & tools
lore

Jonathan Liu

author
#0 lore raw

PATCH 1/1 u-boot: Fix appending to RDEPENDS

The += operator should not be used in combination with overrides as it will clear any existing values in the variable.

Example:
FOO = "bar"
FOO_rpi += "baz"

The above example would result in FOO being equal to " baz" instead of "bar baz".

The bbappend is changed to use a wildcard instead of a specific version to simplify updating U-Boot.

Signed-off-by Jonathan Liu <[email protected]>
---
 recipes-bsp/u-boot/u-boot_%.bbappend       | 1 +
 recipes-bsp/u-boot/u-boot_2016.03.bbappend | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 recipes-bsp/u-boot/u-boot_%.bbappend
 delete mode 100644 recipes-bsp/u-boot/u-boot_2016.03.bbappend
recipes-bsp/u-boot/u-boot_%.bbappend new file +1 -0
new file mode 100644
index 0000000..3781666
@@ -0,0 +1 @@
+RDEPENDS_${PN}_append_rpi = " rpi-u-boot-scr"
recipes-bsp/u-boot/u-boot_2016.03.bbappend deleted +0 -1
deleted file mode 100644
index 35dfc37..0000000
@@ -1 +0,0 @@
-RDEPENDS_${PN}_rpi += "rpi-u-boot-scr"
Signature · 1 line
2.10.1
#1 lore raw
Quoted 34 lines · On Wed, 2 Nov 2016 00:46:47 +1100 Jonathan Liu <[email protected]> wrote:

The += operator should not be used in combination with overrides as it will clear any existing values in the variable.

Example:
FOO = "bar"
FOO_rpi += "baz"

The above example would result in FOO being equal to " baz" instead of "bar baz".

The bbappend is changed to use a wildcard instead of a specific version to simplify updating U-Boot.

Signed-off-by Jonathan Liu <[email protected]>
---
 recipes-bsp/u-boot/u-boot_%.bbappend       | 1 +
 recipes-bsp/u-boot/u-boot_2016.03.bbappend | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 recipes-bsp/u-boot/u-boot_%.bbappend
 delete mode 100644 recipes-bsp/u-boot/u-boot_2016.03.bbappend
(quoted diff) +0 -0

b/recipes-bsp/u-boot/u-boot_%.bbappend new file mode 100644 index 0000000..3781666

recipes-bsp/u-boot/u-boot_%.bbappend new file +1 -0
@@ -0,0 +1 @@
+RDEPENDS_${PN}_append_rpi = " rpi-u-boot-scr"
(quoted diff) +0 -0

b/recipes-bsp/u-boot/u-boot_2016.03.bbappend deleted file mode 100644 index 35dfc37..0000000

recipes-bsp/u-boot/u-boot_2016.03.bbappend line 1

Quoted 1 line
recipes-bsp/u-boot/u-boot_2016.03.bbappend deleted +0 -1
@@ -1 +0,0 @@
-RDEPENDS_${PN}_rpi += "rpi-u-boot-scr"

Looks good. Thanks for picking this up!

Paul

#2 lore raw
Quoted 27 lines · Paul Barker
Quoted 21 lines · On Wed, 2 Nov 2016 00:46:47 +1100 Jonathan Liu <[email protected]> wrote:

The += operator should not be used in combination with overrides as it will clear any existing values in the variable.

Example:
FOO = "bar"
FOO_rpi += "baz"

The above example would result in FOO being equal to " baz" instead of "bar baz".

The bbappend is changed to use a wildcard instead of a specific version to simplify updating U-Boot.

Signed-off-by Jonathan Liu <[email protected]>

---
recipes-bsp/u-boot/u-boot_%.bbappend | 1 +
recipes-bsp/u-boot/u-boot_2016.03.bbappend | 1 -

2 files changed, 1 insertion(+), 1 deletion(-)

create mode 100644 recipes-bsp/u-boot/u-boot_%.bbappend delete mode 100644 recipes-bsp/u-boot/u-boot_2016.03.bbappend

Quoted 16 lines
Quoted 13 lines
(quoted diff) +0 -0

b/recipes-bsp/u-boot/u-boot_%.bbappend new file mode 100644 index 0000000..3781666

recipes-bsp/u-boot/u-boot_%.bbappend new file +1 -0
@@ -0,0 +1 @@
+RDEPENDS_${PN}_append_rpi = " rpi-u-boot-scr"
(quoted diff) +0 -0

b/recipes-bsp/u-boot/u-boot_2016.03.bbappend deleted file mode 100644 index 35dfc37..0000000

recipes-bsp/u-boot/u-boot_2016.03.bbappend line 1

Quoted 1 line
recipes-bsp/u-boot/u-boot_2016.03.bbappend deleted +0 -1
@@ -1 +0,0 @@
-RDEPENDS_${PN}_rpi += "rpi-u-boot-scr"

Looks good. Thanks for picking this up!

I have staged it for testing

Applied
#3 lore raw
In reply to Jonathan Liu
Quoted 38 lines · Jonathan Liu

The += operator should not be used in combination with overrides as it will clear any existing values in the variable.

Example:
FOO = "bar"
FOO_rpi += "baz"

The above example would result in FOO being equal to " baz" instead of "bar baz".

The bbappend is changed to use a wildcard instead of a specific version to simplify updating U-Boot.

Signed-off-by Jonathan Liu <[email protected]>
---
 recipes-bsp/u-boot/u-boot_%.bbappend       | 1 +
 recipes-bsp/u-boot/u-boot_2016.03.bbappend | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 recipes-bsp/u-boot/u-boot_%.bbappend
 delete mode 100644 recipes-bsp/u-boot/u-boot_2016.03.bbappend
recipes-bsp/u-boot/u-boot_%.bbappend new file +1 -0
new file mode 100644
index 0000000..3781666
@@ -0,0 +1 @@
+RDEPENDS_${PN}_append_rpi = " rpi-u-boot-scr"
recipes-bsp/u-boot/u-boot_2016.03.bbappend deleted +0 -2
deleted file mode 100644
index 35dfc37..0000000
@@ -1 +0,0 @@
-RDEPENDS_${PN}_rpi += "rpi-u-boot-scr"
--

2.10.1

Quoted 5 lines

--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Merged to master. Thanks.
--
Andrei Gherzan