From b0308141c1fa1aeb80189d37cfd3a0630881504d Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Wed, 2 Nov 2016 00:46:47 +1100 Subject: [PATCH] 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 --- 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 diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend new file mode 100644 index 0000000..3781666 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -0,0 +1 @@ +RDEPENDS_${PN}_append_rpi = " rpi-u-boot-scr" diff --git a/recipes-bsp/u-boot/u-boot_2016.03.bbappend b/recipes-bsp/u-boot/u-boot_2016.03.bbappend deleted file mode 100644 index 35dfc37..0000000 --- a/recipes-bsp/u-boot/u-boot_2016.03.bbappend +++ /dev/null @@ -1 +0,0 @@ -RDEPENDS_${PN}_rpi += "rpi-u-boot-scr"