Commit f1da4876 authored by Jan Kiszka's avatar Jan Kiszka

Remove version name

This drops the naming of each release, lowering the creative effort for
the release manager and, thus, potentially raising the motivation to
release more often.
Signed-off-by: Jan Kiszka's avatarJan Kiszka <jan.kiszka@siemens.com>
parent 936c9917
...@@ -25,7 +25,6 @@ CONFIG_XENO_VERSION_MINOR=`expr $version_code : '[[0-9]]*\.\([[0-9]]*\)'` ...@@ -25,7 +25,6 @@ CONFIG_XENO_VERSION_MINOR=`expr $version_code : '[[0-9]]*\.\([[0-9]]*\)'`
CONFIG_XENO_REVISION_LEVEL=`expr $version_code : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` CONFIG_XENO_REVISION_LEVEL=`expr $version_code : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
CONFIG_XENO_UAPI_LEVEL=`cat $srcdir/config/apirev` CONFIG_XENO_UAPI_LEVEL=`cat $srcdir/config/apirev`
CONFIG_XENO_VERSION_STRING="$PACKAGE_VERSION" CONFIG_XENO_VERSION_STRING="$PACKAGE_VERSION"
CONFIG_XENO_VERSION_NAME=`cat $srcdir/config/version-name`
topdir=`cd $srcdir && pwd` topdir=`cd $srcdir && pwd`
dnl Find out whether we build for Cobalt core, i.e. dual kernel mode, dnl Find out whether we build for Cobalt core, i.e. dual kernel mode,
...@@ -557,7 +556,6 @@ AC_DEFINE_UNQUOTED(CONFIG_XENO_VERSION_MINOR,$CONFIG_XENO_VERSION_MINOR,[config] ...@@ -557,7 +556,6 @@ AC_DEFINE_UNQUOTED(CONFIG_XENO_VERSION_MINOR,$CONFIG_XENO_VERSION_MINOR,[config]
AC_DEFINE_UNQUOTED(CONFIG_XENO_REVISION_LEVEL,$CONFIG_XENO_REVISION_LEVEL,[config]) AC_DEFINE_UNQUOTED(CONFIG_XENO_REVISION_LEVEL,$CONFIG_XENO_REVISION_LEVEL,[config])
AC_DEFINE_UNQUOTED(CONFIG_XENO_UAPI_LEVEL,$CONFIG_XENO_UAPI_LEVEL,[config]) AC_DEFINE_UNQUOTED(CONFIG_XENO_UAPI_LEVEL,$CONFIG_XENO_UAPI_LEVEL,[config])
AC_DEFINE_UNQUOTED(CONFIG_XENO_VERSION_STRING,"$CONFIG_XENO_VERSION_STRING",[config]) AC_DEFINE_UNQUOTED(CONFIG_XENO_VERSION_STRING,"$CONFIG_XENO_VERSION_STRING",[config])
AC_DEFINE_UNQUOTED(CONFIG_XENO_VERSION_NAME,"$CONFIG_XENO_VERSION_NAME",[config])
AC_DEFINE_UNQUOTED(CONFIG_XENO_PREFIX,"$prefix",[config]) AC_DEFINE_UNQUOTED(CONFIG_XENO_PREFIX,"$prefix",[config])
AC_DEFINE_UNQUOTED(CONFIG_XENO_BUILD_ARGS,"$XENO_BUILD_ARGS",[config]) AC_DEFINE_UNQUOTED(CONFIG_XENO_BUILD_ARGS,"$XENO_BUILD_ARGS",[config])
......
...@@ -31,6 +31,4 @@ ...@@ -31,6 +31,4 @@
#define XENO_VERSION_STRING CONFIG_XENO_VERSION_STRING #define XENO_VERSION_STRING CONFIG_XENO_VERSION_STRING
#define XENO_VERSION_NAME CONFIG_XENO_VERSION_NAME
#endif /* _XENOMAI_VERSION_H */ #endif /* _XENOMAI_VERSION_H */
...@@ -388,9 +388,8 @@ static int __init xenomai_init(void) ...@@ -388,9 +388,8 @@ static int __init xenomai_init(void)
rtdm_fd_init(); rtdm_fd_init();
printk(XENO_INFO "Cobalt v%s (%s) %s%s%s%s\n", printk(XENO_INFO "Cobalt v%s %s%s%s%s\n",
XENO_VERSION_STRING, XENO_VERSION_STRING,
XENO_VERSION_NAME,
boot_debug_notice, boot_debug_notice,
boot_lat_trace_notice, boot_lat_trace_notice,
boot_evt_trace_notice, boot_evt_trace_notice,
......
...@@ -49,7 +49,3 @@ config XENO_REVISION_LEVEL ...@@ -49,7 +49,3 @@ config XENO_REVISION_LEVEL
config XENO_VERSION_STRING config XENO_VERSION_STRING
string string
default @VERSION_STRING@ default @VERSION_STRING@
config XENO_VERSION_NAME
string
default "@VERSION_NAME@"
...@@ -378,12 +378,10 @@ case $linux_VERSION.$linux_PATCHLEVEL in ...@@ -378,12 +378,10 @@ case $linux_VERSION.$linux_PATCHLEVEL in
version_minor=`expr $version_stamp : '[[0-9]]*\.\([[0-9]*]*\)' || true` version_minor=`expr $version_stamp : '[[0-9]]*\.\([[0-9]*]*\)' || true`
revision_level=`expr $version_stamp : '[[0-9]]*\.[[0-9]*]*\.\([[0-9]*]*\)' || true` revision_level=`expr $version_stamp : '[[0-9]]*\.[[0-9]*]*\.\([[0-9]*]*\)' || true`
version_string=`cat $xenomai_root/config/version-label` version_string=`cat $xenomai_root/config/version-label`
version_name=`cat $xenomai_root/config/version-name`
sed -e "s,@VERSION_MAJOR@,$version_major,g" \ sed -e "s,@VERSION_MAJOR@,$version_major,g" \
-e "s,@VERSION_MINOR@,$version_minor,g" \ -e "s,@VERSION_MINOR@,$version_minor,g" \
-e "s,@REVISION_LEVEL@,$revision_level,g" \ -e "s,@REVISION_LEVEL@,$revision_level,g" \
-e "s,@VERSION_STRING@,$version_string,g" \ -e "s,@VERSION_STRING@,$version_string,g" \
-e "s,@VERSION_NAME@,$version_name,g" \
$xenomai_root/scripts/Kconfig.frag | $xenomai_root/scripts/Kconfig.frag |
patch_append init/Kconfig patch_append init/Kconfig
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment