File wanpipe-04-kernel3.diff of Package wanpipe

Overview Repositories Revisions Requests Users Attributes Meta

File wanpipe-04-kernel3.diff of Package wanpipe

From: jamesp@vicidial.com
Date: Thu Dec 16 12:19:48 UTC 2011
Upstream: you better do

Dots must be properly escaped for grep to reliably work.
Also, the eval is wholly redundant.

The test for Linux 3.x was broken in Setup -
running it on 3.4 makes it think we are on 2.2.

---
 Setup             |    8 ++++----
 samples/wanrouter |   26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

Index: wanpipe-7.0.21.1/Setup
===================================================================
--- wanpipe-7.0.21.1.orig/Setup
+++ wanpipe-7.0.21.1/Setup
@@ -7642,20 +7642,20 @@ check_bash
 check_awk
 
 #Check for kernel series 2.2.X or 2.4.X
-eval "uname -r | grep \"^2.4.*\" > /dev/null"
+uname -r | grep -q '^2\.4\.'
 if [ $? -eq 0 ]; then
 	KERN_VER=24
 	LINUXDRIVERS_NET="drivers/net/wan"
 	DEFAULT_PROTOCOLS=$DEFAULT_PROTOCOLS"-ADSL-ATM"
 else
 
-	eval "uname -r | grep \"^2.6.*\" > /dev/null"
+	uname -r | grep -q '^2\.6\.'
 	if [ $? -eq 0 ]; then
 		KERN_VER=26
 		LINUXDRIVERS_NET="drivers/net/wan"
 		DEFAULT_PROTOCOLS=$DEFAULT_PROTOCOLS"-ADSL-ATM"
 	else
-		eval "uname -r | grep \"^3.0.*\" > /dev/null"
+		uname -r | grep -q '^3\.'
 		if [ $? -eq 0 ]; then
 			KERN_VER=30
 			LINUXDRIVERS_NET="drivers/net/wan"
@@ -7664,7 +7664,7 @@ else
 			KERN_VER=22
 			LINUXDRIVERS_NET="drivers/net"
 		
-			eval "uname -r | grep \"^2.0.*\" > /dev/null"
+			uname -r | grep -q '^2\.0\.'
 			if [ $? -eq 0 ]; then
 				echo
 				echo "Wanpipe drivers do not support 2.0.X kernels !!!"
Index: wanpipe-7.0.21.1/samples/wanrouter
===================================================================
--- wanpipe-7.0.21.1.orig/samples/wanrouter
+++ wanpipe-7.0.21.1/samples/wanrouter
@@ -2216,7 +2216,7 @@ init_global_params()
 		MOD5=/lib/modules/af_wanpipe
 	
 		if [ -d /lib/modules/$(uname -r) ]; then
-			uname -r | grep "^2.4.*" > /dev/null
+			uname -r | grep -q '^2\.4\.'
 			if [ $? -eq 0 ]; then
 				MODULE_EXT=".o"
 				if [ -d /lib/modules/$(uname -r)/kernel ]; then
@@ -2238,7 +2238,7 @@ init_global_params()
 				fi
 			else
 	
-				uname -r | grep "^2.6.*" > /dev/null
+				uname -r | grep -q '^2\.6\.'
 				if [ $? -eq 0 ]; then
 					if [ -d /lib/modules/$(uname -r)/kernel ]; then	
 						MOD1=sdladrv
@@ -2258,19 +2258,19 @@ init_global_params()
 					fi
 				else
 					#Kernels 3 and above
-					MOD1=/lib/modules/$(uname -r)/kernel/drivers/net/wan/sdladrv
-					MOD2=/lib/modules/$(uname -r)/kernel/net/wanrouter/wanrouter
-					MOD3=/lib/modules/$(uname -r)/kernel/drivers/net/wan/wanpipe_syncppp
-					MOD4=/lib/modules/$(uname -r)/kernel/drivers/net/wan/wanpipe
-					MOD5=/lib/modules/$(uname -r)/kernel/net/wanrouter/af_wanpipe
+					MOD1=sdladrv
+					MOD2=wanrouter
+					MOD3=wanpipe_syncppp
+					MOD4=wanpipe
+					MOD5=af_wanpipe
+
+					MOD6=wanpipe_lapb
+					MOD7=wanpipe_x25
+					MOD8=wanpipe_dsp
 
-					MOD6=/lib/modules/$(uname -r)/kernel/drivers/net/wan/wanpipe_lapb
-					MOD7=/lib/modules/$(uname -r)/kernel/drivers/net/wan/wanpipe_x25
-					MOD8=/lib/modules/$(uname -r)/kernel/drivers/net/wan/wanpipe_dsp
-
-					MOD9=/lib/modules/$(uname -r)/kernel/net/wanrouter/wanpipe_lip
+					MOD9=wanpipe_lip
 					WANPIPE_LIP_MOD_DIR=/lib/modules/$(uname -r)/kernel/net/wanrouter
-					MOD10=/lib/modules/$(uname -r)/kernel/net/wanrouter/wanec
+					MOD10=wanec
 					WANEC_MOD_DIR=/lib/modules/$(uname -r)/kernel/net/wanrouter
 				fi
 			fi

Places

File wanpipe-04-kernel3.diff of Package wanpipe

Places