Skip to content

Commit

Permalink
{melodic} *.bbappend: update LICENSE modification after recipes are r…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
shr-project committed Dec 10, 2020
1 parent 810500a commit 5a3ff05
Show file tree
Hide file tree
Showing 16 changed files with 25 additions and 61 deletions.
Original file line number Diff line number Diff line change
@@ -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')}"

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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')}"
10 changes: 0 additions & 10 deletions meta-ros1-melodic/recipes-bbappends/mavros/mavros_1.4.0-1.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
@@ -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}:"
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -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+"
Original file line number Diff line number Diff line change
@@ -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+"

Expand Down
Original file line number Diff line number Diff line change
@@ -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+"
Original file line number Diff line number Diff line change
@@ -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+"

0 comments on commit 5a3ff05

Please sign in to comment.