Revision: 6057
http://ipcop.svn.sourceforge.net/ipcop/?rev=6057&view=rev
Author: gespinasse
Date: 2011-11-12 09:18:57 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Fix a cosmetic issue on kernel compilation in make.sh
Now when compiling 2.6.32.x kernel, ./make.sh build will display 2.6.32.x for
the version and not 2.6.32 only.
Modified Paths:
--------------
ipcop/trunk/lfs/linux
ipcop/trunk/make.sh
Modified: ipcop/trunk/lfs/linux
===================================================================
--- ipcop/trunk/lfs/linux 2011-11-12 08:14:51 UTC (rev 6056)
+++ ipcop/trunk/lfs/linux 2011-11-12 09:18:57 UTC (rev 6057)
@@ -46,7 +46,7 @@
CFLAGS =
CXXFLAGS =
LDFLAGS =
-# compilation will display VER when target will write PATCHLEVEL
+
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(PKG_NAME)-$(PATCHLEVEL)
# grsecurity, not used for now, define to yes, to load patch and apply
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2011-11-12 08:14:51 UTC (rev 6056)
+++ ipcop/trunk/make.sh 2011-11-12 09:18:57 UTC (rev 6057)
@@ -699,7 +699,11 @@
#########################################################################################################
get_pkg_ver()
{
- PKG_VER=`grep ^VER ${1} | awk '{print $3}'`
+ if echo ${1} | grep -q "lfs/linux$" ; then
+ PKG_VER=`grep ^PATCHLEVEL ${1} | awk '{print $3}'`
+ else
+ PKG_VER=`grep ^VER ${1} | awk '{print $3}'`
+ fi
if [ -z ${PKG_VER} ]; then
PKG_VER="svn-$(grep "# \$Id:" ${1} | awk '{print $4}')"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
