From db05503130643063289602a946e6908cf99fb078 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sun, 16 May 2004 19:09:27 +0000 Subject: [PATCH] Rene Rebe: fixed the new linux extra-version detection - on most systems the resulution is not high enought - would need to (reread the kernel source for details) [2004050420234502392] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2930 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux24/lx_config.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/package/base/linux24/lx_config.sh b/package/base/linux24/lx_config.sh index e772739ad..03c422164 100644 --- a/package/base/linux24/lx_config.sh +++ b/package/base/linux24/lx_config.sh @@ -166,11 +166,16 @@ lx_injectextraversion () { lx_extraversion="${lx_extraversion}-rock" # inject final EXTRAVERSION into Makefile - sed -e "s,^\([ \t]*EXTRAVERSION[ \t]*\)=.*,\1= ${lx_extraversion},g" Makefile > Makefile.new - mv Makefile.new Makefile - - # update version.h - eval $MAKE include/linux/version.h + sed -i -e "s,^\([ \t]*EXTRAVERSION[ \t]*\)=.*,\1= ${lx_extraversion},g" Makefile + + # update version.h - we only do this, because some other freaky + # projects like rsbac change EXTRAVERSION in other Makefiles ... + rerun=""; eval $MAKE include/linux/version.h | grep -q "is up to date" && rerun=1 + if [ "$rerun" ] ; then + echo "WARNING: Your system's timer resolution is too low ..." + sleep 1 ; touch Makefile + eval $MAKE include/linux/version.h + fi # get kernel_release lx_kernelrelease="$( echo -e "#include \nUTS_RELEASE" \