diff --git a/meta-ros-common/conf/ros-distro/ros-distro.conf b/meta-ros-common/conf/ros-distro/ros-distro.conf index 9e1647e5424dbadb4ba8303e60c76c4f65f2ba41..29802c0bd8b44c4edddc7c6afb4a999f7cc1a5b6 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}" 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 cbe4fbff6724096c3a82a3efd69eb965a6171571..b5b3136315321c2fda8d6a1ded1179ea6f8ce8a4 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 \ +# "