{melodic} *.bbappend: update LICENSE modification after recipes are r…

…egenerated with updated superflore

* this should be applied only after corresponding recipes are regenerated
  with fixed superflore:
  ros-infrastructure/superflore#271

Signed-off-by: Martin Jansa <martin.jansa@lge.com>

meta-ros1-melodic/recipes-bbappends/mavlink/mavlink_2020.9.10-1.bbappend

@@ -1,13 +1,3 @@
 ROS_BUILD_DEPENDS += " \
     ${PYTHON_PN}-future-native \
 "
-
-# package.xml from this release says correctly LGPLv3:
-# but the generated recipe has LGPL-2 which causes this warning:
-# WARNING: mavlink-2020.2.2-1-r0 do_populate_lic: mavlink: No generic license file exists for: LGPL-2 in any provider
-# because superflore regexp for parsing license information is very limited and
-# doesn't support 'v' as license version separator:
-# https://github.com/ros-infrastructure/superflore/blob/master/superflore/utils.py#L152
-# see https://github.com/ros-infrastructure/superflore/issues/271
-_LICENSE := "${LICENSE}"
-LICENSE = "${@'${_LICENSE}'.replace('LGPL-2', 'LGPL-3.0')}"

meta-ros1-melodic/recipes-bbappends/mavros/mavros-msgs_1.4.0-1.bbappend

@@ -1,13 +1,3 @@
 ROS_BUILD_DEPENDS += " \
     ${PYTHON_PN}-pyyaml-native \
 "
-
-# package.xml from this release says correctly LGPLv3:
-# but the generated recipe has LGPL-2 which causes this warning:
-# WARNING: mavros-msgs-1.0.0-1-r0 do_populate_lic: mavros-msgs: No generic license file exists for: LGPL-2 in any provider
-# because superflore regexp for parsing license information is very limited and
-# doesn't support 'v' as license version separator:
-# https://github.com/ros-infrastructure/superflore/blob/master/superflore/utils.py#L152
-# see https://github.com/ros-infrastructure/superflore/issues/271
-_LICENSE := "${LICENSE}"
-LICENSE = "${@'${_LICENSE}'.replace('LGPL-2', 'LGPL-3.0')}"

meta-ros1-melodic/recipes-bbappends/mavros/mavros_1.4.0-1.bbappend

@@ -16,15 +16,5 @@ VIRTUAL-RUNTIME_bash ?= "bash"
 RDEPENDS_${PN}_append_class-target_webos = " ${VIRTUAL-RUNTIME_bash}"
 RDEPENDS_${PN}_remove_class-target_webos = "${@oe.utils.conditional('WEBOS_PREFERRED_PROVIDER_FOR_BASH', 'busybox', 'bash', '', d)}"
 
-# package.xml from this release says correctly LGPLv3:
-# but the generated recipe has LGPL-2 which causes this warning:
-# WARNING: mavros-1.0.0-1-r0 do_populate_lic: mavros: No generic license file exists for: LGPL-2 in any provider
-# because superflore regexp for parsing license information is very limited and
-# doesn't support 'v' as license version separator:
-# https://github.com/ros-infrastructure/superflore/blob/master/superflore/utils.py#L152
-# see https://github.com/ros-infrastructure/superflore/issues/271
-_LICENSE := "${LICENSE}"
-LICENSE = "${@'${_LICENSE}'.replace('LGPL-2', 'LGPL-3.0')}"
-
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 SRC_URI += "file://0001-ftf_frame_convertions.cpp-work-around-few-return-typ.patch"

meta-ros1-melodic/recipes-bbappends/navigation/amcl_1.16.7-1.bbappend

@@ -1,6 +1,6 @@
-# Copyright (c) 2019 LG Electronics, Inc.
+# Copyright (c) 2019-2020 LG Electronics, Inc.
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 LICENSE = "LGPL-2.1+"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"

meta-ros1-melodic/recipes-bbappends/open-karto/open-karto_1.2.2-1.bbappend

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 LG Electronics, Inc.
+# Copyright (c) 2019-2020 LG Electronics, Inc.
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 LICENSE = "LGPL-3.0"

meta-ros1-melodic/recipes-bbappends/orocos-kinematics-dynamics/orocos-kdl_1.4.0.bbappend

