Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

append: fix two errors in _append rules; one in avahi and one in systemd #179

Merged
merged 1 commit into from
Jun 16, 2017
Merged

append: fix two errors in _append rules; one in avahi and one in systemd #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions meta-refkit-computervision/recipes-image/images/refkit-image-computervision.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion meta-refkit-core/conf/distro/include/refkit-config.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion meta-refkit-core/recipes-connectivity/avahi/avahi_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.* \
Expand Down
2 changes: 1 addition & 1 deletion meta-refkit-core/recipes-connectivity/bluez5/bluez5_5%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions meta-refkit-core/recipes-images/images/refkit-image-common.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions meta-refkit-gateway/recipes-image/images/refkit-image-gateway.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion meta-refkit/lib/oeqa/selftest/cases/refkit_poky.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down