r1482 - in branches/udev_update: . packages/linux vars

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Mon Apr 17 09:03:41 PDT 2006


Author: alexander
Date: 2006-04-17 10:03:40 -0600 (Mon, 17 Apr 2006)
New Revision: 1482

Added:
   branches/udev_update/packages/linux/linux-2.6.16-net_race-1.patch
Modified:
   branches/udev_update/Makefile
   branches/udev_update/packages/linux/Makefile
   branches/udev_update/vars/vars.cross_x86
   branches/udev_update/vars/vars.ppc
   branches/udev_update/vars/vars.sparc64
   branches/udev_update/vars/vars.x86
   branches/udev_update/vars/vars.x86_64
Log:
Kernel updated, added fix for network device race.
Kernel version moved to kernel Makefile.
Removed unused KERNEL_ARCH variable.


Modified: branches/udev_update/Makefile
===================================================================
--- branches/udev_update/Makefile	2006-04-17 13:32:34 UTC (rev 1481)
+++ branches/udev_update/Makefile	2006-04-17 16:03:40 UTC (rev 1482)
@@ -57,8 +57,6 @@
 
 include $(CROSSVARS)
 
-export KVERS ?= 2.6.16.1
-
 # Environment Variables
 # The following lines need to be all on one line - no newlines.
 #===============================================================================

Modified: branches/udev_update/packages/linux/Makefile
===================================================================
--- branches/udev_update/packages/linux/Makefile	2006-04-17 13:32:34 UTC (rev 1481)
+++ branches/udev_update/packages/linux/Makefile	2006-04-17 16:03:40 UTC (rev 1482)
@@ -1,12 +1,12 @@
 # Linux Kernel Makefile
 
 NM= linux
-VRS= $(KVERS)
+VRS= 2.6.16.5
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
-SHA-$(FILE)= c5db9b9a3b23e0cda5a198290b5411226715a406
+SHA-$(FILE)= 9adfac760417bc11ecd86ed148e11abad6d1b672
 
 # URL_REISER4= http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/
 
@@ -14,6 +14,7 @@
 URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.16/$(PATCH1)
 SHA-$(PATCH1)= 80d0e0530bf658489834dd27ae955e5d89257a98
 
+PATCH2= linux-2.6.16-net_race-1.patch
 PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
 
 PATCH4= patch-2.6.16-ide1.gz
@@ -53,6 +54,7 @@
 	zcat ../$(PATCH1) | patch -Np1
 #	for a in `cat ../reiser4/reiser4-patches` ; do patch -Np1 -i ../reiser4/$$a ; done
 #	echo 'EXPORT_SYMBOL(page_cache_readahead);' >>mm/readahead.c
+	patch -Np1 -i ../$(PATCH2)
 	patch -Np1 -i ../$(PATCH3)
 	zcat ../$(PATCH4) | patch -Np1
 	patch -Np1 -l -i ../$(PATCH50)

Added: branches/udev_update/packages/linux/linux-2.6.16-net_race-1.patch
===================================================================
--- branches/udev_update/packages/linux/linux-2.6.16-net_race-1.patch	                        (rev 0)
+++ branches/udev_update/packages/linux/linux-2.6.16-net_race-1.patch	2006-04-17 16:03:40 UTC (rev 1482)
@@ -0,0 +1,15 @@
+--- linux-2.6.16.5/net/core/dev.c
++++ linux-2.6.16.5/net/core/dev.c
+@@ -2932,11 +2932,11 @@
+ 
+ 		switch(dev->reg_state) {
+ 		case NETREG_REGISTERING:
++			dev->reg_state = NETREG_REGISTERED;
+ 			err = netdev_register_sysfs(dev);
+ 			if (err)
+ 				printk(KERN_ERR "%s: failed sysfs registration (%d)\n",
+ 				       dev->name, err);
+-			dev->reg_state = NETREG_REGISTERED;
+ 			break;
+ 
+ 		case NETREG_UNREGISTERING:

Modified: branches/udev_update/vars/vars.cross_x86
===================================================================
--- branches/udev_update/vars/vars.cross_x86	2006-04-17 13:32:34 UTC (rev 1481)
+++ branches/udev_update/vars/vars.cross_x86	2006-04-17 16:03:40 UTC (rev 1482)
@@ -6,4 +6,3 @@
 export LIB_MAYBE64 := lib
 export LFS_HOST ?= i486-cross-linux-gnu
 export LFS_TARGET := i486-pc-linux-gnu
-export KERNEL_ARCH := i386

Modified: branches/udev_update/vars/vars.ppc
===================================================================
--- branches/udev_update/vars/vars.ppc	2006-04-17 13:32:34 UTC (rev 1481)
+++ branches/udev_update/vars/vars.ppc	2006-04-17 16:03:40 UTC (rev 1482)
@@ -1,5 +1,4 @@
 export VERSION := ppc-6.2-pre2
 export CFLAGS := -Os -s
 export LIB_MAYBE64 := lib
-export KERNEL_ARCH := ppc
 LINKER := ld.so.1

Modified: branches/udev_update/vars/vars.sparc64
===================================================================
--- branches/udev_update/vars/vars.sparc64	2006-04-17 13:32:34 UTC (rev 1481)
+++ branches/udev_update/vars/vars.sparc64	2006-04-17 16:03:40 UTC (rev 1482)
@@ -9,5 +9,4 @@
 export LFS_HOST ?= sparcv9-cross--linux-gnu
 export LFS_TARGET := sparc64-unknown-linux-gnu
 export LFS_TARGET32 := sparcv9-unknown-linux-gnu
-export KERNEL_ARCH := sparc64
 export WHICH := $(CROSS_WD)/bin/which

Modified: branches/udev_update/vars/vars.x86
===================================================================
--- branches/udev_update/vars/vars.x86	2006-04-17 13:32:34 UTC (rev 1481)
+++ branches/udev_update/vars/vars.x86	2006-04-17 16:03:40 UTC (rev 1482)
@@ -1,5 +1,4 @@
 export VERSION := x86-6.2-pre4
 export CFLAGS := -Os -s -march=i486
 export LIB_MAYBE64 := lib
-export KERNEL_ARCH := i386
 export LINKER := ld-linux.so.2

Modified: branches/udev_update/vars/vars.x86_64
===================================================================
--- branches/udev_update/vars/vars.x86_64	2006-04-17 13:32:34 UTC (rev 1481)
+++ branches/udev_update/vars/vars.x86_64	2006-04-17 16:03:40 UTC (rev 1482)
@@ -8,5 +8,4 @@
 export LFS_HOST ?= x86_64-cross-linux-gnu
 export LFS_TARGET := x86_64-pc-linux-gnu
 export LFS_TARGET32 := i686-pc-linux-gnu
-export KERNEL_ARCH := x86_64
 export LINKER := ld-linux.so.2




More information about the livecd mailing list