p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DRAFT ros-distro.conf: BBMASK-out "core-image-ros-.*" if DISTRO is "webos"

This commit is contained in:
Herb Kuta 2019-06-24 13:09:21 -07:00
parent 2281da4130
commit 6450186538
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/ros-distro/ros-distro.conf
View File

@ -104,5 +104,13 @@ IMAGE_BASENAME_append = "${ROS_IMAGE_BASENAME_APPEND}"
# of times. (An unset variable in an "include" line doesn't cause a ParseError the way it does in a "require" line.) # of times. (An unset variable in an "include" line doesn't cause a ParseError the way it does in a "require" line.)
DISTRO ?= "${@bb.error('DISTRO must be set in conf/bblayers.conf (not conf/local.conf)')}" DISTRO ?= "${@bb.error('DISTRO must be set in conf/bblayers.conf (not conf/local.conf)')}"
# Don't allow ROS-only images to be built with DISTRO set to "webOS" as they will contain different platform packages, eg, the
# kernel, from images with the same names built with DISTRO set to "ros1" or "ros2". Using BBMASK instead of PNBLACKLIST because
# a RE name match is wanted.
BBMASK += "${@'recipes-core/images/core-image-ros-.*' \
if d.getVar('DISTRO', True) == 'webos' else \
'' \
}"
# Optionally include fixups for foreign DISTRO-s. # Optionally include fixups for foreign DISTRO-s.
include conf/ros-distro/include/${DISTRO}-compat.inc include conf/ros-distro/include/${DISTRO}-compat.inc