@@ -1,5 +1,5 @@
-# Copyright (c) 2019 LG Electronics, Inc.
+# Copyright (c) 2019-2020 LG Electronics, Inc.
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 # https://github.com/orocos/orocos-kdl-release/issues/4
 LICENSE = "LGPL-2.1"

meta-ros1-melodic/recipes-bbappends/orocos-kinematics-dynamics/orocos-kinematics-dynamics_1.4.0.bbappend

@@ -1,5 +1,5 @@
-# Copyright (c) 2019 LG Electronics, Inc.
+# Copyright (c) 2019-2020 LG Electronics, Inc.
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 # https://github.com/orocos/orocos-kdl-release/issues/4
 LICENSE = "LGPL-2.1"

meta-ros1-melodic/recipes-bbappends/orocos-kinematics-dynamics/python-orocos-kdl_1.4.0.bbappend

@@ -1,6 +1,6 @@
-# Copyright (c) 2019 LG Electronics, Inc.
+# Copyright (c) 2019-2020 LG Electronics, Inc.
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 # https://github.com/orocos/orocos-kdl-release/issues/4
 LICENSE = "LGPL-2.1"
 

meta-ros1-melodic/recipes-bbappends/rqt-multiplot-plugin/rqt-multiplot_0.0.10.bbappend

@@ -1,5 +1,5 @@
-# Copyright (c) 2019 LG Electronics, Inc.
+# Copyright (c) 2019-2020 LG Electronics, Inc.
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 # https://github.com/ANYbotics/rqt_multiplot_plugin/issues/35
 LICENSE = "LGPL-3.0"

meta-ros1-melodic/recipes-bbappends/slam-karto/slam-karto_0.8.1.bbappend

@@ -1,7 +1,7 @@
-# Copyright (c) 2019 LG Electronics, Inc.
+# Copyright (c) 2019-2020 LG Electronics, Inc.
 
 ROS_BUILD_DEPENDS += "suitesparse-cxsparse"
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 # https://github.com/ros-perception/slam_karto/issues/28
 LICENSE = "LGPL-3.0+ & CC-BY-2.0"

meta-ros1-melodic/recipes-bbappends/uwsim-bullet/uwsim-bullet_2.82.2-1.bbappend

@@ -1,7 +1,10 @@
 # Copyright (c) 2019-2020 LG Electronics, Inc.
 
 # The value from package.xml "Check-author's-website" breaks parsing it with bitbake
-LICENSE = "Zlib"
+# Now superflore replaces it with "Check-authors-website", but we have already
+# checked author's website and it shows Zlib license, so just use that
+_LICENSE := "${LICENSE}"
+LICENSE = "${@'${_LICENSE}'.replace('Check-authors-website', 'Zlib')}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 SRC_URI += "file://0001-CMakeLists.txt-Don-t-include-usr-include-and-usr-loc.patch"

meta-ros1-melodic/recipes-bbappends/variant/variant-msgs_0.1.5.bbappend

@@ -1,5 +1,5 @@
-# Copyright (c) 2019 LG Electronics, Inc.
+# Copyright (c) 2019-2020 LG Electronics, Inc.
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 # https://github.com/ANYbotics/variant-release/issues/1
 LICENSE = "LGPL-3.0+"

meta-ros1-melodic/recipes-bbappends/variant/variant-topic-test_0.1.5.bbappend

@@ -1,6 +1,6 @@
 # Copyright (c) 2019-2020 LG Electronics, Inc.
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 # https://github.com/ANYbotics/variant-release/issues/1
 LICENSE = "LGPL-3.0+"
 

meta-ros1-melodic/recipes-bbappends/variant/variant-topic-tools_0.1.5.bbappend

@@ -1,5 +1,5 @@
-# Copyright (c) 2019 LG Electronics, Inc.
+# Copyright (c) 2019-2020 LG Electronics, Inc.
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 # https://github.com/ANYbotics/variant-release/issues/1
 LICENSE = "LGPL-3.0+"

meta-ros1-melodic/recipes-bbappends/variant/variant_0.1.5.bbappend

@@ -1,5 +1,5 @@
-# Copyright (c) 2019 LG Electronics, Inc.
+# Copyright (c) 2019-2020 LG Electronics, Inc.
 
-# Missing license version in package.xml maps it to invalid LGPL-2
+# Missing license version in package.xml
 # https://github.com/ANYbotics/variant-release/issues/1
 LICENSE = "LGPL-3.0+"