From fd74a90a0c44b3e0e60bb941734a70c99ab69e62 Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Fri, 17 May 2019 14:51:46 -0700 Subject: [PATCH] DRAFT [ubuntu-bionic] cppunit: Remove from blacklist, PREFERRED_VERSION=1.14.0 --- .../ubuntu-bionic/ros-distro-platform-preferred-versions.inc | 1 + .../ubuntu-bionic/ros-distro-platform-recipe-blacklist.inc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/ros-distro/include/ubuntu-bionic/ros-distro-platform-preferred-versions.inc b/conf/ros-distro/include/ubuntu-bionic/ros-distro-platform-preferred-versions.inc index 7290a67..45907b6 100644 --- a/conf/ros-distro/include/ubuntu-bionic/ros-distro-platform-preferred-versions.inc +++ b/conf/ros-distro/include/ubuntu-bionic/ros-distro-platform-preferred-versions.inc @@ -4,6 +4,7 @@ # Set PREFERRED_VERSION_ here for platform packages for which the layers provide multiple versions. +PREFERRED_VERSION_cppunit ?= "1.14.0" PREFERRED_VERSION_linux-raspberrypi ?= "4.4%" # Match kernel version of raspberrypi. PREFERRED_VERSION_linux-yocto ?= "4.4%" diff --git a/conf/ros-distro/include/ubuntu-bionic/ros-distro-platform-recipe-blacklist.inc b/conf/ros-distro/include/ubuntu-bionic/ros-distro-platform-recipe-blacklist.inc index 6e2595e..2972f25 100644 --- a/conf/ros-distro/include/ubuntu-bionic/ros-distro-platform-recipe-blacklist.inc +++ b/conf/ros-distro/include/ubuntu-bionic/ros-distro-platform-recipe-blacklist.inc @@ -4,7 +4,6 @@ # Initially, blacklist any platform duplicates found by "bitbake-layers show-overlayed". Remove from the blacklist once a # PREFERRED_VERSION_ setting is made in ros-distro-platform-preferred-versions.inc . -PNBLACKLIST[cppunit] ?= "Must specify PREFERRED_VERSION" PNBLACKLIST[python-matplotlib] ?= "Must specify PREFERRED_VERSION" # Initially, blacklist any platform recipes with multiple versions found by "bitbake-layers show-recipes --multiple" (except for