diff options
| author | Chris Johns <chrisj@rtems.org> | 2022-11-10 14:05:52 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2022-11-10 14:06:05 +1100 |
| commit | 0305b46a83a3dd3e2ada4cb3326e282e5ca3daba (patch) | |
| tree | 4104f2d4a0b5300a82b90bb06d064339b21c3004 | |
| parent | release: Update usage help (diff) | |
| download | rtems-release-0305b46a83a3dd3e2ada4cb3326e282e5ca3daba.tar.bz2 | |
release: Fix the version number parsing
| -rwxr-xr-x | rtems-release-package-start | 8 | ||||
| -rw-r--r-- | rtems-release-version | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/rtems-release-package-start b/rtems-release-package-start index 8442420..47a4005 100755 --- a/rtems-release-package-start +++ b/rtems-release-package-start @@ -58,13 +58,7 @@ else worker= fi -revision_no=$(echo ${revision} | sed -e 's/\-.*$//') -if [ ${version} -ge 5 ]; then - even_odd=$(( ${revision_no} % 2 )) - if [ ${even_odd} -eq 0 ]; then - revision_no=$(expr ${revision_no} + 1) - fi -fi +revision_no=$(echo ${revision} | sed -e 's/\-.*$//' -e 's/\..*//') release=${version}.${revision} prefix=${package}-${release} diff --git a/rtems-release-version b/rtems-release-version index b964ff5..71a0f04 100644 --- a/rtems-release-version +++ b/rtems-release-version @@ -43,7 +43,7 @@ release=${version}.${revision} # # Version configuration. Overrides defaults. # -if [ -f rtems-release-${version}-conf ]; then - rtems_release_conf=rtems-release-${version}-conf - . rtems-release-${version}-conf +if [ -f ${release_top}/rtems-release-${version}-conf ]; then + rtems_release_conf=${release_top}/rtems-release-${version}-conf + . ${release_top}/rtems-release-${version}-conf fi |