Skip to content

GitLab

Switch branch/tag
Find file BlameHistoryPermalink
  • Martin Jansa's avatar
    */conf/layer.conf: Remove LICENSE_PATH setting for directories which don't exist · fb2fd146
    Martin Jansa authored 
    
* fixes parsing with latest oe-core:
ERROR: Unable to parse Var <AVAILABLE_LICENSES[:=]>
Traceback (most recent call last):
  File "Var <AVAILABLE_LICENSES[:=]>", line 1, in <module>
  File "/jenkins/mjansa/build-ros/webos-melodic-master/openembedded-core/meta/classes/license.bbclass", line 275, in available_licenses(d=<bb.data_smart.DataSmart object at 0x7f23da3ae0f0>):
         for lic_dir in lic_dirs:
    >        licenses += os.listdir(lic_dir)

bb.data_smart.ExpansionError: Failure expanding variable AVAILABLE_LICENSES[:=], expression was ${@' '.join(available_licenses(d))} which triggered exception FileNotFoundError: [Errno 2] No such file or directory: '/jenkins/mjansa/build-ros/webos-melodic-master/meta-ros/meta-ros1-melodic/licenses'
Signed-off-by: default avatarMartin Jansa <martin.jansa@lge.com>
    fb2fd146
layer.conf 1.37 KB
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 
# We have a conf and classes directory, append to BBPATH
BBPATH .= ":${LAYERDIR}"

# We have a recipes directory, add to BBFILES
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend ${LAYERDIR}/generated-recipes/*/*.bb"

BBFILE_COLLECTIONS += "ros2-dashing-layer"
BBFILE_PATTERN_ros2-dashing-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_ros2-dashing-layer = "7"

# Version 1 was the manually created meta-ros2-dashing, prior to the introduction of superflore.
# Version 2 was all ROS distributions in the same meta-ros layer with right subdirectories selected by ROS_DISTRO variable
# Version 3 is with each ROS distribution in separate sublayer of meta-ros git repository (with modifications to generated recipes applied in .bbappends instead of .inc files)
LAYERVERSION_ros2-dashing-layer = "3"

LAYERDEPENDS_ros2-dashing-layer = " \
    core \
    meta-python \
    openembedded-layer \
    ros-common-layer \
    ros2-layer \
"

# We only need meta-qt5 if Qt5 has been enabled.
LAYERDEPENDS_ros2-dashing-layer += "${@bb.utils.contains('DISTRO_FEATURES', 'ros-qt5', 'qt5-layer', '', d)}"

# We only need meta-intel-realsense if RealSense has been enabled.
LAYERDEPENDS_ros2-dashing-layer += "${@bb.utils.contains('DISTRO_FEATURES', 'ros-realsense', 'intel-realsense', '', d)}"

LAYERSERIES_COMPAT_ros2-dashing-layer = "thud"

require conf/ros-distro/include/dashing/ros-distro.inc