Author: alexander Date: 2006-09-08 09:58:36 -0600 (Fri, 08 Sep 2006) New Revision: 1721
Added: branches/6.2/packages/linux/sym2-claim-only-Storage-class.patch branches/6.2/packages/linux64/sym2-claim-only-Storage-class.patch Modified: branches/6.2/packages/linux/Makefile branches/6.2/packages/linux/debian-style-headers.sh branches/6.2/packages/linux64/Makefile Log: Updated the kernel to 2.6.16.28 plus the cpqarray fix Modified: branches/6.2/packages/linux/Makefile =================================================================== --- branches/6.2/packages/linux/Makefile 2006-09-08 15:28:33 UTC (rev 1720) +++ branches/6.2/packages/linux/Makefile 2006-09-08 15:58:36 UTC (rev 1721) @@ -10,6 +10,10 @@ # URL_REISER4= http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/ +PATCH028= patch-2.6.16.27-28.bz2 +URL-$(PATCH028)= http://www.kernel.org/pub/linux/kernel/v2.6/incr/$(PATCH028) +SHA-$(PATCH028)= 4b81b7f235f5abeb4cba684abcacdb338c2cff9f + PATCH1= reiser4-for-2.6.16-1.patch.gz URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.16/$(PATCH1) SHA-$(PATCH1)= 80d0e0530bf658489834dd27ae955e5d89257a98 @@ -20,6 +24,8 @@ URL-$(PATCH4)= http://zeniv.linux.org.uk/~alan/IDE/$(PATCH4) SHA-$(PATCH4)= 573490726a3de61bb2edee2798d83f1350632819 +PATCH5= sym2-claim-only-Storage-class.patch + PATCH50= $(NM)-2.6.16.27-utf8_input-1.patch URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH50) SHA-$(PATCH50)= 1245a73e16a0d6d1b1adfa167bbee2c02ca92dd5 @@ -38,21 +44,23 @@ cd reiser4 ; grep 'reiser4' series | grep -v '#' >reiser4-patches -cd reiser4 ; $(WGET) -nc -B $(URL_REISER4) -i reiser4-patches -stage2: Makefile $(FILE) $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) +stage2: Makefile $(FILE) $(PATCH028) $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) $(std_build) - cp $(SRC)/{$(FILE),$(PATCH50)} $(LFSSRC)/ + cp $(SRC)/{$(FILE),$(PATCH028),$(PATCH50)} $(LFSSRC)/ compile-stage2: ifeq ($(LFS-ARCH),x86) mkdir -p /boot/isolinux endif ifndef LIBATA_SUFFIX + bzcat ../$(PATCH028) | patch -Np1 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 ../$(PATCH3) zcat ../$(PATCH4) | patch -Np1 - patch -Np1 -l -i ../$(PATCH50) + patch -Np1 -i ../$(PATCH5) + patch -Np1 -i ../$(PATCH50) endif make mrproper cp ../config.$(LFS-ARCH)$(LIBATA_SUFFIX) .config @@ -69,7 +77,7 @@ cp -v vmlinux /boot/linux$(LIBATA_SUFFIX) endif ifndef LIBATA_SUFFIX - cd .. ; ./debian-style-headers.sh linux-$(VRS) + cd .. ; ./debian-style-headers.sh $(DIR) make -f ../Makefile compile-stage2 LIBATA_SUFFIX=.ata endif Modified: branches/6.2/packages/linux/debian-style-headers.sh =================================================================== --- branches/6.2/packages/linux/debian-style-headers.sh 2006-09-08 15:28:33 UTC (rev 1720) +++ branches/6.2/packages/linux/debian-style-headers.sh 2006-09-08 15:58:36 UTC (rev 1721) @@ -1,7 +1,8 @@ #!/bin/sh SRCDIR="$1" -DSTDIR=/usr/src/`basename "$1"` +KVERSION=`grep UTS_RELEASE "$SRCDIR/include/linux/version.h" | cut -d '"' -f 2` +DSTDIR=/usr/src/linux-$KVERSION echo $SRCDIR $DSTDIR @@ -20,6 +21,5 @@ while read file ; do cp -v "$file" "$DSTDIR/$file" done ) -KVERSION=`grep UTS_RELEASE "$SRCDIR/include/linux/version.h" | cut -d '"' -f 2` ln -nsf "$DSTDIR" "/lib/modules/$KVERSION/source" ln -nsf "$DSTDIR" "/lib/modules/$KVERSION/build" Added: branches/6.2/packages/linux/sym2-claim-only-Storage-class.patch =================================================================== --- branches/6.2/packages/linux/sym2-claim-only-Storage-class.patch (rev 0) +++ branches/6.2/packages/linux/sym2-claim-only-Storage-class.patch 2006-09-08 15:58:36 UTC (rev 1721) @@ -0,0 +1,29 @@ +From: Grant Grundler <[EMAIL PROTECTED]> +Date: Mon, 17 Jul 2006 13:22:45 +0000 (-0600) +Subject: [SCSI] sym2: claim only "Storage" class +X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/jejb/scsi-rc-fixes-2.6.git;a=commitdiff;h=b2b3c121076961333977f485f0d54c22121df920 + +[SCSI] sym2: claim only "Storage" class + +The follow patch fixes a problem for Matt Taggart. +The Compaq system he had (dl380?) has a SmartArray device that exposes +the 53c1510 device in both RAID and "normal" modes. The difference +is in RAID mode, the smart array driver (IIRC) should claim the +device instead of sym2 driver. Patch below prevents sym2 from +claiming the device when the RAID "daughter board" is attached. + +Signed-off-by: Grant Grundler <[EMAIL PROTECTED]> +Signed-off-by: James Bottomley <[EMAIL PROTECTED]> +--- + +--- a/drivers/scsi/sym53c8xx_2/sym_glue.c ++++ b/drivers/scsi/sym53c8xx_2/sym_glue.c +@@ -2084,7 +2084,7 @@ static struct pci_device_id sym2_id_tabl + { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C860, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1510, +- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, ++ PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SCSI<<8, 0xffff00, 0UL }, + { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C896, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C895, Modified: branches/6.2/packages/linux64/Makefile =================================================================== --- branches/6.2/packages/linux64/Makefile 2006-09-08 15:28:33 UTC (rev 1720) +++ branches/6.2/packages/linux64/Makefile 2006-09-08 15:58:36 UTC (rev 1721) @@ -10,6 +10,10 @@ # URL_REISER4= http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/ +PATCH028= patch-2.6.16.27-28.bz2 +URL-$(PATCH028)= http://www.kernel.org/pub/linux/kernel/v2.6/incr/$(PATCH028) +SHA-$(PATCH028)= 4b81b7f235f5abeb4cba684abcacdb338c2cff9f + PATCH1= reiser4-for-2.6.16-1.patch.gz URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.16/$(PATCH1) SHA-$(PATCH1)= 80d0e0530bf658489834dd27ae955e5d89257a98 @@ -20,6 +24,8 @@ URL-$(PATCH4)= http://zeniv.linux.org.uk/~alan/IDE/$(PATCH4) SHA-$(PATCH4)= 573490726a3de61bb2edee2798d83f1350632819 +PATCH5= sym2-claim-only-Storage-class.patch + PATCH50= $(NM)-2.6.16.27-utf8_input-1.patch URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH50) SHA-$(PATCH50)= 1245a73e16a0d6d1b1adfa167bbee2c02ca92dd5 @@ -38,18 +44,19 @@ cd reiser4 ; grep 'reiser4' series | grep -v '#' >reiser4-patches -cd reiser4 ; $(WGET) -nc -B $(URL_REISER4) -i reiser4-patches -stage2: Makefile $(FILE) $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) +stage2: Makefile $(FILE) $(PATCH028) $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) $(std_build) - cp $(SRC)/{$(FILE),$(PATCH50)} $(LFSSRC)/ compile-stage2: ifndef LIBATA_SUFFIX + bzcat ../$(PATCH028) | patch -Np1 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 ../$(PATCH3) zcat ../$(PATCH4) | patch -Np1 - patch -Np1 -l -i ../$(PATCH50) + patch -Np1 -i ../$(PATCH5) + patch -Np1 -i ../$(PATCH50) endif make mrproper cp ../config.x86_64$(LIBATA_SUFFIX) .config Added: branches/6.2/packages/linux64/sym2-claim-only-Storage-class.patch =================================================================== --- branches/6.2/packages/linux64/sym2-claim-only-Storage-class.patch (rev 0) +++ branches/6.2/packages/linux64/sym2-claim-only-Storage-class.patch 2006-09-08 15:58:36 UTC (rev 1721) @@ -0,0 +1,29 @@ +From: Grant Grundler <[EMAIL PROTECTED]> +Date: Mon, 17 Jul 2006 13:22:45 +0000 (-0600) +Subject: [SCSI] sym2: claim only "Storage" class +X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/jejb/scsi-rc-fixes-2.6.git;a=commitdiff;h=b2b3c121076961333977f485f0d54c22121df920 + +[SCSI] sym2: claim only "Storage" class + +The follow patch fixes a problem for Matt Taggart. +The Compaq system he had (dl380?) has a SmartArray device that exposes +the 53c1510 device in both RAID and "normal" modes. The difference +is in RAID mode, the smart array driver (IIRC) should claim the +device instead of sym2 driver. Patch below prevents sym2 from +claiming the device when the RAID "daughter board" is attached. + +Signed-off-by: Grant Grundler <[EMAIL PROTECTED]> +Signed-off-by: James Bottomley <[EMAIL PROTECTED]> +--- + +--- a/drivers/scsi/sym53c8xx_2/sym_glue.c ++++ b/drivers/scsi/sym53c8xx_2/sym_glue.c +@@ -2084,7 +2084,7 @@ static struct pci_device_id sym2_id_tabl + { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C860, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1510, +- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, ++ PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SCSI<<8, 0xffff00, 0UL }, + { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C896, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C895, -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
