From ca50779a42f1538e234af7bd7c243c3983d77536 Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Fri, 17 May 2019 14:49:02 -0700 Subject: [PATCH] DRAFT [ubuntu-bionic] [morty] linux-yocto: Remove from blacklist, PREFERRED_VERSION=4.4% --- .../ubuntu-bionic/ros-distro-platform-preferred-versions.inc | 2 ++ .../ubuntu-bionic/ros-distro-platform-recipe-blacklist.inc | 1 - 2 files changed, 2 insertions(+), 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 511fe23..6d607f2 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 @@ -5,3 +5,5 @@ # Set PREFERRED_VERSION_ here for platform packages for which the layers provide multiple versions. 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 91e7d68..c9f2c60 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 @@ -12,7 +12,6 @@ PNBLACKLIST[python-matplotlib] ?= "Must specify PREFERRED_VERSION" # ros-distro-platform-preferred-versions.inc . PNBLACKLIST[libgpiod] ?= "Must specify PREFERRED_VERSION" PNBLACKLIST[libmodbus] ?= "Must specify PREFERRED_VERSION" -PNBLACKLIST[linux-yocto] ?= "Must specify PREFERRED_VERSION" PNBLACKLIST[linux-yocto-rt] ?= "Must specify PREFERRED_VERSION" PNBLACKLIST[linux-yocto-tiny] ?= "Must specify PREFERRED_VERSION" PNBLACKLIST[php] ?= "Must specify PREFERRED_VERSION"