Merge pull request #42 from fledge-iot/FOGL-5932.patch

Fix condition when "git describe" command fails

Author: YashTatkondawar

others/make_rpm

@@ -92,7 +92,9 @@ PKG_NAME="fledge-${ADDITIONAL_LIB_NAME}"
 ARCHITECTURE=`arch`
 PACKAGE_NAME="${PKG_NAME}-${VERSION}"
 BUILD_ROOT="${GIT_ROOT}/packages/build"
-GIT_TAG_INFO=$(git describe --tags | sed 's/-/_/g') && COMMIT_COUNT=$(echo ${GIT_TAG_INFO} | cut -d_ -f2) || { COMMIT_COUNT=$(git rev-list --count HEAD); GIT_TAG_INFO="v$VERSION_$COMMIT_COUNT_g$(git rev-parse --short HEAD)"; }
+# Get git tag info from "git describe" cmd and if that fails try another method
+# Note: git describe command fails when repo does not have release/tag
+GIT_TAG_INFO=$(git describe --tags) && GIT_TAG_INFO=$(echo ${GIT_TAG_INFO} | sed 's/-/_/g') && COMMIT_COUNT=$(echo ${GIT_TAG_INFO} | cut -d_ -f2) || { COMMIT_COUNT=$(git rev-list --count HEAD); GIT_TAG_INFO="v${VERSION}_${COMMIT_COUNT}_g$(git rev-parse --short HEAD)"; }
 branch_name=$(git rev-parse --abbrev-ref HEAD)
 if [[ ${branch_name} = "main" ]] || [[ ${branch_name} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then COMMIT_COUNT=1; fi
 PACKAGE_NAME="${PKG_NAME}-${VERSION}-${COMMIT_COUNT}"

plugins/make_rpm

@@ -135,7 +135,9 @@ do
     else
         pkg_name="fledge-${plugin_type}-${plugin_name}"
     fi
-  git_tag_info=$(git describe --tags | sed 's/-/_/g') && commit_count=$(echo ${git_tag_info} | cut -d_ -f2) || { commit_count=$(git rev-list --count HEAD); git_tag_info="v$version_$commit_count_g$(git rev-parse --short HEAD)"; }
+  # Get git tag info from "git describe" cmd and if that fails try another method
+  # Note: git describe command fails when repo does not have release/tag
+  git_tag_info=$(git describe --tags) && git_tag_info=$(echo ${git_tag_info} | sed 's/-/_/g') && commit_count=$(echo ${git_tag_info} | cut -d_ -f2) || { commit_count=$(git rev-list --count HEAD); git_tag_info="v${version}_${commit_count}_g$(git rev-parse --short HEAD)"; }
   if [[ ${BRANCH_NAME} = "main" ]] || [[ ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then commit_count=1; fi
   # Final package name
   package_name="${pkg_name}-${version}-${commit_count}"

service/make_rpm

@@ -151,7 +151,9 @@ do
     else
         pkg_name="fledge-service-${service_name}"
     fi
-    git_tag_info=$(git describe --tags | sed 's/-/_/g') && commit_count=$(echo ${git_tag_info} | cut -d_ -f2) || { commit_count=$(git rev-list --count HEAD); git_tag_info="v$version_$commit_count_g$(git rev-parse --short HEAD)"; }
+    # Get git tag info from "git describe" cmd and if that fails try another method
+    # Note: git describe command fails when repo does not have release/tag
+    git_tag_info=$(git describe --tags) && git_tag_info=$(echo ${git_tag_info} | sed 's/-/_/g') && commit_count=$(echo ${git_tag_info} | cut -d_ -f2) || { commit_count=$(git rev-list --count HEAD); git_tag_info="v${version}_${commit_count}_g$(git rev-parse --short HEAD)"; }
     if [[ ${BRANCH_NAME} = "main" ]] || [[ ${BRANCH_NAME} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]]; then commit_count=1; fi
     package_name="${pkg_name}-${version}-${commit_count}"