SOURCES: linux-wlan-ng-Makefile.patch, linux-wlan-ng-configure.pat...

adgor adgor at pld-linux.org
Fri Jan 19 22:47:34 CET 2007


Author: adgor                        Date: Fri Jan 19 21:47:34 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Updated for 0.2.7

---- Files affected:
SOURCES:
   linux-wlan-ng-Makefile.patch (1.4 -> 1.5) , linux-wlan-ng-configure.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/linux-wlan-ng-Makefile.patch
diff -u SOURCES/linux-wlan-ng-Makefile.patch:1.4 SOURCES/linux-wlan-ng-Makefile.patch:1.5
--- SOURCES/linux-wlan-ng-Makefile.patch:1.4	Mon Jul 18 21:39:47 2005
+++ SOURCES/linux-wlan-ng-Makefile.patch	Fri Jan 19 22:47:29 2007
@@ -1,30 +1,27 @@
---- linux-wlan-ng-0.2.1pre21/src/Makefile.orig	2004-02-13 19:42:39.000000000 +0100
-+++ linux-wlan-ng-0.2.1pre21/src/Makefile	2004-05-31 09:53:20.232175216 +0200
-@@ -44,9 +44,9 @@
- 
- include ../config.mk
- 
--DIRS=p80211 prism2 shared wlanctl wland nwepgen \
-+DIRS=prism2 shared wlanctl wland nwepgen \
- 	mkmeta wlancfg
--ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \
-+ALL_DIRS=mkmeta prism2 shared wlanctl wland \
- 	nwepgen wlancfg
+--- linux-wlan-ng-0.2.7/src/Makefile.orig	2006-07-22 16:49:36.000000000 +0200
++++ linux-wlan-ng-0.2.7/src/Makefile	2007-01-19 01:04:13.000000000 +0100
+@@ -44,7 +44,7 @@
+ 
+ -include ../config.mk
+ 
+-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2
  
  ifneq ($(wildcard *.addon),) 
---- linux-wlan-ng-0.2.1pre21/src/prism2/Makefile.orig	2004-02-13 19:47:37.000000000 +0100
-+++ linux-wlan-ng-0.2.1pre21/src/prism2/Makefile	2004-05-31 09:53:30.815566296 +0200
+ DIRS+=`cat *.addon`
+--- linux-wlan-ng-0.2.7/src/prism2/Makefile.orig	2005-11-02 15:13:30.000000000 +0100
++++ linux-wlan-ng-0.2.7/src/prism2/Makefile	2007-01-19 01:08:11.000000000 +0100
 @@ -44,7 +44,7 @@
  
- include ../../config.mk
+ -include ../../config.mk
  
 -DIRS=driver ridlist download
 +DIRS=ridlist download
  
  ifneq ($(wildcard *.addon),) 
  DIRS+=`cat *.addon`
---- linux-wlan-ng-0.2.1-pre26/man/Makefile.orig	2004-08-04 23:09:28.000000000 +0200
-+++ linux-wlan-ng-0.2.1-pre26/man/Makefile	2005-07-18 21:20:41.988581896 +0200
+--- linux-wlan-ng-0.2.7/man/Makefile.orig	2005-01-26 23:01:07.000000000 +0100
++++ linux-wlan-ng-0.2.7/man/Makefile	2007-01-19 01:15:33.000000000 +0100
 @@ -48,8 +48,8 @@
  	@echo "Nothing to do..."
  

================================================================
Index: SOURCES/linux-wlan-ng-configure.patch
diff -u SOURCES/linux-wlan-ng-configure.patch:1.2 SOURCES/linux-wlan-ng-configure.patch:1.3
--- SOURCES/linux-wlan-ng-configure.patch:1.2	Sat May 20 00:24:23 2006
+++ SOURCES/linux-wlan-ng-configure.patch	Fri Jan 19 22:47:29 2007
@@ -1,5 +1,5 @@
---- linux-wlan-ng-0.2.3/Configure	2005-01-25 02:41:44.000000000 +0100
-+++ linux-wlan-ng-0.2.3/Configure	2005-07-18 21:31:10.455040472 +0200
+--- linux-wlan-ng-0.2.7/Configure.orig	2007-01-11 17:59:55.000000000 +0100
++++ linux-wlan-ng-0.2.7/Configure	2007-01-19 01:25:56.000000000 +0100
 @@ -223,28 +223,10 @@
  #=======================================================================
  # Collect the kernel source tree and test for sanity
@@ -30,7 +30,7 @@
  # What kernel are we compiling for?
  
  version () {
-@@ -253,38 +235,15 @@
+@@ -253,17 +235,9 @@
  
  $ECHO ""
  
@@ -46,10 +46,11 @@
 -fi
 -
  if [ $VERSION_CODE -gt `version 2 5 0` ] ; then
- 	$ECHO "Kernel 2.5/2.6 support is highly experimental."
          KERN_25=y
          write_bool KERN_25
+@@ -277,21 +251,6 @@
  fi
+ write_bool KERN_2_6_17
  
 -if [ "$SRC_RELEASE" != "$CUR_RELEASE" ] ; then
 -	$ECHO "WARNING: the current running kernel is actually version $CUR_RELEASE."
@@ -67,11 +68,11 @@
 -fi
 -
  # Check for consistent kernel build dates
- 
- CUR_D=`uname -v | sed -e 's/^#[0-9]* //;s/SMP //'`
-@@ -296,12 +255,6 @@
+ CUR_D=`uname -v | sed -e 's/^#[0-9]* //;s/SMP //;s/PREEMPT //;'`
+ CUR_D=`$ECHO $CUR_D | sed -e 's/\(:[0-9][0-9]\) .* \([12][90]\)/\1 \2/'`
+@@ -302,12 +261,6 @@
  	sed -e 's/.*"\(.*\)"/\1/'`
- 	SRC_D=`$ECHO $UTS_VERSION | sed -e 's/^#[0-9]* //;s/SMP //'`
+ 	SRC_D=`$ECHO $UTS_VERSION | sed -e 's/^#[0-9]* //;s/SMP //;s/PREEMPT //;'`
  	SRC_D=`$ECHO $SRC_D | sed -e 's/\(:[0-9][0-9]\) .* \([12][90]\)/\1 \2/'`
 -	if [ $SRC_RELEASE = $CUR_RELEASE -a "$SRC_D" != "$CUR_D" ] ; then
 -	$ECHO "WARNING: the source tree has a build date of $SRC_D."
@@ -82,7 +83,7 @@
  fi
  $ECHO ""
  
-@@ -334,24 +287,16 @@
+@@ -340,24 +293,16 @@
  # test to see if __KERNEL__ is defined in KERNEL_CFLAGS
  # if not, $KERNEL_CFLAGS += __KERNEL__
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-wlan-ng-Makefile.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/linux-wlan-ng-configure.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list