From patchwork Sat Jul 23 11:16:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 1242 Return-Path: Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 9695E154154 for ; Sat, 23 Jul 2011 13:16:48 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@narfation.org; dkim-adsp=pass Received: from sven-desktop.home.narfation.org (i59F6C2D0.versanet.de [89.246.194.208]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 5C9729410B; Sat, 23 Jul 2011 13:17:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1311419855; bh=3kS/WpSEVemKH7jtbcqT6NLaaSmwZOeKidh0+wVeaJI=; h=From:To:Cc:Subject:Date:Message-Id; b=BzzFkshOJcjB7Iu27R9GfcGU1UoYn+BhGrjCoIcwLus9/sG4u79h72sbVQB7LOuGn UK+vO85cJ4uPpSAvJaHAUydxjczpxJBZC1AZ60EXQfYHha03dKBfElmAwUNDTuCko9 eu9qy4p/mlNLRLtjk96lhETyezkYV5+VxGzrPOc0= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 23 Jul 2011 13:16:42 +0200 Message-Id: <1311419802-31283-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.5.4 Subject: [B.A.T.M.A.N.] [PATCH] batmand: Fix build of batgat module with linux 3.0 X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jul 2011 11:16:48 -0000 Signed-off-by: Sven Eckelmann --- This patch depends on the patches currently stored in the branch pu/nonblock_ioctl Btw. findstring sounds a little bit... error-prone linux/modules/Makefile | 8 ++++---- linux/modules/Makefile.kbuild | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/modules/Makefile b/linux/modules/Makefile index eccb601..2aa20e1 100644 --- a/linux/modules/Makefile +++ b/linux/modules/Makefile @@ -10,8 +10,8 @@ endif UNAME:=$(shell uname -r) -LINUX26=2.6 -LINUX_VERSION:=$(findstring $(LINUX26),$(UNAME)) +LINUX24=2.4 +LINUX_VERSION:=$(findstring $(LINUX24),$(UNAME)) REVISION:= $(shell if [ -d .svn ]; then \ if which svn > /dev/null; then \ svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'; \ @@ -30,14 +30,14 @@ REVISION:= $(shell if [ -d .svn ]; then \ include $(PWD)/Makefile.kbuild -ifneq ($(LINUX_VERSION),$(LINUX26)) +ifeq ($(LINUX_VERSION),$(LINUX24)) TARGET:=batgat INCLUDE:=-I/lib/modules/$(UNAME)/build/include -I/usr/src/kernel-headers-$(UNAME)/include EXTRA_CFLAGS+=-D__KERNEL__ -DMODULE -O2 -Wall $(INCLUDE) CC:=gcc endif -ifeq ($(LINUX_VERSION),$(LINUX26)) +ifneq ($(LINUX_VERSION),$(LINUX24)) all: $(MAKE) -C $(KERNELPATH) REVISION=$(REVISION) M=$(PWD) PWD=$(PWD) modules diff --git a/linux/modules/Makefile.kbuild b/linux/modules/Makefile.kbuild index 91982a5..18ac9a7 100644 --- a/linux/modules/Makefile.kbuild +++ b/linux/modules/Makefile.kbuild @@ -2,10 +2,10 @@ ifeq ($(MAKING_MODULES),1) -include $(TOPDIR)/Rules.make endif -LINUX26:=2.6 +LINUX24:=2.4 EXTRA_CFLAGS +=-DREVISION_VERSION=\"\ rv$(REVISION)\" -ifeq ($(strip $(findstring $(LINUX26),$(LINUX_VERSION))),$(LINUX26)) +ifneq ($(strip $(findstring $(LINUX24),$(LINUX_VERSION))),$(LINUX24)) obj-m += batgat.o batgat-objs := gateway.o hash.o