#4049 closed defect (fixed)

RTEMS version number 5.1 breaks RTEMS version code

Reported by: Chris Johns Owned by:
Priority: highest Milestone: 5.1
Component: build Version: 5
Severity: blocker Keywords:
Cc: Blocked By:
Blocking:

Description

The rtems.git code assumes major.minor.revision and changing it to version.revision breaks the configure processing to create the cpuopts.h file. For example using 5.1-rc2 as the version string results in:

In file included from /build/rtems/releases/build/5.1-rc2/rtems-source-builder-5.1-rc2/rtems/build/arm-rtems5-kernel-beagleboneblack-1/arm-rtems5-kernel-beagleboneblack-1-5.1-rc2/rtems-5.1-rc2/cpukit/include/rtems/score/basedefs.h:31:0,
                 from /build/rtems/releases/build/5.1-rc2/rtems-source-builder-5.1-rc2/rtems/build/arm-rtems5-kernel-beagleboneblack-1/arm-rtems5-kernel-beagleboneblack-1-5.1-rc2/rtems-5.1-rc2/cpukit/include/rtems/rtems/status.h:21,
                 from /build/rtems/releases/build/5.1-rc2/rtems-source-builder-5.1-rc2/rtems/build/arm-rtems5-kernel-beagleboneblack-1/arm-rtems5-kernel-beagleboneblack-1-5.1-rc2/rtems-5.1-rc2/cpukit/include/rtems.h:29,
                 from ../../../../../rtems-5.1-rc2/c/src/../../cpukit/sapi/src/version.c:27:
../../../../../rtems-5.1-rc2/c/src/../../cpukit/sapi/src/version.c: In function 'rtems_version_minor':
/build/rtems/releases/build/5.1-rc2/rtems-source-builder-5.1-rc2/rtems/build/arm-rtems5-kernel-beagleboneblack-1/arm-rtems5-kernel-beagleboneblack-1-5.1-rc2/build/arm-rtems5/c/beagleboneblack/include/rtems/score/cpuopts.h:62:27: error: 'rc2' undeclared (first use in this function)
 #define __RTEMS_MINOR__ 1-rc2
                           ^
../../../../../rtems-5.1-rc2/c/src/../../cpukit/sapi/src/version.c:48:10: note: in expansion of macro '__RTEMS_MINOR__'
   return __RTEMS_MINOR__;
          ^~~~~~~~~~~~~~~
/build/rtems/releases/build/5.1-rc2/rtems-source-builder-5.1-rc2/rtems/build/arm-rtems5-kernel-beagleboneblack-1/arm-rtems5-kernel-beagleboneblack-1-5.1-rc2/build/arm-rtems5/c/beagleboneblack/include/rtems/score/cpuopts.h:62:27: note: each undeclared identifier is reported only once for each function it appears in
 #define __RTEMS_MINOR__ 1-rc2
                           ^
../../../../../rtems-5.1-rc2/c/src/../../cpukit/sapi/src/version.c:48:10: note: in expansion of macro '__RTEMS_MINOR__'
   return __RTEMS_MINOR__;
          ^~~~~~~~~~~~~~~
../../../../../rtems-5.1-rc2/c/src/../../cpukit/sapi/src/version.c:49:1: warning: control reaches end of non-void function [-Wreturn-type]
 }
 ^
gmake[4]: *** [Makefile:11437: sapi/src/version.o] Error 1

I suggest the release script adds the third digit. Note, this is a hack however given this point in the release anything else is too late.

Change History (1)

comment:1 Changed on Aug 14, 2020 at 9:17:56 PM by Chris Johns

Resolution: fixed
Status: newclosed

Fixed on the 5 branch of rtems-release.git.

Note: See TracTickets for help on using tickets.