Revision: 7801
http://sourceforge.net/p/ipcop/svn/7801
Author: owes
Date: 2015-01-08 10:50:41 +0000 (Thu, 08 Jan 2015)
Log Message:
-----------
Directly grab PATCHLEVEL for version checking.
Modified Paths:
--------------
ipcop/trunk/make.sh
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2015-01-08 10:49:25 UTC (rev 7800)
+++ ipcop/trunk/make.sh 2015-01-08 10:50:41 UTC (rev 7801)
@@ -708,7 +708,7 @@
#########################################################################################################
get_pkg_ver()
{
- if echo ${1} | grep -q "lfs/linux$" ; then
+ if grep -q "^PATCHLEVEL" ${1} ; then
PKG_VER=`grep ^PATCHLEVEL ${1} | awk '{print $3}'`
else
PKG_VER=`grep ^VER ${1} | awk '{print $3}'`
@@ -2456,14 +2456,10 @@
# Listed as Xz Utils in LFS
PKG_LFS=`echo ${LINE} | cut -d"
" -f3`
fi
- if [ x"${PKG_NAME}" == x"linux" ]; then
- PKG_IPCOP=`grep ^PATCHLEVEL
${BASEDIR}/lfs/${PKG_NAME}|awk '{print $3}'`
- else
- PKG_IPCOP=`grep ^VER
${BASEDIR}/lfs/${PKG_NAME} | awk '{print $3}'`
- fi
+ get_pkg_ver ${BASEDIR}/lfs/${PKG_NAME}
- check_version "${PKG_NAME}" ${PKG_LFS}
${PKG_IPCOP}
- unset PKG_NAME PKG_LFS PKG_IPCOP
+ check_version "${PKG_NAME}" ${PKG_LFS}
${PKG_VER}
+ unset PKG_NAME PKG_LFS PKG_VER
fi
done
@@ -2485,15 +2481,11 @@
if [ -f "${BASEDIR}/lfs/${PKG_NAME}" ]; then
IFS= read -r LINE
PKG_DISTRO=`echo ${LINE} | sed -e
's#.*">\(.*\)<\/a.*#\1#g'`
- if [ x"${PKG_NAME}" == x"linux" ]; then
- PKG_IPCOP=`grep ^PATCHLEVEL
${BASEDIR}/lfs/${PKG_NAME}|awk '{print $3}'`
- else
- PKG_IPCOP=`grep ^VER ${BASEDIR}/lfs/${PKG_NAME} |
awk '{print $3}'`
- fi
+ get_pkg_ver ${BASEDIR}/lfs/${PKG_NAME}
- check_version "${PKG_NAME}" ${PKG_DISTRO} ${PKG_IPCOP}
+ check_version "${PKG_NAME}" ${PKG_DISTRO} ${PKG_VER}
fi
- unset PKG_NAME PKG_DISTRO PKG_IPCOP
+ unset PKG_NAME PKG_DISTRO PKG_VER
fi
done
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
