From 5830698e0b1dfc472045efe85eff0f7b271ddb71 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@lge.com>
Date: Wed, 11 Nov 2020 08:24:55 -0800
Subject: [PATCH] scripts/ros-generate-{cache,recipes}.sh: don't set
 ROS_PYTHON_VERSION (v1.6.0)

* leave ROS_VERSION and ROS_PYTHON_VERSION setting for
  "conditional" attributes on superflore itself
* ROS_VERSION (not exported) is still needed as it's used
  in these scripts as:
  generated="meta-ros$ROS_VERSION-$ROS_DISTRO/files/$ROS_DISTRO/generated"

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
---
 scripts/ros-generate-cache.sh   | 11 ++++-------
 scripts/ros-generate-recipes.sh |  7 ++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/scripts/ros-generate-cache.sh b/scripts/ros-generate-cache.sh
index 9dbfe666b12..1f1c2aac088 100644
--- a/scripts/ros-generate-cache.sh
+++ b/scripts/ros-generate-cache.sh
@@ -18,7 +18,7 @@
 # Copyright (c) 2019-2020 LG Electronics, Inc.
 
 readonly SCRIPT_NAME="ros-generate-cache"
-readonly SCRIPT_VERSION="1.5.3"
+readonly SCRIPT_VERSION="1.6.0"
 
 # Files under ros/rosdistro/rosdep that we care about. Keep in sync with setting in ros-generate-recipes.sh .
 readonly ROSDEP_YAML_BASENAMES="base python ruby"
@@ -44,17 +44,14 @@ ROS_ROSDISTRO_CHECKOUT_PATH=$3
 ROS_ROSDISTRO_COMMIT=$4
 BRANCH_NAME=$5
 
-# ROS_VERSION and ROS_PYTHON_VERSION must be in the environment as they appear in "conditional" attributes. Keep this block in
-# sync with the one in ros-generate-recipes.sh .
+# Keep this block in sync with the one in ros-generate-recipes.sh .
 case $ROS_DISTRO in
     "melodic"|"noetic")
-        export ROS_VERSION="1"
-        export ROS_PYTHON_VERSION="2"
+        ROS_VERSION="1"
         ;;
 
     "dashing"|"eloquent"|"foxy"|"rolling")
-        export ROS_VERSION="2"
-        export ROS_PYTHON_VERSION="3"
+        ROS_VERSION="2"
         ;;
 
     *)  echo "ABORT: Unrecognized ROS_DISTRO: $ROS_DISTRO"
diff --git a/scripts/ros-generate-recipes.sh b/scripts/ros-generate-recipes.sh
index e2ec2aac312..65eb57ccc06 100644
--- a/scripts/ros-generate-recipes.sh
+++ b/scripts/ros-generate-recipes.sh
@@ -17,7 +17,7 @@
 # Copyright (c) 2019-2020 LG Electronics, Inc.
 
 readonly SCRIPT_NAME="ros-generate-recipes"
-readonly SCRIPT_VERSION="1.5.3"
+readonly SCRIPT_VERSION="1.6.0"
 
 # Files under ros/rosdistro/rosdep that we care about. Keep in sync with setting in ros-generate-cache.sh .
 readonly ROSDEP_YAML_BASENAMES="base python ruby"
@@ -47,17 +47,14 @@ if [ -z "$SUPERFLORE_GEN_OE_RECIPES" ]; then
 fi
 
 ROS_DISTRO=$1
-# ROS_VERSION and ROS_PYTHON_VERSION must be in the environment as they appear in "conditional" attributes. Keep this block in
-# sync with the one in ros-generate-cache.sh .
+# Keep this block in sync with the one in ros-generate-cache.sh .
 case $ROS_DISTRO in
     "melodic"|"noetic")
         export ROS_VERSION="1"
-        export ROS_PYTHON_VERSION="2"
         ;;
 
     "dashing"|"eloquent"|"foxy"|"rolling")
         export ROS_VERSION="2"
-        export ROS_PYTHON_VERSION="3"
         ;;
 
     *)  echo "ABORT: Unrecognized ROS_DISTRO: $ROS_DISTRO"