gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use version string in configure.ac when git repo is not found

Browse Source
This commit is contained in:
Masamichi Takagi
2018-01-24 00:52:18 +09:00
parent d4459cf9f3
commit 8123cc413e
3 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.in
View File

@ -3,8 +3,7 @@
/* Path of install directory for binary */ /* Path of install directory for binary */
#undef BINDIR #undef BINDIR
/* Id of IHK.ko maching of which is checked at run-time by reboot script and /* IHK build-id to confirm IHK and McKernel built at the same time are used */
mcexec */
#undef BUILDID #undef BUILDID
/* whether mcoverlayfs is enabled */ /* whether mcoverlayfs is enabled */

34
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for mckernel 0.9.0. # Generated by GNU Autoconf 2.69 for mckernel 1.4.0.
# #
# #
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='mckernel' PACKAGE_NAME='mckernel'
PACKAGE_TARNAME='mckernel' PACKAGE_TARNAME='mckernel'
PACKAGE_VERSION='0.9.0' PACKAGE_VERSION='1.4.0'
PACKAGE_STRING='mckernel 0.9.0' PACKAGE_STRING='mckernel 1.4.0'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
PACKAGE_URL='' PACKAGE_URL=''
@ -1262,7 +1262,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures mckernel 0.9.0 to adapt to many kinds of systems. \`configure' configures mckernel 1.4.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1323,7 +1323,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of mckernel 0.9.0:";; short | recursive ) echo "Configuration of mckernel 1.4.0:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1431,7 +1431,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
mckernel configure 0.9.0 mckernel configure 1.4.0
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -1729,7 +1729,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by mckernel $as_me 0.9.0, which was It was created by mckernel $as_me 1.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -2082,12 +2082,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
IHK_VERSION=0.9.0 IHK_VERSION=1.4.0
MCKERNEL_VERSION=0.9.0 MCKERNEL_VERSION=1.4.0
DCFA_VERSION=0.9.0 DCFA_VERSION=1.4.0
IHK_RELEASE_DATE=2013-11-18 IHK_RELEASE_DATE=2017-10-30
MCKERNEL_RELEASE_DATE=2013-11-18 MCKERNEL_RELEASE_DATE=2017-10-30
DCFA_RELEASE_DATE=2013-11-18 DCFA_RELEASE_DATE=2017-10-30
@ -5015,9 +5015,7 @@ _ACEOF
ABS_SRCDIR=$( cd $( dirname $0 ); pwd ) ABS_SRCDIR=$( cd $( dirname $0 ); pwd )
IHK_ABS_SRCDIR=${ABS_SRCDIR}/../ihk IHK_ABS_SRCDIR=${ABS_SRCDIR}/../ihk
{ $as_echo "$as_me:${as_lineno-$LINENO}: IHK_ABS_SRCDIR=$IHK_ABS_SRCDIR" >&5 BUILDID=$( cd $IHK_ABS_SRCDIR; if [ ! -d .git ]; then echo $IHK_VERSION; else bash -c 'git rev-list -1 HEAD | cut -c1-8'; fi )
$as_echo "$as_me: IHK_ABS_SRCDIR=$IHK_ABS_SRCDIR" >&6;}
BUILDID=$( cd $IHK_ABS_SRCDIR; git rev-list -1 HEAD | cut -c1-8 )
{ $as_echo "$as_me:${as_lineno-$LINENO}: BUILDID=$BUILDID" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: BUILDID=$BUILDID" >&5
$as_echo "$as_me: BUILDID=$BUILDID" >&6;} $as_echo "$as_me: BUILDID=$BUILDID" >&6;}
if test "x$BUILDID" != "x" ; then if test "x$BUILDID" != "x" ; then
@ -5587,7 +5585,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by mckernel $as_me 0.9.0, which was This file was extended by mckernel $as_me 1.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -5649,7 +5647,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
mckernel config.status 0.9.0 mckernel config.status 1.4.0
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

14
configure.ac
View File

@ -1,11 +1,11 @@
# configure.ac COPYRIGHT FUJITSU LIMITED 2015-2016 # configure.ac COPYRIGHT FUJITSU LIMITED 2015-2016
AC_PREREQ(2.63) AC_PREREQ(2.63)
m4_define([IHK_VERSION_m4],[0.9.0])dnl m4_define([IHK_VERSION_m4],[1.4.0])dnl
m4_define([MCKERNEL_VERSION_m4],[0.9.0])dnl m4_define([MCKERNEL_VERSION_m4],[1.4.0])dnl
m4_define([DCFA_VERSION_m4],[0.9.0])dnl m4_define([DCFA_VERSION_m4],[1.4.0])dnl
m4_define([IHK_RELEASE_DATE_m4],[2013-11-18])dnl m4_define([IHK_RELEASE_DATE_m4],[2017-10-30])dnl
m4_define([MCKERNEL_RELEASE_DATE_m4],[2013-11-18])dnl m4_define([MCKERNEL_RELEASE_DATE_m4],[2017-10-30])dnl
m4_define([DCFA_RELEASE_DATE_m4],[2013-11-18])dnl m4_define([DCFA_RELEASE_DATE_m4],[2017-10-30])dnl
AC_INIT([mckernel], MCKERNEL_VERSION_m4) AC_INIT([mckernel], MCKERNEL_VERSION_m4)
@ -504,7 +504,7 @@ AC_DEFINE_UNQUOTED(SBINDIR,"$SBINDIR",[Path of install directory for system bina
ABS_SRCDIR=$( cd $( dirname $0 ); pwd ) ABS_SRCDIR=$( cd $( dirname $0 ); pwd )
IHK_ABS_SRCDIR=${ABS_SRCDIR}/../ihk IHK_ABS_SRCDIR=${ABS_SRCDIR}/../ihk
BUILDID=$( cd $IHK_ABS_SRCDIR; git rev-list -1 HEAD | cut -c1-8 ) BUILDID=$( cd $IHK_ABS_SRCDIR; if @<:@ ! -d .git @:>@; then echo $IHK_VERSION; else bash -c 'git rev-list -1 HEAD | cut -c1-8'; fi )
AC_MSG_NOTICE([BUILDID=$BUILDID]) AC_MSG_NOTICE([BUILDID=$BUILDID])
if test "x$BUILDID" != "x" ; then if test "x$BUILDID" != "x" ; then
AC_DEFINE_UNQUOTED(BUILDID,"$BUILDID",[IHK build-id to confirm IHK and McKernel built at the same time are used]) AC_DEFINE_UNQUOTED(BUILDID,"$BUILDID",[IHK build-id to confirm IHK and McKernel built at the same time are used])