From 64501865388b6d6c8abddfb416a254faf420ddd1 Mon Sep 17 00:00:00 2001
From: Herb Kuta <herb.kuta@lge.com>
Date: Mon, 24 Jun 2019 13:09:21 -0700
Subject: [PATCH] DRAFT ros-distro.conf: BBMASK-out "core-image-ros-.*" if
 DISTRO is "webos"

---
 conf/ros-distro/ros-distro.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/conf/ros-distro/ros-distro.conf b/conf/ros-distro/ros-distro.conf
index dd172cc..03844bf 100644
--- a/conf/ros-distro/ros-distro.conf
+++ b/conf/ros-distro/ros-distro.conf
@@ -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.)
 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.
 include conf/ros-distro/include/${DISTRO}-compat.inc