From 6060f979e1b9ba1ef32f8cdcb1cd10bb6ebc3e45 Mon Sep 17 00:00:00 2001 From: alichinese Date: Fri, 4 Aug 2023 10:10:21 +0800 Subject: [PATCH 1/2] ros-environment: comment out a patch about ros_distro version * the source code has update patch content, the ros distro version is humble, so no longer needed it: 0001-CMakeLists-Update-ROS_DISTRO-version-to-humble.patch Signed-off-by: lixinyu --- .../ros-environment/ros-environment_%.bbappend | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-ros2-humble/recipes-bbappends/ros-environment/ros-environment_%.bbappend b/meta-ros2-humble/recipes-bbappends/ros-environment/ros-environment_%.bbappend index cbe4fbff6..b5b313631 100644 --- a/meta-ros2-humble/recipes-bbappends/ros-environment/ros-environment_%.bbappend +++ b/meta-ros2-humble/recipes-bbappends/ros-environment/ros-environment_%.bbappend @@ -1,4 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI:append = " \ - file://0001-CMakeLists-Update-ROS_DISTRO-version-to-humble.patch \ - " +# the source code has update patch content, so no longger needed it +# SRC_URI:append = " \ +# file://0001-CMakeLists-Update-ROS_DISTRO-version-to-humble.patch \ +# " -- Gitee From 84f5ead7c2c62d718b1227d92897dcd88abaa53e Mon Sep 17 00:00:00 2001 From: alichinese Date: Fri, 4 Aug 2023 10:07:17 +0800 Subject: [PATCH 2/2] conf: adapt poky4.0 LAYERSERIES_COMPAT * the poky4.0 version is kirkstone, so set LAYERSERIES_COMPAT to kirkstone to adapt poky4.0 Signed-off-by: lixinyu --- meta-ros-common/conf/ros-distro/ros-distro.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ros-common/conf/ros-distro/ros-distro.conf b/meta-ros-common/conf/ros-distro/ros-distro.conf index 9e1647e54..29802c0bd 100644 --- a/meta-ros-common/conf/ros-distro/ros-distro.conf +++ b/meta-ros-common/conf/ros-distro/ros-distro.conf @@ -14,7 +14,7 @@ ROS_DISTRO_COMPAT = "melodic dashing eloquent" # This variable is updated with the new release series as the first commit to [master] after the branch for the current release # series is created. -ROS_OE_RELEASE_SERIES = "honister" +ROS_OE_RELEASE_SERIES = "kirkstone" # "1" or "2" ROS_DISTRO_METADATA_VERSION_MAJOR = "${ROS_VERSION}" -- Gitee