Changeset 1783

Show
Ignore:
Timestamp:
12/15/06 21:11:03 (2 years ago)
Author:
alexander
Message:

Kernel update

Location:
branches/6.2
Files:
5 added
11 modified

Legend:

Unmodified
Added
Removed
  • branches/6.2/Makefile

    r1774 r1783  
    265265        ch-xchat ch-wireless_tools ch-tcpwrappers ch-portmap ch-nfs-utils \ 
    266266        ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-bc \ 
    267         ch-dialog ch-ncftp ch-pciutils ch-device-mapper ch-LVM2 ch-dmraid \ 
     267        ch-dialog ch-ncftp ch-pciutils ch-libusb ch-usbutils \ 
     268        ch-device-mapper ch-LVM2 ch-dmraid \ 
    268269        ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \ 
    269270        ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-BRLTTY \ 
  • branches/6.2/doc/README

    r1777 r1783  
    7272IMPORTANT NOTE ABOUT THE KERNEL 
    7373=========================== 
    74 The LFS book recommends using "the latest available 2.6.16.x kernel version". 
    75 At the time of the release of this CD, such version is 2.6.16.28. However, 
    76 because of the way jhalfs works, the source for the 2.6.16.27 kernel 
    77 must be present on the CD in order for jhalfs to be able to build a kernel. 
    78 However, using jhalfs for building the kernel is acceptable only if 
    79 you don't care about security. 
    80  
    81 In order to get the 2.6.16.28 kernel from this CD, unpack the 
    82 linux-2.6.16.27.tar.bz2 source tarball, and apply the upstream update patch: 
    83  
    84 bzcat ../patch-2.6.16.27-28.bz2 | patch -Np1 
    85  
    86 The patch-2.6.16.27-28.bz2 file is in the /lfs-sources directory. 
    87  
    88 Further kernel updates may be available from 
     74The original LFS book recommends using "the latest available 2.6.16.x kernel 
     75version" and gives a link to linux-2.6.16.27. However, at the time of the 
     76release of this CD, the latest linux-2.6.16.x version is 2.6.16.35. For the 
     77convenience of jhalfs users, the LFS book on this CD has been patched 
     78to include this kernel version. 
     79 
     80Further kernel updates may be available in the form of compressed incremental 
     81patches from 
     82 
    8983http://www.kernel.org/pub/linux/kernel/v2.6/incr/ 
     84 
     85It is recommended that you apply them. 
    9086 
    9187CONFIGURING NET CONNECTION 
  • branches/6.2/isolinux/isolinux.cfg

    r1706 r1783  
    1212  kernel linux64 
    1313  append initrd=initramfs_data_cpio.gz 
    14  
    15 label linux.ata 
    16   kernel linux.ata 
    17   append initrd=initramfs_data_cpio.gz 
    18  
    19 label linux64.ata 
    20   kernel linux.ata 
    21   append initrd=initramfs_data_cpio.gz 
  • branches/6.2/isolinux/options.msg

    r1706 r1783  
    1010789 = 800x600x24     788 = 800x600x16 
    1111 
    12 There is also an alternative kernel image available that supports 
    13 booting from SATA CD-ROMs. To use it, type "linux.ata". Note: 
    14 it will rename your IDE disks from /dev/hdX to /dev/sdY. 64-bit 
    15 kernels for use with CLFS are available as "linux64" and "linux64.ata" 
     12A 64-bit kernel for use with CLFS is available as "linux64" 
    1613 
    1714To set your timezone, add TZ=your_timezone anywhere 
  • branches/6.2/packages/LFS-BOOK/Makefile

    r1691 r1783  
    1010URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE) 
    1111SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052 
     12 
     13PATCH1= $(DIR)-update-1.patch 
    1214 
    1315#REV= 7646 
     
    3032        #@svn co -q $(REVPARM) $(URL) $(DIR)-XML 
    3133        tar xf $(FILE) 
    32         @cd $(DIR) ; make BASEDIR=../$(HTMLDIR) 
     34        @cd $(DIR) ; patch -Np1 -i ../$(PATCH1) ; make BASEDIR=../$(HTMLDIR) 
    3335        cp -av $(DIR) $(HTMLDIR) /usr/share 
    3436        @sed -i \ 
  • branches/6.2/packages/linux/Makefile

    r1734 r1783  
    22 
    33NM= linux 
    4 VRS= 2.6.16.27 
     4VRS= 2.6.16.35 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) 
    9 SHA-$(FILE)= ef8635746668d49ba76e799ca681c1b46837e176 
     9SHA-$(FILE)= be52aa526bc3950709e4af67d9f87705b09fb2e9 
    1010 
    1111DIR1= loop-AES-v3.1d 
     
    2121# URL_REISER4= http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/ 
    2222 
    23 PATCH028= patch-2.6.16.27-28.bz2 
    24 URL-$(PATCH028)= http://www.kernel.org/pub/linux/kernel/v2.6/incr/$(PATCH028) 
    25 SHA-$(PATCH028)= 4b81b7f235f5abeb4cba684abcacdb338c2cff9f 
    26  
    27 PATCH029= patch-2.6.16.28-29.bz2 
    28 URL-$(PATCH029)= http://www.kernel.org/pub/linux/kernel/v2.6/incr/$(PATCH029) 
    29 SHA-$(PATCH029)= afdbe88bafec3d2820a00b85e85a6ea2e71ec97b 
    30  
    3123PATCH1= reiser4-for-2.6.16-1.patch.gz 
    3224URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.16/$(PATCH1) 
     
    3527PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch 
    3628 
    37 PATCH4= patch-2.6.16-ide1.gz 
    38 URL-$(PATCH4)= http://zeniv.linux.org.uk/~alan/IDE/$(PATCH4) 
    39 SHA-$(PATCH4)= 573490726a3de61bb2edee2798d83f1350632819 
    40  
    41 PATCH5= sym2-claim-only-Storage-class.patch 
    42  
    4329PATCH50= $(NM)-2.6.16.27-utf8_input-1.patch 
    4430URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH50) 
    4531SHA-$(PATCH50)= 1245a73e16a0d6d1b1adfa167bbee2c02ca92dd5 
    4632 
    47 DEPS= $(FILE) $(FILE1) $(FILE2) $(PATCH028) $(PATCH029) 
    48 DEPS+= $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) 
     33DEPS= $(FILE) $(FILE1) $(FILE2) 
     34DEPS+= $(PATCH1) $(PATCH3) $(PATCH50) 
    4935# Targets 
    5036 
     
    6349stage2: Makefile $(DEPS) 
    6450        $(std_build) 
    65         cp $(SRC)/{$(FILE),$(PATCH028),$(PATCH029),$(PATCH50)} $(LFSSRC)/ 
     51        cp $(SRC)/{$(FILE),$(PATCH50)} $(LFSSRC)/ 
    6652 
    6753compile-stage2: 
     
    6955        mkdir -p /boot/isolinux 
    7056endif 
    71 ifndef LIBATA_SUFFIX 
    7257        unpack ../$(FILE1) 
    7358        unpack ../$(FILE2) 
    7459        rm -f drivers/block/loop.c include/linux/loop.h 
    7560        patch -Np1 -i $(DIR1)/kernel-2.6.16.diff 
    76         bzcat ../$(PATCH028) | patch -Np1 
    77         bzcat ../$(PATCH029) | patch -Np1 
    7861        zcat ../$(PATCH1) | patch -Np1 
    7962#       for a in `cat ../reiser4/reiser4-patches` ; do patch -Np1 -i ../reiser4/$$a ; done 
    8063#       echo 'EXPORT_SYMBOL(page_cache_readahead);' >>mm/readahead.c 
    8164        patch -Np1 -i ../$(PATCH3) 
    82         zcat ../$(PATCH4) | patch -Np1 
    83         patch -Np1 -i ../$(PATCH5) 
    8465        patch -Np1 -i ../$(PATCH50) 
    85 endif 
    8666        make mrproper 
    87         cp ../config.$(LFS-ARCH)$(LIBATA_SUFFIX) .config 
    88 ifndef LIBATA_SUFFIX 
     67        cp ../config.$(LFS-ARCH) .config 
    8968        make $(PM) 
    9069        make modules_install 
    9170        cd $(DIR2) ; unset VERSION ; make LINUX_SOURCE=.. 
    92 endif 
    9371ifeq ($(LFS-ARCH),x86) 
    9472        make $(PM) bzImage 
    95         cp -v arch/i386/boot/bzImage /boot/isolinux/linux$(LIBATA_SUFFIX) 
     73        cp -v arch/i386/boot/bzImage /boot/isolinux/linux 
    9674endif 
    9775ifeq ($(LFS-ARCH),ppc) 
    9876        make $(PM) vmlinux 
    99         cp -v vmlinux /boot/linux$(LIBATA_SUFFIX) 
     77        cp -v vmlinux /boot/linux 
    10078endif 
    101 ifndef LIBATA_SUFFIX 
    10279        cd .. ; ./debian-style-headers.sh $(DIR) 
    103         make -f ../Makefile compile-stage2 LIBATA_SUFFIX=.ata 
    104 endif 
    10580 
    10681clean: 
  • branches/6.2/packages/linux/config.x86

    r1757 r1783  
    11# 
    22# Automatically generated make config: don't edit 
    3 # Linux kernel version: 2.6.16 
    4 # Sun Jul  9 18:12:38 2006 
     3# Linux kernel version: 2.6.16.35 
     4# Thu Dec 14 18:40:36 2006 
    55# 
    66CONFIG_X86_32=y 
     
    199199CONFIG_HOTPLUG_CPU=y 
    200200CONFIG_DOUBLEFAULT=y 
     201CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 
    201202 
    202203# 
     
    461462# CONFIG_NET_PKTGEN is not set 
    462463# CONFIG_HAMRADIO is not set 
    463 # CONFIG_IRDA is not set 
    464 # CONFIG_BT is not set 
     464CONFIG_IRDA=m 
     465 
     466# 
     467# IrDA protocols 
     468# 
     469CONFIG_IRLAN=m 
     470CONFIG_IRNET=m 
     471CONFIG_IRCOMM=m 
     472CONFIG_IRDA_ULTRA=y 
     473 
     474# 
     475# IrDA options 
     476# 
     477CONFIG_IRDA_CACHE_LAST_LSAP=y 
     478CONFIG_IRDA_FAST_RR=y 
     479# CONFIG_IRDA_DEBUG is not set 
     480 
     481# 
     482# Infrared-port device drivers 
     483# 
     484 
     485# 
     486# SIR device drivers 
     487# 
     488CONFIG_IRTTY_SIR=m 
     489 
     490# 
     491# Dongle support 
     492# 
     493CONFIG_DONGLE=y 
     494CONFIG_ESI_DONGLE=m 
     495CONFIG_ACTISYS_DONGLE=m 
     496CONFIG_TEKRAM_DONGLE=m 
     497CONFIG_LITELINK_DONGLE=m 
     498CONFIG_MA600_DONGLE=m 
     499CONFIG_GIRBIL_DONGLE=m 
     500CONFIG_MCP2120_DONGLE=m 
     501CONFIG_OLD_BELKIN_DONGLE=m 
     502CONFIG_ACT200L_DONGLE=m 
     503 
     504# 
     505# Old SIR device drivers 
     506# 
     507 
     508# 
     509# Old Serial dongle support 
     510# 
     511 
     512# 
     513# FIR device drivers 
     514# 
     515CONFIG_USB_IRDA=m 
     516CONFIG_SIGMATEL_FIR=m 
     517CONFIG_NSC_FIR=m 
     518CONFIG_WINBOND_FIR=m 
     519CONFIG_TOSHIBA_FIR=m 
     520CONFIG_SMC_IRCC_FIR=m 
     521CONFIG_ALI_FIR=m 
     522CONFIG_VLSI_FIR=m 
     523CONFIG_VIA_FIR=m 
     524CONFIG_BT=m 
     525CONFIG_BT_L2CAP=m 
     526CONFIG_BT_SCO=m 
     527CONFIG_BT_RFCOMM=m 
     528CONFIG_BT_RFCOMM_TTY=y 
     529CONFIG_BT_BNEP=m 
     530CONFIG_BT_BNEP_MC_FILTER=y 
     531CONFIG_BT_BNEP_PROTO_FILTER=y 
     532CONFIG_BT_HIDP=m 
     533 
     534# 
     535# Bluetooth device drivers 
     536# 
     537CONFIG_BT_HCIUSB=m 
     538CONFIG_BT_HCIUSB_SCO=y 
     539CONFIG_BT_HCIUART=m 
     540CONFIG_BT_HCIUART_H4=y 
     541CONFIG_BT_HCIUART_BCSP=y 
     542CONFIG_BT_HCIBCM203X=m 
     543CONFIG_BT_HCIBPA10X=m 
     544CONFIG_BT_HCIBFUSB=m 
     545CONFIG_BT_HCIDTL1=m 
     546CONFIG_BT_HCIBT3C=m 
     547CONFIG_BT_HCIBLUECARD=m 
     548CONFIG_BT_HCIBTUART=m 
     549# CONFIG_BT_HCIVHCI is not set 
    465550CONFIG_IEEE80211=m 
    466551# CONFIG_IEEE80211_DEBUG is not set 
     
    663748CONFIG_AIC79XX_REG_PRETTY_PRINT=y 
    664749CONFIG_SCSI_DPT_I2O=y 
     750CONFIG_SCSI_ADVANSYS=y 
    665751CONFIG_SCSI_IN2000=y 
    666752CONFIG_MEGARAID_NEWGEN=y 
     
    676762CONFIG_SCSI_SATA_NV=y 
    677763CONFIG_SCSI_PDC_ADMA=y 
     764CONFIG_SCSI_HPTIOP=y 
    678765CONFIG_SCSI_SATA_QSTOR=y 
    679766CONFIG_SCSI_SATA_PROMISE=y 
     
    686773CONFIG_SCSI_SATA_VITESSE=y 
    687774CONFIG_SCSI_SATA_INTEL_COMBINED=y 
    688 # CONFIG_SCSI_PATA_ALI is not set 
    689 # CONFIG_SCSI_PATA_AMD is not set 
    690 # CONFIG_SCSI_PATA_ARTOP is not set 
    691 # CONFIG_SCSI_PATA_ATIIXP is not set 
    692 # CONFIG_SCSI_PATA_CMD64X is not set 
    693 # CONFIG_SCSI_PATA_CS5520 is not set 
    694 # CONFIG_SCSI_PATA_CS5530 is not set 
    695 # CONFIG_SCSI_PATA_CS5535 is not set 
    696 # CONFIG_SCSI_PATA_CYPRESS is not set 
    697 # CONFIG_SCSI_PATA_EFAR is not set 
    698 # CONFIG_SCSI_ATA_GENERIC is not set 
    699 # CONFIG_SCSI_PATA_HPT37X is not set 
    700 # CONFIG_SCSI_PATA_HPT3X2N is not set 
    701 # CONFIG_SCSI_PATA_HPT3X3 is not set 
    702 # CONFIG_SCSI_PATA_ISAPNP is not set 
    703 # CONFIG_SCSI_PATA_IT8172 is not set 
    704 # CONFIG_SCSI_PATA_IT821X is not set 
    705 # CONFIG_SCSI_PATA_LEGACY is not set 
    706 # CONFIG_SCSI_PATA_MPIIX is not set 
    707 # CONFIG_SCSI_PATA_NETCELL is not set 
    708 # CONFIG_SCSI_PATA_NS87410 is not set 
    709 # CONFIG_SCSI_PATA_OLDPIIX is not set 
    710 # CONFIG_SCSI_PATA_OPTI is not set 
    711 # CONFIG_SCSI_PATA_PCMCIA is not set 
    712 # CONFIG_SCSI_PATA_PDC_OLD is not set 
    713 # CONFIG_SCSI_PATA_QDI is not set 
    714 # CONFIG_SCSI_PATA_RADISYS is not set 
    715 # CONFIG_SCSI_PATA_RZ1000 is not set 
    716 # CONFIG_SCSI_PATA_SC1200 is not set 
    717 # CONFIG_SCSI_PATA_SERVERWORKS is not set 
    718 # CONFIG_SCSI_PATA_SIL680 is not set 
    719 # CONFIG_SCSI_PATA_SIS is not set 
    720 # CONFIG_SCSI_PATA_TRIFLEX is not set 
    721 # CONFIG_SCSI_PATA_VIA is not set 
    722 # CONFIG_SCSI_PATA_WINBOND is not set 
    723775CONFIG_SCSI_BUSLOGIC=y 
    724776# CONFIG_SCSI_OMIT_FLASHPOINT is not set 
  • branches/6.2/packages/linux64/Makefile

    r1734 r1783  
    22 
    33NM= linux 
    4 VRS= 2.6.16.27 
     4VRS= 2.6.16.35 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) 
    9 SHA-$(FILE)= ef8635746668d49ba76e799ca681c1b46837e176 
     9SHA-$(FILE)= be52aa526bc3950709e4af67d9f87705b09fb2e9 
    1010 
    1111DIR1= loop-AES-v3.1d 
     
    2121# URL_REISER4= http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16/2.6.16-mm1/broken-out/ 
    2222 
    23 PATCH028= patch-2.6.16.27-28.bz2 
    24 URL-$(PATCH028)= http://www.kernel.org/pub/linux/kernel/v2.6/incr/$(PATCH028) 
    25 SHA-$(PATCH028)= 4b81b7f235f5abeb4cba684abcacdb338c2cff9f 
    26  
    27 PATCH029= patch-2.6.16.28-29.bz2 
    28 URL-$(PATCH029)= http://www.kernel.org/pub/linux/kernel/v2.6/incr/$(PATCH029) 
    29 SHA-$(PATCH029)= afdbe88bafec3d2820a00b85e85a6ea2e71ec97b 
    30  
    3123PATCH1= reiser4-for-2.6.16-1.patch.gz 
    3224URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.16/$(PATCH1) 
     
    3527PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch 
    3628 
    37 PATCH4= patch-2.6.16-ide1.gz 
    38 URL-$(PATCH4)= http://zeniv.linux.org.uk/~alan/IDE/$(PATCH4) 
    39 SHA-$(PATCH4)= 573490726a3de61bb2edee2798d83f1350632819 
    40  
    41 PATCH5= sym2-claim-only-Storage-class.patch 
    42  
    4329PATCH50= $(NM)-2.6.16.27-utf8_input-1.patch 
    4430URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH50) 
    4531SHA-$(PATCH50)= 1245a73e16a0d6d1b1adfa167bbee2c02ca92dd5 
    4632 
    47 DEPS= $(FILE) $(FILE1) $(FILE2) $(PATCH028) $(PATCH029) 
    48 DEPS+= $(PATCH1) $(PATCH3) $(PATCH4) $(PATCH50) 
     33DEPS= $(FILE) $(FILE1) $(FILE2) 
     34DEPS+= $(PATCH1) $(PATCH3) $(PATCH50) 
    4935# Targets 
    5036 
     
    6551 
    6652compile-stage2: 
    67 ifndef LIBATA_SUFFIX 
    6853        unpack ../$(FILE1) 
    6954        unpack ../$(FILE2) 
    7055        rm -f drivers/block/loop.c include/linux/loop.h 
    7156        patch -Np1 -i $(DIR1)/kernel-2.6.16.diff 
    72         bzcat ../$(PATCH028) | patch -Np1 
    73         bzcat ../$(PATCH029) | patch -Np1 
    7457        zcat ../$(PATCH1) | patch -Np1 
    7558#       for a in `cat ../reiser4/reiser4-patches` ; do patch -Np1 -i ../reiser4/$$a ; done 
    7659#       echo 'EXPORT_SYMBOL(page_cache_readahead);' >>mm/readahead.c 
    7760        patch -Np1 -i ../$(PATCH3) 
    78         zcat ../$(PATCH4) | patch -Np1 
    79         patch -Np1 -i ../$(PATCH5) 
    8061        patch -Np1 -i ../$(PATCH50) 
    81 endif 
    8262        make mrproper 
    83         cp ../config.x86_64$(LIBATA_SUFFIX) .config 
    84 ifndef LIBATA_SUFFIX 
     63        cp ../config.x86_64 .config 
    8564        PATH=$$PATH:$(WD)/bin make ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- 
    8665        PATH=$$PATH:$(WD)/bin make modules_install ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- 
    8766        cd $(DIR2) ; unset VERSION ; PATH=$$PATH:$(WD)/bin make LINUX_SOURCE=.. ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- 
    8867        rm /lib/modules/*-64bit/{source,build} 
    89 endif 
    9068        PATH=$$PATH:$(WD)/bin make bzImage ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- 
    91         cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64$(LIBATA_SUFFIX) 
    92 ifndef LIBATA_SUFFIX 
    93         make -f ../Makefile compile-stage2 LIBATA_SUFFIX=.ata 
    94 endif 
     69        cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64 
    9570 
    9671clean: 
  • branches/6.2/packages/linux64/config.x86_64

    r1757 r1783  
    11# 
    22# Automatically generated make config: don't edit 
    3 # Linux kernel version: 2.6.16 
    4 # Fri Mar 24 11:19:02 2006 
     3# Linux kernel version: 2.6.16.35 
     4# Thu Dec 14 19:36:46 2006 
    55# 
    66CONFIG_X86_64=y 
     
    139139CONFIG_NR_CPUS=8 
    140140CONFIG_HOTPLUG_CPU=y 
     141CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 
    141142CONFIG_HPET_TIMER=y 
    142143CONFIG_HPET_EMULATE_RTC=y 
     
    400401# CONFIG_NET_PKTGEN is not set 
    401402# CONFIG_HAMRADIO is not set 
    402 # CONFIG_IRDA is not set 
    403 # CONFIG_BT is not set 
     403CONFIG_IRDA=m 
     404 
     405# 
     406# IrDA protocols 
     407# 
     408CONFIG_IRLAN=m 
     409CONFIG_IRNET=m 
     410CONFIG_IRCOMM=m 
     411CONFIG_IRDA_ULTRA=y 
     412 
     413# 
     414# IrDA options 
     415# 
     416CONFIG_IRDA_CACHE_LAST_LSAP=y 
     417CONFIG_IRDA_FAST_RR=y 
     418# CONFIG_IRDA_DEBUG is not set 
     419 
     420# 
     421# Infrared-port device drivers 
     422# 
     423 
     424# 
     425# SIR device drivers 
     426# 
     427CONFIG_IRTTY_SIR=m 
     428 
     429# 
     430# Dongle support 
     431# 
     432CONFIG_DONGLE=y 
     433CONFIG_ESI_DONGLE=m 
     434CONFIG_ACTISYS_DONGLE=m 
     435CONFIG_TEKRAM_DONGLE=m 
     436CONFIG_LITELINK_DONGLE=m 
     437CONFIG_MA600_DONGLE=m 
     438CONFIG_GIRBIL_DONGLE=m 
     439CONFIG_MCP2120_DONGLE=m 
     440CONFIG_OLD_BELKIN_DONGLE=m 
     441CONFIG_ACT200L_DONGLE=m 
     442 
     443# 
     444# Old SIR device drivers 
     445# 
     446 
     447# 
     448# Old Serial dongle support 
     449# 
     450 
     451# 
     452# FIR device drivers 
     453# 
     454CONFIG_USB_IRDA=m 
     455CONFIG_SIGMATEL_FIR=m 
     456CONFIG_NSC_FIR=m 
     457CONFIG_WINBOND_FIR=m 
     458CONFIG_SMC_IRCC_FIR=m 
     459CONFIG_ALI_FIR=m 
     460CONFIG_VLSI_FIR=m 
     461CONFIG_VIA_FIR=m 
     462CONFIG_BT=m 
     463CONFIG_BT_L2CAP=m 
     464CONFIG_BT_SCO=m 
     465CONFIG_BT_RFCOMM=m 
     466CONFIG_BT_RFCOMM_TTY=y 
     467CONFIG_BT_BNEP=m 
     468CONFIG_BT_BNEP_MC_FILTER=y 
     469CONFIG_BT_BNEP_PROTO_FILTER=y 
     470CONFIG_BT_HIDP=m 
     471 
     472# 
     473# Bluetooth device drivers 
     474# 
     475CONFIG_BT_HCIUSB=m 
     476CONFIG_BT_HCIUSB_SCO=y 
     477CONFIG_BT_HCIUART=m 
     478CONFIG_BT_HCIUART_H4=y 
     479CONFIG_BT_HCIUART_BCSP=y 
     480CONFIG_BT_HCIBCM203X=m 
     481CONFIG_BT_HCIBPA10X=m 
     482CONFIG_BT_HCIBFUSB=m 
     483CONFIG_BT_HCIDTL1=m 
     484CONFIG_BT_HCIBT3C=m 
     485CONFIG_BT_HCIBLUECARD=m 
     486CONFIG_BT_HCIBTUART=m 
     487# CONFIG_BT_HCIVHCI is not set 
    404488CONFIG_IEEE80211=m 
    405489# CONFIG_IEEE80211_DEBUG is not set 
     
    605689CONFIG_SCSI_SATA_NV=y 
    606690CONFIG_SCSI_PDC_ADMA=y 
     691CONFIG_SCSI_HPTIOP=y 
    607692CONFIG_SCSI_SATA_QSTOR=y 
    608693CONFIG_SCSI_SATA_PROMISE=y 
     
    615700CONFIG_SCSI_SATA_VITESSE=y 
    616701CONFIG_SCSI_SATA_INTEL_COMBINED=y 
    617 # CONFIG_SCSI_PATA_ALI is not set 
    618 # CONFIG_SCSI_PATA_AMD is not set 
    619 # CONFIG_SCSI_PATA_ARTOP is not set 
    620 # CONFIG_SCSI_PATA_ATIIXP is not set 
    621 # CONFIG_SCSI_PATA_CMD64X is not set 
    622 # CONFIG_SCSI_PATA_CS5520 is not set 
    623 # CONFIG_SCSI_PATA_CS5530 is not set 
    624 # CONFIG_SCSI_PATA_CYPRESS is not set 
    625 # CONFIG_SCSI_PATA_EFAR is not set 
    626 # CONFIG_SCSI_ATA_GENERIC is not set 
    627 # CONFIG_SCSI_PATA_HPT37X is not set 
    628 # CONFIG_SCSI_PATA_HPT3X2N is not set 
    629 # CONFIG_SCSI_PATA_HPT3X3 is not set 
    630 # CONFIG_SCSI_PATA_ISAPNP is not set 
    631 # CONFIG_SCSI_PATA_IT8172 is not set 
    632 # CONFIG_SCSI_PATA_IT821X is not set 
    633 # CONFIG_SCSI_PATA_LEGACY is not set 
    634 # CONFIG_SCSI_PATA_MPIIX is not set 
    635 # CONFIG_SCSI_PATA_NETCELL is not set 
    636 # CONFIG_SCSI_PATA_NS87410 is not set 
    637 # CONFIG_SCSI_PATA_OLDPIIX is not set 
    638 # CONFIG_SCSI_PATA_OPTI is not set 
    639 # CONFIG_SCSI_PATA_PCMCIA is not set 
    640 # CONFIG_SCSI_PATA_PDC_OLD is not set 
    641 # CONFIG_SCSI_PATA_QDI is not set 
    642 # CONFIG_SCSI_PATA_RADISYS is not set 
    643 # CONFIG_SCSI_PATA_RZ1000 is not set 
    644 # CONFIG_SCSI_PATA_SC1200 is not set 
    645 # CONFIG_SCSI_PATA_SERVERWORKS is not set 
    646 # CONFIG_SCSI_PATA_SIL680 is not set 
    647 # CONFIG_SCSI_PATA_SIS is not set 
    648 # CONFIG_SCSI_PATA_TRIFLEX is not set 
    649 # CONFIG_SCSI_PATA_VIA is not set 
    650 # CONFIG_SCSI_PATA_WINBOND is not set 
    651702CONFIG_SCSI_BUSLOGIC=y 
    652703# CONFIG_SCSI_OMIT_FLASHPOINT is not set 
  • branches/6.2/packages/mc/Makefile

    r1748 r1783  
    3131        rm debian/patches/36_developer_mode.patch 
    3232        for a in debian/patches/*.patch ; do \ 
    33             echo $$a ; patch --force -Np1 -i $$a || patch -Np0 -i $$a ; \ 
     33            if egrep -q '+++.*mc-4' $$a ; then \ 
     34                patch -Np1 -i $$a ; \ 
     35            else \ 
     36                patch -Np0 -i $$a ; \ 
     37            fi ; \ 
    3438        done 
    3539        CPPFLAGS="-DUTF8" ./configure --with-screen=slang --prefix=/usr \ 
     
    5862 
    5963clean: 
    60         -rm -rf $(NM) 
     64        -rm -rf $(DIR) 
    6165 
    6266.PHONY: clean chroot compile-stage2 
  • branches/6.2/packages/slang/Makefile

    r1748 r1783  
    2727 
    2828clean: 
    29         -rm -rf $(NM) 
     29        -rm -rf $(DIR) 
    3030 
    3131.PHONY: clean chroot compile-stage2