From 79bde35cc76fef7f575c4c8fb254427e071a8b6e Mon Sep 17 00:00:00 2001 From: Tuomas Katila Date: Mon, 12 Jun 2017 13:49:09 +0300 Subject: [PATCH] append: fix _append rules where there is no whitespace after '"' Signed-off-by: Tuomas Katila --- .../recipes-image/images/refkit-image-computervision.bb | 4 ++-- meta-refkit-core/conf/distro/include/refkit-config.inc | 2 +- meta-refkit-core/recipes-connectivity/avahi/avahi_%.bbappend | 2 +- .../recipes-connectivity/bluez5/bluez5_5%.bbappend | 2 +- meta-refkit-core/recipes-images/images/refkit-image-common.bb | 4 ++-- .../recipes-image/images/refkit-image-gateway.bb | 4 ++-- meta-refkit/lib/oeqa/selftest/cases/refkit_poky.py | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-refkit-computervision/recipes-image/images/refkit-image-computervision.bb b/meta-refkit-computervision/recipes-image/images/refkit-image-computervision.bb index 76223a809b..66829eda27 100644 --- a/meta-refkit-computervision/recipes-image/images/refkit-image-computervision.bb +++ b/meta-refkit-computervision/recipes-image/images/refkit-image-computervision.bb @@ -15,7 +15,7 @@ REFKIT_IMAGE_COMPUTERVISION_EXTRA_FEATURES += "${@ '' if (d.getVar('IMAGE_MODE') # Example for customization in local.conf when building # refkit-image-computervision.bb: # IMAGE_BASENAME_pn-refkit-image-computervision = "my-refkit-image-reference" -# REFKIT_IMAGE_COMPUTERVISION_EXTRA_INSTALL_append = "my-own-package" -# REFKIT_IMAGE_COMPUTERVISION_EXTRA_FEATURES_append = "dev-pkgs" +# REFKIT_IMAGE_COMPUTERVISION_EXTRA_INSTALL_append = " my-own-package" +# REFKIT_IMAGE_COMPUTERVISION_EXTRA_FEATURES_append = " dev-pkgs" inherit refkit-image diff --git a/meta-refkit-core/conf/distro/include/refkit-config.inc b/meta-refkit-core/conf/distro/include/refkit-config.inc index bca8fdbee8..9653ad6256 100644 --- a/meta-refkit-core/conf/distro/include/refkit-config.inc +++ b/meta-refkit-core/conf/distro/include/refkit-config.inc @@ -107,7 +107,7 @@ BAD_RECOMMENDATIONS_append_refkit-config = " bluez5-client" # Prefer systemd way of creating getty@.service symlinks using # systemd-getty-generator (instead of the Yocto default # systemd-serialgetty that creates everything in do_install). -PACKAGECONFIG_append_pn-systemd_refkit-config = "serial-getty-generator" +PACKAGECONFIG_append_pn-systemd_refkit-config = " serial-getty-generator" # OE-core 7355a3c4f665e066925ea6327ac72365ab1f2f39 added a PACKAGECONFIG # to configure cairo/python3-cairo and enabled it by default. It used to diff --git a/meta-refkit-core/recipes-connectivity/avahi/avahi_%.bbappend b/meta-refkit-core/recipes-connectivity/avahi/avahi_%.bbappend index 4b2af2141b..38773997c9 100644 --- a/meta-refkit-core/recipes-connectivity/avahi/avahi_%.bbappend +++ b/meta-refkit-core/recipes-connectivity/avahi/avahi_%.bbappend @@ -5,7 +5,7 @@ RRECOMMENDS_avahi-daemon_remove_libc-glibc_refkit-config = " libnss-mdns" RRECOMMENDS_${PN}_remove_libc-glibc_refkit-config = " libnss-mdns" # provide libdns_sd.so and dns_sd.h header -EXTRA_OECONF_append_refkit-config = "--enable-compat-libdns_sd" +EXTRA_OECONF_append_refkit-config = " --enable-compat-libdns_sd" FILES_${PN}_append_refkit-config = " \ ${libdir}/libdns_sd.* \ diff --git a/meta-refkit-core/recipes-connectivity/bluez5/bluez5_5%.bbappend b/meta-refkit-core/recipes-connectivity/bluez5/bluez5_5%.bbappend index 75b3daead2..0865d65a96 100644 --- a/meta-refkit-core/recipes-connectivity/bluez5/bluez5_5%.bbappend +++ b/meta-refkit-core/recipes-connectivity/bluez5/bluez5_5%.bbappend @@ -4,4 +4,4 @@ DEPENDS_remove_refkit-config = "libusb" # split bluetoothctl into a subpackage PACKAGES_prepend_refkit-config = "${PN}-client " FILES_${PN}-client = "${@bb.utils.contains('PACKAGECONFIG', 'readline', '${bindir}/bluetoothctl', '', d)}" -RRECOMMENDS_${PN}_append_refkit-config += "${PN}-client" +RRECOMMENDS_${PN}_append_refkit-config = " ${PN}-client" diff --git a/meta-refkit-core/recipes-images/images/refkit-image-common.bb b/meta-refkit-core/recipes-images/images/refkit-image-common.bb index 93d6614251..2aa2eb6e44 100644 --- a/meta-refkit-core/recipes-images/images/refkit-image-common.bb +++ b/meta-refkit-core/recipes-images/images/refkit-image-common.bb @@ -26,7 +26,7 @@ REFKIT_IMAGE_EXTRA_INSTALL += "${REFKIT_IMAGE_COMMON_EXTRA_INSTALL}" # # Example for customization in local.conf when building refkit-image-common.bb: # IMAGE_BASENAME_pn-refkit-image-common = "my-refkit-image-reference" -# REFKIT_IMAGE_COMMON_EXTRA_INSTALL_append = "my-own-package" -# REFKIT_IMAGE_COMMON_EXTRA_FEATURES_append = "dev-pkgs" +# REFKIT_IMAGE_COMMON_EXTRA_INSTALL_append = " my-own-package" +# REFKIT_IMAGE_COMMON_EXTRA_FEATURES_append = " dev-pkgs" inherit refkit-image diff --git a/meta-refkit-gateway/recipes-image/images/refkit-image-gateway.bb b/meta-refkit-gateway/recipes-image/images/refkit-image-gateway.bb index cc452c65ce..831d4a2bb3 100644 --- a/meta-refkit-gateway/recipes-image/images/refkit-image-gateway.bb +++ b/meta-refkit-gateway/recipes-image/images/refkit-image-gateway.bb @@ -11,7 +11,7 @@ REFKIT_IMAGE_GATEWAY_EXTRA_FEATURES_append = " iotivity nodejs-runtime bluetooth # Example for customization in local.conf when building # refkit-image-gateway.bb: # IMAGE_BASENAME_pn-refkit-image-gateway = "my-refkit-image-gateway" -# REFKIT_IMAGE_GATEWAY_EXTRA_INSTALL_append = "my-own-package" -# REFKIT_IMAGE_GATEWAY_EXTRA_FEATURES_append = "dev-pkgs" +# REFKIT_IMAGE_GATEWAY_EXTRA_INSTALL_append = " my-own-package" +# REFKIT_IMAGE_GATEWAY_EXTRA_FEATURES_append = " dev-pkgs" inherit refkit-image diff --git a/meta-refkit/lib/oeqa/selftest/cases/refkit_poky.py b/meta-refkit/lib/oeqa/selftest/cases/refkit_poky.py index adb865ae69..abd710bb15 100644 --- a/meta-refkit/lib/oeqa/selftest/cases/refkit_poky.py +++ b/meta-refkit/lib/oeqa/selftest/cases/refkit_poky.py @@ -236,7 +236,7 @@ def test_common_poky_config(self): # We need an image that we can log into, so zap the root password. self.append_config(''' -REFKIT_IMAGE_EXTRA_FEATURES_append = "empty-root-password" +REFKIT_IMAGE_EXTRA_FEATURES_append = " empty-root-password" ''') bitbake('refkit-image-common') with runqemu('refkit-image-common',