From 9fc69a54a6c8f78f310dc3c765b1ede4811a9821 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Thu, 26 Nov 2015 15:48:04 +1000 Subject: Fix up use of '_append +=' The use of '_append' and '+=' together is considered bad practice within recipes. It is preferred to explicitly add the preceeding spaces where they are applicable instead of using the '+=' to achieve the same result. Change all the uses of '_append +=' to match the recommended pattern, adding in spaces where explicitly required. Signed-off-by: Nathan Rossi --- conf/distro/include/tcmode-external-xilinx.inc | 2 +- conf/machine/include/machine-xilinx-board.inc | 2 +- conf/machine/include/machine-xilinx-default.inc | 4 ++-- recipes-bsp/u-boot/u-boot-extra.inc | 2 +- recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb | 4 ++-- recipes-kernel/linux/linux-xilinx-configs.inc | 2 +- recipes-kernel/linux/linux-xilinx-machines.inc | 6 +++--- recipes-kernel/linux/linux-xlnx_3.14.bb | 4 ++-- recipes-kernel/linux/linux-yocto_3.14.bbappend | 4 ++-- recipes-kernel/linux/linux-yocto_3.19.bbappend | 2 +- recipes-microblaze/binutils/binutils%.bbappend | 2 +- recipes-microblaze/gcc/gcc-source_5.2.bbappend | 2 +- recipes-microblaze/gdb/gdb-microblaze-7.7.inc | 2 +- recipes-zynqmp/qemu/qemu_2.4.%.bbappend | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/conf/distro/include/tcmode-external-xilinx.inc b/conf/distro/include/tcmode-external-xilinx.inc index 6949810b..b2824acb 100644 --- a/conf/distro/include/tcmode-external-xilinx.inc +++ b/conf/distro/include/tcmode-external-xilinx.inc @@ -37,7 +37,7 @@ ENABLE_BINARY_LOCALE_GENERATION = "" TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_HOST}" # Fix up default hash, enforce it in for CC_ARCH for packages that ignore LDFLAGS. -TARGET_CC_ARCH_append += "${TARGET_LINK_HASH_STYLE}" +TARGET_CC_ARCH_append = " ${TARGET_LINK_HASH_STYLE}" # Default sysroot is inside the Xilinx ARM v7-A toolchain in the '/libc' (no debug-root) EXTERNAL_TOOLCHAIN_SYSROOT_armv7a ??= "${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}/libc" diff --git a/conf/machine/include/machine-xilinx-board.inc b/conf/machine/include/machine-xilinx-board.inc index 654e3ebb..3447731e 100644 --- a/conf/machine/include/machine-xilinx-board.inc +++ b/conf/machine/include/machine-xilinx-board.inc @@ -2,7 +2,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_microblaze += "device-tree" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_microblaze = " device-tree" IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}" diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index 8a23f07e..054a2e18 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -28,10 +28,10 @@ UBOOT_ELF ?= "u-boot" UBOOT_ELF_aarch64 ?= "u-boot.elf" # By default use the device-tree recipe to generate device trees for Zynq machines -MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq += "device-tree" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_zynq = " device-tree" # Common Device Tree Includes -MACHINE_DEVICETREE_append_zynq += " \ +MACHINE_DEVICETREE_append_zynq = " \ common/zynq7-base.dtsi \ " diff --git a/recipes-bsp/u-boot/u-boot-extra.inc b/recipes-bsp/u-boot/u-boot-extra.inc index d5f5819a..ff824d85 100644 --- a/recipes-bsp/u-boot/u-boot-extra.inc +++ b/recipes-bsp/u-boot/u-boot-extra.inc @@ -6,7 +6,7 @@ inherit xilinx-utils FILESEXTRAPATHS_append := "${@get_additional_bbpath_filespath('conf/machine/boards', d)}" # Append the xparameters file to the SRC_URI if set -SRC_URI_append += " ${@paths_affix(d.getVar("MACHINE_XPARAMETERS", True) or '', prefix = 'file://')}" +SRC_URI_append = " ${@paths_affix(d.getVar("MACHINE_XPARAMETERS", True) or '', prefix = 'file://')}" # Full path to the xparameters.h file UBOOT_XPARAMETERS ?= "${@expand_workdir_paths("MACHINE_XPARAMETERS", d)}" diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb b/recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb index fd28fbee..c331600a 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb +++ b/recipes-bsp/u-boot/u-boot-xlnx_2015.04.bb @@ -5,8 +5,8 @@ include u-boot-extra.inc UBOOT_ENV_zc702-zynq7 = "uEnv" UBOOT_ENV_zedboard-zynq7 = "uEnv" -SRC_URI_append_zc702-zynq7 += "file://uEnv.txt" -SRC_URI_append_zedboard-zynq7 += "file://uEnv.txt" +SRC_URI_append_zc702-zynq7 = " file://uEnv.txt" +SRC_URI_append_zedboard-zynq7 = " file://uEnv.txt" do_compile_append() { # link u-boot-dtb.img to u-boot.img. diff --git a/recipes-kernel/linux/linux-xilinx-configs.inc b/recipes-kernel/linux/linux-xilinx-configs.inc index 4d9efcc3..30b6a8fd 100644 --- a/recipes-kernel/linux/linux-xilinx-configs.inc +++ b/recipes-kernel/linux/linux-xilinx-configs.inc @@ -4,7 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/config:" -SRC_URI_append += " \ +SRC_URI_append = " \ file://xilinx-common;type=kmeta;destsuffix=xilinx-common \ file://xilinx-machine;type=kmeta;destsuffix=xilinx-machine \ " diff --git a/recipes-kernel/linux/linux-xilinx-machines.inc b/recipes-kernel/linux/linux-xilinx-machines.inc index 67b07277..94753eea 100644 --- a/recipes-kernel/linux/linux-xilinx-machines.inc +++ b/recipes-kernel/linux/linux-xilinx-machines.inc @@ -4,9 +4,9 @@ COMPATIBLE_MACHINE_zynq = "zynq" COMPATIBLE_MACHINE_microblaze = "microblaze" # Default kernel config fragements for specific machines -KERNEL_FEATURES_append_qemumicroblaze += "bsp/qemumicroblaze/qemumicroblaze.scc" -KERNEL_FEATURES_append_qemumicroblaze-s3adsp1800 += "bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc" -KERNEL_FEATURES_append_kc705-trd-microblazeel += "bsp/kc705-trd-microblazeel/kc705-trd-microblazeel.scc" +KERNEL_FEATURES_append_qemumicroblaze = " bsp/qemumicroblaze/qemumicroblaze.scc" +KERNEL_FEATURES_append_qemumicroblaze-s3adsp1800 = " bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc" +KERNEL_FEATURES_append_kc705-trd-microblazeel = " bsp/kc705-trd-microblazeel/kc705-trd-microblazeel.scc" # MicroBlaze is a uImage target, but its not called 'uImage' instead it is called 'linux.bin.ub' python () { diff --git a/recipes-kernel/linux/linux-xlnx_3.14.bb b/recipes-kernel/linux/linux-xlnx_3.14.bb index e6d96ed9..572047f7 100644 --- a/recipes-kernel/linux/linux-xlnx_3.14.bb +++ b/recipes-kernel/linux/linux-xlnx_3.14.bb @@ -5,7 +5,7 @@ SRCREV ?= "2b48a8aeea7367359f9eebe55c4a09a05227f32b" include linux-xlnx.inc FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx/3.14:" -SRC_URI_append += " \ +SRC_URI_append = " \ file://usb-host-zynq-dr-of-PHY-reset-during-probe.patch \ file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch \ file://kernel-add-support-for-gcc-5.patch \ @@ -13,5 +13,5 @@ SRC_URI_append += " \ " # This kernel's Zynq USB driver cannot handle a seperate USB PHY device. -KERNEL_FEATURES_append_zynq += "bsp/xilinx/disable-usb-phy.scc" +KERNEL_FEATURES_append_zynq = " bsp/xilinx/disable-usb-phy.scc" diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend index e628fcd0..07a1de18 100644 --- a/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend @@ -3,10 +3,10 @@ require linux-xilinx-configs.inc require linux-xilinx-machines.inc FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx/3.14:" -SRC_URI_append_zynq += " \ +SRC_URI_append_zynq = " \ file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-set_termios.patch \ " -SRC_URI_append_microblaze += " \ +SRC_URI_append_microblaze = " \ file://microblaze-Drop-architecture-specific-declaration-of.patch \ file://kernel-use-the-gnu89-standard-explicitly.patch \ " diff --git a/recipes-kernel/linux/linux-yocto_3.19.bbappend b/recipes-kernel/linux/linux-yocto_3.19.bbappend index 77f02833..e4ed1ac6 100644 --- a/recipes-kernel/linux/linux-yocto_3.19.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.19.bbappend @@ -3,7 +3,7 @@ require linux-xilinx-configs.inc require linux-xilinx-machines.inc FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx/3.19:" -SRC_URI_append_zynq += " \ +SRC_URI_append_zynq = " \ file://tty-xuartps-Fix-RX-hang-and-TX-corruption-in-termios.patch \ " diff --git a/recipes-microblaze/binutils/binutils%.bbappend b/recipes-microblaze/binutils/binutils%.bbappend index 2b0db287..2a53ab74 100644 --- a/recipes-microblaze/binutils/binutils%.bbappend +++ b/recipes-microblaze/binutils/binutils%.bbappend @@ -1,7 +1,7 @@ # Add MicroBlaze Patches FILESEXTRAPATHS_append := "${THISDIR}/files:" -SRC_URI_append_microblaze += " \ +SRC_URI_append_microblaze = " \ file://upstream-change-to-garbage-collection-s.patch \ " diff --git a/recipes-microblaze/gcc/gcc-source_5.2.bbappend b/recipes-microblaze/gcc/gcc-source_5.2.bbappend index ce84c6b1..50075f0d 100644 --- a/recipes-microblaze/gcc/gcc-source_5.2.bbappend +++ b/recipes-microblaze/gcc/gcc-source_5.2.bbappend @@ -1,7 +1,7 @@ # Add MicroBlaze Patches FILESEXTRAPATHS_append := "${THISDIR}/files:" -SRC_URI_append += " \ +SRC_URI_append = " \ file://microblaze.md-Improve-adddi3-and-subdi3-insn-definit.patch \ " diff --git a/recipes-microblaze/gdb/gdb-microblaze-7.7.inc b/recipes-microblaze/gdb/gdb-microblaze-7.7.inc index 0b82bc67..d1aba822 100644 --- a/recipes-microblaze/gdb/gdb-microblaze-7.7.inc +++ b/recipes-microblaze/gdb/gdb-microblaze-7.7.inc @@ -4,7 +4,7 @@ LTTNGUST_microblaze = "" # Add MicroBlaze Patches FILESEXTRAPATHS_append := "${THISDIR}/files:" -SRC_URI_append += " \ +SRC_URI_append = " \ file://0001-Patch-microblaze-Add-wdc.ext.clear-and-wdc.ext.flush.patch \ file://0003-Patch-microblaze-Initial-port-of-microblaze-core-rea.patch \ file://0004-Patch-microblaze-Communicate-in-larger-blocks-with-t.patch \ diff --git a/recipes-zynqmp/qemu/qemu_2.4.%.bbappend b/recipes-zynqmp/qemu/qemu_2.4.%.bbappend index 74c8a1ca..dc6c20ad 100644 --- a/recipes-zynqmp/qemu/qemu_2.4.%.bbappend +++ b/recipes-zynqmp/qemu/qemu_2.4.%.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_append := "${THISDIR}/files:" -SRC_URI_append += " \ +SRC_URI_append = " \ file://arm-xlnx-zynqmp-Fix-up-GIC-region-size.patch \ " -- cgit v1.2.3-54-g00ecf