[dahdi-commits] dahdi/linux.git branch "2.6.y" updated.

[SVN commits to the DAHDI project]

branch "2.6.y" has been updated
       via  281105548c7d7e2d03221b001f9c08c4bac8ee79 (commit)
       via  dea3d9cbd6f6e84b9a83d7010bf8b8fea854bf6f (commit)
      from  ae8a02168ba6c9ba5b17ad886a899c664c1b9a3d (commit)

Summary of changes:
 build_tools/make_version |    2 +-
 drivers/dahdi/Kbuild     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 281105548c7d7e2d03221b001f9c08c4bac8ee79
Author: Russ Meyerriecks <rmeyerriecks at digium.com>
Date:   Wed Mar 13 16:26:42 2013 -0500

    Kbuild: Fix OSLEC build error
    
    Fixes up the kbuild to work with compiling OSLEC from the kernel source. See
    HOWTO here: http://forums.digium.com/viewtopic.php?t=67164
    
    Internal-Issue-ID: DAHLIN-317
    Reported-By: Vladimir Mikhelson
    Signed-off-by: Russ Meyerriecks <rmeyerriecks at digium.com>
    (cherry picked from commit f09daed735f1be091fe9f177f675d0c87ad65900)

diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
index 8bbfea0..76bbf41 100644
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
@@ -38,7 +38,7 @@ obj-m += $(DAHDI_MODULES_EXTRA)
 # well:
 ifneq (,$(wildcard $(src)/../staging/echo/echo.c))
 obj-m += dahdi_echocan_oslec.o
-obj-m += ../staging/echo/
+obj-m += ../staging/echo/echo.o
 endif
 
 CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)

commit dea3d9cbd6f6e84b9a83d7010bf8b8fea854bf6f
Author: Shaun Ruffell <sruffell at digium.com>
Date:   Fri Mar 8 11:28:11 2013 -0600

    build_tools/make_version: Only strip 'v' if followed by a digit.
    
    Do not want to accidentally change the tag "very_cool" to "ery_cool".
    
    Signed-off-by: Shaun Ruffell <sruffell at digium.com>
    (cherry picked from commit 7714d5d94e3cb6d3ff5e9eceaee5b131a43b0ce8)

diff --git a/build_tools/make_version b/build_tools/make_version
index f880ad6..8eb2299 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -59,7 +59,7 @@ elif [ -d ${1}/.git ]; then
     MODIFIED=""
     SVN_REV=`git log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
     if [ -z "$SVN_REV" ]; then
-        VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v//"`
+        VERSION=`git describe --tags --dirty=M 2> /dev/null | sed -e "s/^v\([0-9]\)/\1/"`
         if [ $? -ne 0 ]; then
             if [ "`git ls-files -m | wc -l`" != "0" ]; then
                 MODIFIED="M"

-----------------------------------------------------------------------


-- 
dahdi/linux.git