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@digium.com> (cherry picked from commit f09daed735)
build_tools/make_version: Only strip 'v' if followed by a digit.
2013-03-13 16:54:11 -05:00 · 2013-03-13 16:53:48 -05:00 · 2013-03-08 11:39:53 -06:00 · 2013-03-07 16:20:00 -06:00 · 2013-03-04 11:07:35 -06:00
4 changed files with 14 additions and 8 deletions
--- a/6
+++ b/6
@@ -67,13 +67,7 @@ GENERATED_DOCS:=README.html
 ifneq ($(wildcard .version),)
  DAHDIVERSION:=$(shell cat .version)
 else
-ifneq ($(wildcard .svn),)
  DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux)
-else
-ifneq ($(wildcard .git),)
-  DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux)
-endif
-endif
 endif

 all: modules
--- 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 --long --always --tags --dirty=M 2> /dev/null`
+        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"
@@ -115,4 +115,8 @@ elif [ -d ${1}/.git ]; then

        echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED}
    fi
+else
+	# Use the directory information in the absence of any other version
+	# information
+	pwd -P
 fi
--- 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)
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -120,6 +120,14 @@
 #  endif
 #endif

+/* __dev* were removed in 3.8. They still have effect in 2.6.18. */
+#ifndef __devinit
+#  define __devinit
+#  define __devinitdata
+#  define __devexit
+#  define __devexit_p(x) x
+#endif
+
 /*! Default chunk size for conferences and such -- static right now, might make
   variable sometime.  8 samples = 1 ms = most frequent service interval possible
   for a USB device */
Author	SHA1	Message	Date
Russ Meyerriecks	281105548c	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@digium.com> (cherry picked from commit `f09daed735`)	2013-03-13 16:54:11 -05:00
Shaun Ruffell	dea3d9cbd6	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@digium.com> (cherry picked from commit `7714d5d94e`)	2013-03-13 16:53:48 -05:00
Shaun Ruffell	ae8a02168b	build_tools/make_version: Strip off the leading 'v' in the version string. Quote: "It's a change. People hate change" Make the version string say something like 2.6.2 instead of v2.6.2. Signed-off-by: Shaun Ruffell <sruffell@digium.com> (cherry picked from commit `9b0d19c054`)	2013-03-08 11:39:53 -06:00
Shaun Ruffell	2a5638deef	build_tools/make_version: If making from a tag show only the tag in the version. Also, if there is no other version information use the directory name. Downloads from gitweb will include the sha information in the build and otherwise a user could locate the source directory via the embedded version information. I believe this is better than an empty string. Signed-off-by: Shaun Ruffell <sruffell@digium.com> (cherry picked from commit `37371f19e9`)	2013-03-07 16:20:00 -06:00
Tzafrir Cohen	fcaec330e5	Redefine the removed __dev* for now The __dev* directives and functions were removed in 3.8, as they are no-ops. We still have use of them for older versions, thus we should define them (as noops) if they don't exist. Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>	2013-03-04 11:07:35 -06:00