Commit fb2fd146 authored by Martin Jansa's avatar Martin Jansa Committed by Herb Kuta
Browse files

*/conf/layer.conf: Remove LICENSE_PATH setting for directories which don't exist


* 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>
parent 5c0f1341
Showing with 0 additions and 14 deletions
+0 -14
......@@ -8,8 +8,6 @@ BBFILE_COLLECTIONS += "ros-backports-warrior-layer"
BBFILE_PATTERN_ros-backports-warrior-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_ros-backports-warrior-layer = "7"
LICENSE_PATH += "${LAYERDIR}/licenses"
# Version 1 was the manually created meta-ros, 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)
......
......@@ -8,8 +8,6 @@ BBFILE_COLLECTIONS += "ros1-melodic-layer"
BBFILE_PATTERN_ros1-melodic-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_ros1-melodic-layer = "7"
LICENSE_PATH += "${LAYERDIR}/licenses"
# Version 1 was the manually created meta-ros, 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)
......
......@@ -8,8 +8,6 @@ BBFILE_COLLECTIONS += "ros1-layer"
BBFILE_PATTERN_ros1-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_ros1-layer = "7"
LICENSE_PATH += "${LAYERDIR}/licenses"
# Version 1 was the manually created meta-ros, 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)
......
......@@ -8,8 +8,6 @@ BBFILE_COLLECTIONS += "ros2-crystal-layer"
BBFILE_PATTERN_ros2-crystal-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_ros2-crystal-layer = "7"
LICENSE_PATH += "${LAYERDIR}/licenses"
# Version 1 was the manually created meta-ros2-crystal, 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)
......
......@@ -8,8 +8,6 @@ BBFILE_COLLECTIONS += "ros2-dashing-layer"
BBFILE_PATTERN_ros2-dashing-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_ros2-dashing-layer = "7"
LICENSE_PATH += "${LAYERDIR}/licenses"
# 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)
......
......@@ -8,8 +8,6 @@ BBFILE_COLLECTIONS += "ros2-eloquent-layer"
BBFILE_PATTERN_ros2-eloquent-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_ros2-eloquent-layer = "7"
LICENSE_PATH += "${LAYERDIR}/licenses"
# Version 1 was the manually created meta-ros, 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)
......
......@@ -8,8 +8,6 @@ BBFILE_COLLECTIONS += "ros2-layer"
BBFILE_PATTERN_ros2-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_ros2-layer = "7"
LICENSE_PATH += "${LAYERDIR}/licenses"
# Version 1 was the manually created meta-ros, 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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment