Changeset 2078

Show
Ignore:
Timestamp:
09/26/07 06:52:49 (1 year ago)
Author:
alexander
Message:

Merged all applicable changes since r1950 from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/minimal/Makefile

    r2052 r2078  
    277277        ch-tcpwrappers ch-portmap ch-nfs-utils \ 
    278278        ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-bc ch-dialog ch-ncftp  \ 
    279         ch-device-mapper ch-LVM2 ch-dmraid ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-pptp \ 
     279        ch-device-mapper ch-LVM2 ch-dmraid ch-multipath-tools \ 
     280        ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-pptp \ 
    280281        ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-brltty  \ 
    281282        ch-strace ch-iptables ch-eject ch-hdparm \ 
  • branches/minimal/doc/README

    r2028 r2078  
    2929* pppd 
    3030* rp-pppoe 
     31* pptp client 
    3132* dhcpcd 
    3233* ncftp 
     
    5657* LVM2 
    5758* dmraid 
     59* kpartx 
    5860* hdparm 
    5961* parted 
  • branches/minimal/etc/issue.fullcd

    r1959 r2078  
    1111 
    1212All source packages needed to build an LFS system are located in /lfs-sources. 
    13 You can find the LFS book in /usr/share/LFS-BOOK-SVN-HTML. 
     13You can find the LFS book in /usr/share/LFS-BOOK-6.3-HTML. 
    1414 
    1515Support questions concerning this CD should be directed to 
  • branches/minimal/etc/issue.nosrc

    r1959 r2078  
    1111 
    1212This CD does not include LFS sources. 
    13 You can find the LFS book in /usr/share/LFS-BOOK-SVN-HTML. 
     13You can find the LFS book in /usr/share/LFS-BOOK-6.3-HTML. 
    1414 
    1515Support questions concerning this CD should be directed to 
  • branches/minimal/etc/issue.toram

    r1959 r2078  
    1414the lfs-sources subdirectory of the mount point. 
    1515 
    16 You can find the LFS book in /usr/share/LFS-BOOK-SVN-HTML. 
     16You can find the LFS book in /usr/share/LFS-BOOK-6.3-HTML. 
    1717 
    1818Support questions concerning this CD should be directed to 
  • branches/minimal/isolinux/isolinux.cfg

    r2020 r2078  
    1010label linux 
    1111  kernel linux 
    12   append initrd=initramfs_data_cpio.gz 
     12  append initrd=initramfs_data_cpio.gz quiet 
     13 
     14label linux64 
     15  kernel linux64 
     16  append initrd=initramfs_data_cpio.gz quiet 
  • branches/minimal/isolinux/options2.msg

    r2052 r2078  
    99  Loads the whole CD contents (except sources and proprietary video 
    1010  drivers) to RAM. 
    11  
    1211  Note: this needs at least 512 MB of RAM, and you also need 
    1312  to enable swap if you have less than 768 MB of RAM. 
     
    2625  See /root/README for details. 
    2726 
    28  
     27debug 
     28  Causes kernel messages to appear on the screen. 
  • branches/minimal/isolinux/options4.msg

    r2052 r2078  
    88  Uses the new FireWire stack. 
    99 
    10 nomsi noapic nolapic pci=noacpi acpi=off blacklist=yenta-socket ide=nodma 
     10nomsi noapic pci=noacpi acpi=off clock=pit blacklist=yenta-socket ide=nodma 
    1111  These options work around various chipset bugs. Try them one-by-one in the 
    1212  order given above and in various combinations if the CD does not boot, or if 
     
    1919  SuperVario 40 Braille display connected by USB with default Braille table. 
    2020 
    21 vga=[res
     21vga=[resolution
    2222  Examples: 
    2323  vga=795 (1280x1024x24)   vga=792 (1024x768x24)   vga=789 (800x600x24) 
    2424  vga=794 (1280x1024x16)   vga=791 (1024x768x16)   vga=788 (800x600x16) 
    2525 
    26   NOTE: This is for the framebuffer console and has nothing to do with X 
    27   server resolution. Also, it causes some X video drivers (e.g., "s3virge") to 
    28   malfunction. X server bug reports will be ignored if you use this option. 
     26  Enables the framebuffer console. 
     27 
     28 
  • branches/minimal/packages/LFS-BOOK/Makefile

    r2052 r2078  
    3939        svn co $(REVPARM) $(URL) $(DIR) 
    4040        # tar xf $(FILE) 
    41         cd $(DIR) ; make BASEDIR=../$(HTMLDIR) 
     41        cd $(DIR) ; make BASEDIR=../$(HTMLDIR) RENDERTMP=. 
     42        rm $(DIR)/lfs-full.xml $(DIR)/lfs-html.xml 
    4243        cp -av $(DIR) $(HTMLDIR) /usr/share 
    4344        sed -i 's@WWW_HOME=\".*\"@WWW_HOME=\"/usr/share/$(HTMLDIR)/index.html\"@' \ 
  • branches/minimal/packages/gpm/Makefile

    r1528 r2078  
    1717SHA-$(PATCH2)= 8899a212eadfbda201d8da3e44590bd05b97f9f6 
    1818 
     19PATCH3= $(DIR)-default_client-1.patch 
     20 
    1921# Targets 
    2022 
     
    3133        patch -Np1 -i ../$(PATCH1) 
    3234        patch -Np1 -i ../$(PATCH2) 
     35        patch -Np1 -i ../$(PATCH3) 
    3336        ./configure --prefix=/usr --sysconfdir=/etc --without-curses 
    3437        LDFLAGS="-lm" make 
  • branches/minimal/packages/initramfs/Makefile

    r2033 r2078  
    2727        cp /etc/udev/rules.d/{05-*,2*,60-*} $(WDIR)/etc/udev/rules.d 
    2828        sed -i 's/, *GROUP="[^"]*"//' $(WDIR)/etc/udev/rules.d/* 
     29        echo "blacklist generic" >$(WDIR)/etc/modprobe.conf 
     30        echo "blacklist ata_generic" >>$(WDIR)/etc/modprobe.conf 
    2931        sed -e s/@VERSION@/$(VERSION)/ -e s/@LINKER@/$(LINKER)/ init.in >$(WDIR)/init 
    3032        chmod 755 $(WDIR)/init 
     
    3234        mknod -m 640 $(WDIR)/dev/console c 5 1 
    3335        mknod -m 664 $(WDIR)/dev/null c 1 3 
    34         cp /bin/{sh,dd,cat,cp,killall,mkdir,mount,umount,sed,sleep,ln,rm,uname} $(WDIR)/bin 
     36        cp /bin/{sh,dd,cat,cp,killall,ls,mkdir,mount,umount,sed,sleep,ln,rm,uname} $(WDIR)/bin 
     37        cp /lib/{librt.so.1,libpthread.so.0} $(WDIR)/lib 
    3538        cp /lib/{libblkid.so.1,libc.so.6,libdl.so.2,$(LINKER)} $(WDIR)/lib 
    3639        cp /lib/{libncursesw.so.5,libreadline.so.5,libhistory.so.5} $(WDIR)/lib 
  • branches/minimal/packages/initramfs/init.in

    r2033 r2078  
    11#!/bin/sh 
     2 
     3PATH=/bin:/usr/bin:/sbin:/usr/sbin 
     4export PATH 
    25 
    36EXPECTED_LABEL="lfslivecd-@VERSION@" 
     
    1215rootfstype=auto 
    1316ro="ro" 
     17rootflags= 
    1418noresume=0 
    1519resume= 
     
    2933} 
    3034 
     35problem() { 
     36        cat <<"EOF" 
     37The problem may be caused by the fact that ISA IDE and SCSI adapters are 
     38no longer attempted to be autodetected. If you use such hardware, load the 
     39proper driver manually with the "modprobe" command and exit from this shell. 
     40For old IDE controllers, the correct module name is "ide-generic", or, if 
     41you want to use the new libata-based driver, "pata-legacy". To avoid this 
     42message next time you boot this CD, use a kernel command line like this: 
     43linux load=ide-generic 
     44 
     45This problem can be also caused by a slow SCSI controller or USB/FireWire 
     46CD-ROM that needs more time to be detected. If you see any kernel messages 
     47below, this is the case. In this case, it is sufficient to type "exit", 
     48and the CD will continue the boot process. To avoid this message next 
     49ime you boot this CD, use a kernel command line like this: 
     50linux rootdelay=20 
     51 
     52Dropping you to a shell. 
     53 
     54EOF 
     55        sh 
     56} 
     57 
    3158do_resume() { 
    3259        case "$resume" in 
     
    3764                if [ -b ${resume} ] ; then 
    3865                        eval echo $( stat -L -c '$(( 0x%t )):$(( 0x%T ))' ${resume} ) >/sys/power/resume 
     66                        # MC syntax highlighting is buggy ' 
    3967                else 
    40                         echo "Cannot resume from device $resume, which doesn't exist" 
     68                        cat <<EOF 
     69The specified resume device ${resume} doesn't exist. 
     70Please fix this problem and exit this shell. If you don't want to resume, 
     71type "exit". 
     72 
     73EOF 
     74                        problem 
     75                        # Retry 
     76                        if [ -b ${resume} ] ; then 
     77                                eval echo $( stat -L -c '$(( 0x%t )):$(( 0x%T ))' ${resume} ) >/sys/power/resume 
     78                                # MC syntax highlighting is buggy ' 
     79                        else 
     80                                cat <<EOF 
     81The specified resume device ${resume} still doesn't exist. 
     82Assuming that you don't want to resume. 
     83EOF 
     84                        fi 
    4185                fi 
    4286                ;; 
     
    81125                bs=1 count=1 skip=8 seek=47482 conv=notrunc 2>/dev/null 
    82126        umount -n /.tmpfs/.cdrom 
    83         /sbin/losetup /dev/loop2 /.tmpfs/.fakecd.iso 
     127        losetup /dev/loop2 /.tmpfs/.fakecd.iso 
    84128        if [ -d /.tmpfs/.partition ] ; then 
    85                 /sbin/losetup -d /dev/loop3 
     129                losetup -d /dev/loop3 
    86130                umount -n /.tmpfs/.partition && rm -rf /.tmpfs/.partition 
    87131        fi 
     
    103147} 
    104148 
     149 
    105150do_mount_cd() { 
    106         i=1 
    107         while [ ! -L /dev/lfs-cd ] ; do 
     151        while [ ! -b /dev/lfs-cd ] ; do 
    108152                find_cd 
    109153 
    110                 if [ ! -L /dev/lfs-cd ] ; then 
    111                         echo "LFS LiveCD not found." 
    112                         TRIES=5 
    113                         DELAY=6    # 30 seconds total 
    114  
    115                         for (( ; i<=$TRIES ; i++ )) ; do 
    116                                 [ -L /dev/lfs-cd ] && break 
    117  
    118                                 echo -n "Retry attempt $i of $TRIES... " 
    119                                 sleep $DELAY 
    120                                 find_cd 
    121  
    122                                 [ -L /dev/lfs-cd ] && echo "success!" || echo "failed!" 
    123                         done 
    124                 fi 
    125  
    126                 if [ ! -L /dev/lfs-cd ] ; then 
    127                         echo "" 
    128                         echo "LFS LiveCD could not find its device, perhaps due to" 
    129                         echo "unsupported or undetected hardware. Or maybe this is" 
    130                         echo "just a slow SCSI or USB controller that needs more time" 
    131                         echo "to settle (workaround: add rootdelay=30 to the kernel" 
    132                         echo "command line in the boot loader)." 
    133                         echo "" 
    134                         echo "Dropping you to a shell." 
    135                         echo "Please load the needed modules and, optionally, make" 
    136                         echo "/dev/lfs-cd a symlink pointing to the correct device." 
    137                         echo "" 
    138                         sh 
     154                if [ ! -b /dev/lfs-cd ] ; then 
     155                        cat <<"EOF" 
     156 
     157LFS LiveCD could not find its device, perhaps due to unsupported or 
     158undetected hardware. Please fix this problem and exit this shell. 
     159 
     160EOF 
     161                        problem 
    139162                fi 
    140163        done 
     
    143166        if [ "$toram" = 1 ] ; then copy_cd_to_ram ; fi 
    144167        mount -n -t iso9660 -o ro /dev/lfs-cd /.tmpfs/.cdrom 
    145         /sbin/losetup /dev/loop0 /.tmpfs/.cdrom/root.ext2 
    146         SIZE=`/sbin/blockdev --getsize /dev/loop0` 
     168        losetup /dev/loop0 /.tmpfs/.cdrom/root.ext2 
     169        SIZE=`blockdev --getsize /dev/loop0` 
    147170        OVERHEAD=$(( 0x1000 + $SIZE * 2 )) 
    148171        OVLSIZE=$(( $SIZE + ( $OVERHEAD + 511 ) / 512 )) 
    149172        dd if=/dev/null of=/.tmpfs/.overlay bs=512 seek=$OVLSIZE 2>/dev/null 
    150         /sbin/losetup /dev/loop1 /.tmpfs/.overlay 
    151         echo "0 $SIZE snapshot /dev/loop0 /dev/loop1 p 8" | /sbin/dmsetup create lfs-cd 
     173        losetup /dev/loop1 /.tmpfs/.overlay 
     174        echo "0 $SIZE snapshot /dev/loop0 /dev/loop1 p 8" | dmsetup create lfs-cd 
    152175        mount -n -t ext2 /dev/mapper/lfs-cd /.root 
    153176        mount -n --move /.tmpfs /.root/dev/shm 
     
    166189                rm -f /.root/etc/udev/rules.d/76-network.rules 
    167190        fi 
     191        ( IFS="," ; for module in $load ; do 
     192                echo "$module" >>/.root/etc/sysconfig/modules 
     193        done ) 
     194 
    168195} 
    169196 
     
    173200        DEVICE=${DEVICE%%:*} 
    174201        mkdir /.tmpfs/.partition 
    175         mount -n -t "$rootfstype" -o "$rootflags" "$DEVICE" /.tmpfs/.partition 
    176         /sbin/losetup /dev/loop3 "/.tmpfs/.partition/$FILE" 
     202        while [ ! -b "$DEVICE" ] ; do 
     203                cat <<EOF 
     204 
     205The device ${DEVICE}, which is supposed to contain a file 
     206with the ISO9660 image of the LFS LiveCD, does not exist. 
     207Please fix this problem and exit this shell. 
     208 
     209EOF 
     210                problem 
     211        done 
     212        if ! mount -n -t "$rootfstype" -o "$rootflags" "$DEVICE" /.tmpfs/.partition ; then 
     213                cat <<EOF 
     214 
     215Could not mount device ${DEVICE} 
     216(but it does exist, please mention this when asking for support). 
     217Sleeping forever. Please reboot and fix the kernel command line. 
     218 
     219Maybe you have put the ISO9660 image of the LiveCD onto a partition 
     220formatted with an unsupported file system? 
     221 
     222Or maybe filesystem type autodetection went wrong, in which case 
     223you should add rootfstype=... to the kernel command line. 
     224 
     225Available partitions: 
     226EOF 
     227                cat /proc/partitions 
     228                while true ; do sleep 10000 ; done 
     229        fi 
     230        if [ ! -f "/.tmpfs/.partition/$FILE" ] ; then 
     231                cat <<EOF 
     232 
     233The file ${FILE} does not exist on the device ${DEVICE}. 
     234Sleeping forever. Please reboot and fix the kernel command line. 
     235 
     236Maybe you have specified a wrong device or file name? Does the following 
     237list of files on the partition look right? 
     238EOF 
     239                ( cd /.tmpfs/.partition ; ls ) 
     240                umount -n /.tmpfs/.partition 
     241                while true ; do sleep 10000 ; done 
     242        fi 
     243        losetup /dev/loop3 "/.tmpfs/.partition/$FILE" 
    177244        ln -sf /dev/loop3 /dev/lfs-cd 
    178245        do_mount_cd 
     
    189256                do_mount_iso 
    190257                ;; 
     258        /dev/*) 
     259                while [ ! -b "$root" ] ; do 
     260                        cat <<EOF 
     261The device ${root}, which is supposed to contain the 
     262root file system, does not exist. 
     263Please fix this problem and exit this shell. 
     264 
     265EOF 
     266                        problem  
     267                done 
     268                if ! mount -n -t "$rootfstype" -o "$rootflags" "$root" /.root ; then 
     269                        cat <<EOF 
     270 
     271Could not mount device ${root} 
     272Sleeping forever. Please reboot and fix the kernel command line. 
     273 
     274Maybe the device is formatted with an unsupported file system? 
     275 
     276Or maybe filesystem type autodetection went wrong, in which case 
     277you should add the rootfstype=... parameter to the kernel command line. 
     278 
     279Available partitions: 
     280EOF 
     281                        cat /proc/partitions 
     282                        while true ; do sleep 10000 ; done 
     283                fi 
     284                ;; 
    191285        *:*) 
    192286                ( IFS=":" ; mknod /dev/root b $root ) 
    193                 mount -n -t "$rootfstype" -o "$rootflags" /dev/root /.root 
    194                 ;; 
    195         /dev/*) 
    196                 mount -n -t "$rootfstype" -o "$rootflags" "$root" /.root 
     287                if ! mount -n -t "$rootfstype" -o "$rootflags" /dev/root /.root ; then 
     288                        cat <<EOF 
     289 
     290Could not mount device $root 
     291Sleeping forever. Please reboot and fix the kernel command line. 
     292 
     293Maybe the device is formatted with an unsupported file system? 
     294 
     295Or maybe filesystem type autodetection went wrong, in which case 
     296you should add the rootfstype=... parameter to the kernel command line. 
     297 
     298Available partitions: 
     299EOF 
     300                        cat /proc/partitions 
     301                        while true ; do sleep 10000 ; done 
     302                fi 
    197303                ;; 
    198304        "") 
     
    243349        rootfstype=*) 
    244350                rootfstype=${param#rootfstype=} 
     351                ;; 
     352        rootflags=*) 
     353                rootflags=${param#rootflags=} 
    245354                ;; 
    246355        ro) 
     
    279388                done 
    280389                echo "install ata_piix /sbin/modprobe piix ; /sbin/modprobe -i ata_piix" >>/etc/modprobe.conf 
    281                 echo "blacklist ata_generic" >>/etc/modprobe.conf 
    282390                ;; 
    283391        1) 
     
    311419        echo "options generic all_generic_ide=1" >>/etc/modprobe.conf 
    312420        echo "options ata-generic all_generic_ide=1" >>/etc/modprobe.conf 
    313 else 
     421fi 
     422 
     423udevd --daemon 
     424 
     425( IFS="," ; for module in $load ; do 
     426        modprobe "$module" 
     427done ) 
     428 
     429udevtrigger 
     430udevsettle 
     431if [ "$all_generic_ide" = 1 ] ; then 
    314432        if [ "$PATA" = 0 ] ; then 
    315                 echo "blacklist generic" >>/etc/modprobe.conf 
     433                modprobe generic 
    316434        else 
    317                 echo "blacklist ata-generic" >>/etc/modprobe.conf 
    318         fi 
     435                modprobe ata_generic 
     436        fi 
     437        udevsettle 
    319438fi 
    320439 
    321 /sbin/udevd --daemon 
    322  
    323 ( IFS="," ; for module in $load ; do 
    324         /sbin/modprobe "$module" 
    325 done ) 
    326  
    327 /sbin/udevtrigger 
    328 /sbin/udevsettle 
    329440if [ -n "$rootdelay" ] ; then sleep "$rootdelay" ; fi 
    330441 
  • branches/minimal/packages/jhalfs/configuration

    r1991 r2078  
    1919# BRANCH is not set 
    2020BRANCH_ID="" 
    21 BOOK="/usr/share/LFS-BOOK-SVN-XML" 
     21BOOK="/usr/share/LFS-BOOK-6.3-XML" 
    2222# ARCH_X86 is not set 
    2323# ARCH_MIPS is not set 
  • branches/minimal/packages/linux/Makefile

    r2052 r2078  
    4040SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6 
    4141 
     42DIR9=rtl-mac80211-20070729 
     43FILE9= $(DIR9).tar.bz2 
     44URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9) 
     45SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953 
     46 
     47 
    4248# Targets 
    4349 
     
    4854        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    4955 
    50 stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(PATCH1) 
     56stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1) 
    5157        $(std_build) 
    5258 
     
    6268        make modules_install 
    6369        cp -v arch/i386/boot/bzImage /boot/isolinux/linux 
    64         tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \ 
     70        # both rtl8187 and rt2x00 build eeprom_93cx6.ko and thus conflict 
     71        # so we have to hack the build 
     72        tar xf ../$(FILE7) ; tar xf ../$(FILE9) ; cd $(DIR7) ; \ 
     73            cp ../../config.rt2x00 config ; cp ../$(DIR9)/rtl* . ; \ 
     74            sed -i 's@"eeprom_93cx6.h"@<linux/eeprom_93cx6.h>@' rtl8187_dev.c ; \ 
    6575            sed -i '/depmod/d' Makefile ; \ 
     76            echo "obj-m += rtl8187.o" >>Makefile ; \ 
     77            echo "rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o" >>Makefile ; \ 
    6678            patch -Np0 -i ../../$(PATCH2) ; make KERNDIR=`pwd`/.. ; \ 
    6779            make KERNDIR=`pwd`/.. install 
     
    7284            cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ; cd .. ; \ 
    7385            cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz . 
     86        rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) 
     87        ../debian-style-headers.sh 
    7488        mv *.tgz /drivers 
    75         cd .. ; ./debian-style-headers.sh $(DIR) 
    7689 
    7790clean: 
  • branches/minimal/packages/linux/config.x86

    r2027 r2078  
    11# 
    22# Automatically generated make config: don't edit 
    3 # Linux kernel version: 2.6.22.2 
    4 # Wed Aug 15 17:47:27 2007 
     3# Linux kernel version: 2.6.22.5 
     4# Sat Sep 22 17:26:17 2007 
    55# 
    66CONFIG_X86_32=y 
     
    363363CONFIG_IP_MULTICAST=y 
    364364# CONFIG_IP_ADVANCED_ROUTER is not set 
    365 # CONFIG_ASK_IP_FIB_HASH is not set 
    366 # CONFIG_IP_FIB_TRIE is not set 
    367365CONFIG_IP_FIB_HASH=y 
    368366# CONFIG_IP_PNP is not set 
     
    384382# CONFIG_TCP_CONG_ADVANCED is not set 
    385383CONFIG_TCP_CONG_CUBIC=y 
    386 # CONFIG_DEFAULT_BIC is not set 
    387 # CONFIG_DEFAULT_CUBIC is not set 
    388 # CONFIG_DEFAULT_HTCP is not set 
    389 # CONFIG_DEFAULT_VEGAS is not set 
    390 # CONFIG_DEFAULT_WESTWOOD is not set 
    391 # CONFIG_DEFAULT_RENO is not set 
    392384CONFIG_DEFAULT_TCP_CONG="cubic" 
    393385# CONFIG_TCP_MD5SIG is not set 
     
    406398CONFIG_NETFILTER_NETLINK_QUEUE=m 
    407399CONFIG_NETFILTER_NETLINK_LOG=m 
    408 # CONFIG_NF_CONNTRACK_ENABLED is not set 
    409 # CONFIG_NF_CONNTRACK is not set 
     400CONFIG_NF_CONNTRACK_ENABLED=m 
     401CONFIG_NF_CONNTRACK=m 
     402CONFIG_NF_CT_ACCT=y 
     403CONFIG_NF_CONNTRACK_MARK=y 
     404CONFIG_NF_CONNTRACK_EVENTS=y 
     405CONFIG_NF_CT_PROTO_GRE=m 
     406CONFIG_NF_CT_PROTO_SCTP=m 
     407CONFIG_NF_CONNTRACK_AMANDA=m 
     408CONFIG_NF_CONNTRACK_FTP=m 
     409CONFIG_NF_CONNTRACK_H323=m 
     410CONFIG_NF_CONNTRACK_IRC=m 
     411CONFIG_NF_CONNTRACK_NETBIOS_NS=m 
     412CONFIG_NF_CONNTRACK_PPTP=m 
     413CONFIG_NF_CONNTRACK_SANE=m 
     414CONFIG_NF_CONNTRACK_SIP=m 
     415CONFIG_NF_CONNTRACK_TFTP=m 
     416CONFIG_NF_CT_NETLINK=m 
    410417CONFIG_NETFILTER_XTABLES=m 
    411418CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 
     419CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 
    412420CONFIG_NETFILTER_XT_TARGET_DSCP=m 
    413421CONFIG_NETFILTER_XT_TARGET_MARK=m 
    414422CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 
    415423CONFIG_NETFILTER_XT_TARGET_NFLOG=m 
     424CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 
    416425CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 
    417426CONFIG_NETFILTER_XT_MATCH_COMMENT=m 
     427CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 
     428CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 
     429CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 
    418430CONFIG_NETFILTER_XT_MATCH_DCCP=m 
    419431CONFIG_NETFILTER_XT_MATCH_DSCP=m 
    420432CONFIG_NETFILTER_XT_MATCH_ESP=m 
     433CONFIG_NETFILTER_XT_MATCH_HELPER=m 
    421434CONFIG_NETFILTER_XT_MATCH_LENGTH=m 
    422435CONFIG_NETFILTER_XT_MATCH_LIMIT=m 
     
    428441CONFIG_NETFILTER_XT_MATCH_REALM=m 
    429442CONFIG_NETFILTER_XT_MATCH_SCTP=m 
     443CONFIG_NETFILTER_XT_MATCH_STATE=m 
    430444CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 
    431445CONFIG_NETFILTER_XT_MATCH_STRING=m 
     
    436450# IP: Netfilter Configuration 
    437451# 
     452CONFIG_NF_CONNTRACK_IPV4=m 
     453CONFIG_NF_CONNTRACK_PROC_COMPAT=y 
    438454CONFIG_IP_NF_QUEUE=m 
    439455CONFIG_IP_NF_IPTABLES=m 
     
    450466CONFIG_IP_NF_TARGET_LOG=m 
    451467CONFIG_IP_NF_TARGET_ULOG=m 
     468CONFIG_NF_NAT=m 
     469CONFIG_NF_NAT_NEEDED=y 
     470CONFIG_IP_NF_TARGET_MASQUERADE=m 
     471CONFIG_IP_NF_TARGET_REDIRECT=m 
     472CONFIG_IP_NF_TARGET_NETMAP=m 
     473CONFIG_IP_NF_TARGET_SAME=m 
     474CONFIG_NF_NAT_SNMP_BASIC=m 
     475CONFIG_NF_NAT_PROTO_GRE=m 
     476CONFIG_NF_NAT_FTP=m 
     477CONFIG_NF_NAT_IRC=m 
     478CONFIG_NF_NAT_TFTP=m 
     479CONFIG_NF_NAT_AMANDA=m 
     480CONFIG_NF_NAT_PPTP=m 
     481CONFIG_NF_NAT_H323=m 
     482CONFIG_NF_NAT_SIP=m 
    452483CONFIG_IP_NF_MANGLE=m 
    453484CONFIG_IP_NF_TARGET_TOS=m 
    454485CONFIG_IP_NF_TARGET_ECN=m 
    455486CONFIG_IP_NF_TARGET_TTL=m 
     487CONFIG_IP_NF_TARGET_CLUSTERIP=m 
    456488CONFIG_IP_NF_RAW=m 
    457 # CONFIG_IP_NF_ARPTABLES is not set 
     489CONFIG_IP_NF_ARPTABLES=m 
     490CONFIG_IP_NF_ARPFILTER=m 
     491CONFIG_IP_NF_ARP_MANGLE=m 
    458492# CONFIG_IP_DCCP is not set 
    459493# CONFIG_IP_SCTP is not set 
     
    628662CONFIG_WIRELESS_EXT=y 
    629663CONFIG_MAC80211=m 
     664CONFIG_MAC80211_LEDS=y 
    630665# CONFIG_MAC80211_DEBUG is not set 
    631666CONFIG_IEEE80211=m 
     
    660695# Parallel port support 
    661696# 
    662 # CONFIG_PARPORT is not set 
     697CONFIG_PARPORT=m 
     698CONFIG_PARPORT_PC=m 
     699CONFIG_PARPORT_SERIAL=m 
     700CONFIG_PARPORT_PC_FIFO=y 
     701CONFIG_PARPORT_PC_SUPERIO=y 
     702CONFIG_PARPORT_PC_PCMCIA=m 
     703# CONFIG_PARPORT_GSC is not set 
     704CONFIG_PARPORT_AX88796=m 
     705CONFIG_PARPORT_1284=y 
     706CONFIG_PARPORT_NOT_PC=y 
    663707 
    664708# 
     
    681725CONFIG_BLK_DEV_FD=m 
    682726# CONFIG_BLK_DEV_XD is not set 
     727CONFIG_PARIDE=m 
     728 
     729# 
     730# Parallel IDE high-level drivers 
     731# 
     732CONFIG_PARIDE_PD=m 
     733CONFIG_PARIDE_PCD=m 
     734CONFIG_PARIDE_PF=m 
     735CONFIG_PARIDE_PT=m 
     736CONFIG_PARIDE_PG=m 
     737 
     738# 
     739# Parallel IDE protocol modules 
     740# 
     741CONFIG_PARIDE_ATEN=m 
     742CONFIG_PARIDE_BPCK=m 
     743CONFIG_PARIDE_BPCK6=m 
     744CONFIG_PARIDE_COMM=m 
     745CONFIG_PARIDE_DSTR=m 
     746CONFIG_PARIDE_FIT2=m 
     747CONFIG_PARIDE_FIT3=m 
     748CONFIG_PARIDE_EPAT=m 
     749CONFIG_PARIDE_EPATC8=y 
     750CONFIG_PARIDE_EPIA=m 
     751CONFIG_PARIDE_FRIQ=m 
     752CONFIG_PARIDE_FRPW=m 
     753CONFIG_PARIDE_KBIC=m 
     754CONFIG_PARIDE_KTTI=m 
     755CONFIG_PARIDE_ON20=m 
     756CONFIG_PARIDE_ON26=m 
    683757CONFIG_BLK_CPQ_DA=m 
    684758CONFIG_BLK_CPQ_CISS_DA=m 
     
    733807CONFIG_BLK_DEV_CMD640=y 
    734808# CONFIG_BLK_DEV_CMD640_ENHANCED is not set 
    735 CONFIG_BLK_DEV_IDEPNP=y 
     809# CONFIG_BLK_DEV_IDEPNP is not set 
    736810CONFIG_BLK_DEV_IDEPCI=y 
    737811CONFIG_IDEPCI_SHARE_IRQ=y 
     
    871945CONFIG_SCSI_INITIO=m 
    872946CONFIG_SCSI_INIA100=m 
     947CONFIG_SCSI_PPA=m 
     948CONFIG_SCSI_IMM=m 
     949# CONFIG_SCSI_IZIP_EPP16 is not set 
     950# CONFIG_SCSI_IZIP_SLOW_CTR is not set 
    873951CONFIG_SCSI_NCR53C406A=m 
    874952CONFIG_SCSI_STEX=m 
     
    10081086CONFIG_FUSION_SAS=m 
    10091087CONFIG_FUSION_MAX_SGE=128 
    1010 # CONFIG_FUSION_CTL is not set 
     1088CONFIG_FUSION_CTL=m 
     1089CONFIG_FUSION_LAN=m 
    10111090 
    10121091# 
     
    11721251CONFIG_VIA_RHINE_NAPI=y 
    11731252CONFIG_SC92031=m 
     1253CONFIG_NET_POCKET=y 
     1254CONFIG_ATP=m 
     1255CONFIG_DE600=m 
     1256CONFIG_DE620=m 
    11741257CONFIG_NETDEV_1000=y 
    11751258CONFIG_ACENIC=m 
     
    13031386# CONFIG_FDDI is not set 
    13041387# CONFIG_HIPPI is not set 
     1388CONFIG_PLIP=m 
    13051389CONFIG_PPP=m 
    13061390CONFIG_PPP_MULTILINK=y 
     
    13121396CONFIG_PPP_MPPE=m 
    13131397CONFIG_PPPOE=m 
    1314 # CONFIG_SLIP is not set 
     1398CONFIG_SLIP=m 
     1399CONFIG_SLIP_COMPRESSED=y 
    13151400CONFIG_SLHC=m 
    1316 # CONFIG_NET_FC is not set 
     1401CONFIG_SLIP_SMART=y 
     1402CONFIG_SLIP_MODE_SLIP6=y 
     1403CONFIG_NET_FC=y 
    13171404# CONFIG_SHAPER is not set 
    13181405# CONFIG_NETCONSOLE is not set 
     
    13941481CONFIG_SERIO_SERPORT=m 
    13951482# CONFIG_SERIO_CT82C710 is not set 
     1483# CONFIG_SERIO_PARKBD is not set 
    13961484# CONFIG_SERIO_PCIPS2 is not set 
    13971485CONFIG_SERIO_LIBPS2=y 
     
    14261514CONFIG_UNIX98_PTYS=y 
    14271515# CONFIG_LEGACY_PTYS is not set 
     1516CONFIG_PRINTER=m 
     1517# CONFIG_LP_CONSOLE is not set 
     1518CONFIG_PPDEV=m 
     1519# CONFIG_TIPAR is not set 
    14281520 
    14291521# 
     
    14691561# PCMCIA character devices 
    14701562# 
    1471 # CONFIG_SYNCLINK_CS is not set 
     1563CONFIG_SYNCLINK_CS=m 
    14721564# CONFIG_CARDMAN_4000 is not set 
    14731565# CONFIG_CARDMAN_4040 is not set 
     
    16331725# CONFIG_SND_DUMMY is not set 
    16341726# CONFIG_SND_MTPAV is not set 
     1727# CONFIG_SND_MTS64 is not set 
    16351728# CONFIG_SND_SERIAL_U16550 is not set 
    16361729# CONFIG_SND_MPU401 is not set 
     1730# CONFIG_SND_PORTMAN2X4 is not set 
    16371731 
    16381732# 
     
    18591953# USB port drivers 
    18601954# 
     1955# CONFIG_USB_USS720 is not set 
    18611956 
    18621957# 
     
    19522047# LED devices 
    19532048# 
    1954 # CONFIG_NEW_LEDS is not set 
     2049CONFIG_NEW_LEDS=y 
     2050CONFIG_LEDS_CLASS=m 
    19552051 
    19562052# 
     
    19612057# LED Triggers 
    19622058# 
     2059CONFIG_LEDS_TRIGGERS=y 
     2060CONFIG_LEDS_TRIGGER_TIMER=m 
     2061CONFIG_LEDS_TRIGGER_IDE_DISK=y 
     2062CONFIG_LEDS_TRIGGER_HEARTBEAT=m 
    19632063 
    19642064# 
     
    20062106# DMA Devices 
    20072107# 
     2108 
     2109# 
     2110# Auxiliary Display support 
     2111# 
     2112# CONFIG_KS0108 is not set 
    20082113 
    20092114# 
  • branches/minimal/packages/linux/debian-style-headers.sh

    r1823 r2078  
    11#!/bin/sh 
    22 
    3 SRCDIR="$1" 
    4 KVERSION=`grep UTS_RELEASE "$SRCDIR/include/linux/utsrelease.h" | cut -d '"' -f 2` 
     3KVERSION=`grep UTS_RELEASE include/linux/utsrelease.h | cut -d '"' -f 2` 
    54DSTDIR=/usr/src/linux-$KVERSION 
    6  
    7 echo $SRCDIR $DSTDIR 
    85 
    96rm -rf "$DSTDIR" 
    107mkdir "$DSTDIR" 
    11 cp -rv "$SRCDIR/.config" "$SRCDIR/Makefile" "$SRCDIR/Module.symvers" "$DSTDIR" 
    12 cp -rv "$SRCDIR/.kconfig.d" "$SRCDIR/.version" "$SRCDIR/.kernelrelease" "$DSTDIR" 
    13 cp -rv "$SRCDIR/include" "$SRCDIR/scripts" "$DSTDIR" 
    14 ( cd "$SRCDIR" ; find -type d ) | ( 
    15         while read dir ; do 
    16             mkdir -p "$DSTDIR/$dir" 
    17         done ) 
    18 ( cd "$SRCDIR" ; find -type f -a '(' -name Kconfig\* \ 
    19     -o -name Makefile\* -o -name \*.s ')' ) | ( 
    20         cd "$SRCDIR" 
     8cp -r .config Makefile Module.symvers .kconfig.d .version .kernelrelease scripts "$DSTDIR" 
     9mkdir -p "$DSTDIR/include" 
     10find include -maxdepth 1 | grep -v asm- | xargs '-I{}' cp -r '{}' "$DSTDIR/include" 
     11cp -r include/asm-{i386,x86_64,generic} "$DSTDIR/include" 
     12find . -type f -a '(' -name Kconfig\* \ 
     13    -o -name Makefile\* -o -name \*.s ')' | ( 
    2114        while read file ; do 
    22             cp -v "$file" "$DSTDIR/$file" 
     15            case "$file" in 
     16                ./arch/i386*|./include/asm-generic*|./include/asm-i386*|./include/asm-x86_64*) 
     17                    mkdir -p "$DSTDIR/`dirname $file`" 
     18                    cp "$file" "$DSTDIR/$file" 
     19                    ;; 
     20                ./arch/*|./include/asm-*) 
     21                    ;; 
     22                *) 
     23                    mkdir -p "$DSTDIR/`dirname $file`" 
     24                    cp "$file" "$DSTDIR/$file" 
     25                    ;; 
     26            esac 
    2327        done ) 
    2428ln -nsf "$DSTDIR" "/lib/modules/$KVERSION/source" 
  • branches/minimal/packages/linux64/Makefile

    r2052 r2078  
    4747endif 
    4848 
     49DIR9=rtl-mac80211-20070729 
     50FILE9= $(DIR9).tar.bz2 
     51URL-$(FILE9)= http://www.hauke-m.de/fileadmin/rtl-wifi/$(FILE9) 
     52SHA-$(FILE9)= 001787fe6556cdfe02ec77665e83f7747d71b953 
     53 
     54 
    4955# Targets 
    5056 
     
    5561        'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)' 
    5662 
    57 stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(PATCH1) 
     63stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(PATCH1) 
    5864        $(std_build) 
    5965 
     
    6874        $(CROSS_MAKE) 
    6975        $(CROSS_MAKE) modules_install 
    70         tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \ 
     76        # both rtl8187 and rt2x00 build eeprom_93cx6.ko and thus conflict 
     77        # so we have to hack the build 
     78        tar xf ../$(FILE7) ; tar xf ../$(FILE9) ; cd $(DIR7) ; \ 
     79            cp ../../config.rt2x00 config ; cp ../$(DIR9)/rtl* . ; \ 
     80            sed -i 's@"eeprom_93cx6.h"@<linux/eeprom_93cx6.h>@' rtl8187_dev.c ; \ 
    7181            sed -i '/depmod/d' Makefile ; \ 
     82            echo "obj-m += rtl8187.o" >>Makefile ; \ 
     83            echo "rtl8187-objs := rtl8187_dev.o rtl8187_rtl8225.o" >>Makefile ; \ 
    7284            patch -Np0 -i ../../$(PATCH2) ; \ 
    7385            $(CROSS_MAKE) KERNDIR=`pwd`/.. ; \ 
     
    89101            cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz . 
    90102        cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux 
     103        rm -rf $(DIR2) $(DIR3) $(DIR4) $(DIR5) $(DIR6) $(DIR7) $(DIR8) $(DIR9) 
     104        ../debian-style-headers.sh 
    91105endif 
    92106        mv *.tgz /drivers 
     107 
    93108 
    94109clean: 
  • branches/minimal/packages/linux64/config.x86_64

    r2027 r2078  
    11# 
    22# Automatically generated make config: don't edit 
    3 # Linux kernel version: 2.6.22.2 
    4 # Wed Aug 15 17:47:27 2007 
     3# Linux kernel version: 2.6.22.5 
     4# Mon Sep 17 18:40:16 2007 
    55# 
    66CONFIG_X86_64=y 
     
    304304CONFIG_IP_MULTICAST=y 
    305305# CONFIG_IP_ADVANCED_ROUTER is not set 
    306 # CONFIG_ASK_IP_FIB_HASH is not set 
    307 # CONFIG_IP_FIB_TRIE is not set 
    308306CONFIG_IP_FIB_HASH=y 
    309307# CONFIG_IP_PNP is not set 
     
    325323# CONFIG_TCP_CONG_ADVANCED is not set 
    326324CONFIG_TCP_CONG_CUBIC=y 
    327 # CONFIG_DEFAULT_BIC is not set 
    328 # CONFIG_DEFAULT_CUBIC is not set 
    329 # CONFIG_DEFAULT_HTCP is not set 
    330 # CONFIG_DEFAULT_VEGAS is not set 
    331 # CONFIG_DEFAULT_WESTWOOD is not set 
    332 # CONFIG_DEFAULT_RENO is not set 
    333325CONFIG_DEFAULT_TCP_CONG="cubic" 
    334326# CONFIG_TCP_MD5SIG is not set 
     
    351343CONFIG_NF_CT_ACCT=y 
    352344CONFIG_NF_CONNTRACK_MARK=y 
    353 # CONFIG_NF_CONNTRACK_EVENTS is not set 
     345CONFIG_NF_CONNTRACK_EVENTS=y 
    354346CONFIG_NF_CT_PROTO_GRE=m 
    355347CONFIG_NF_CT_PROTO_SCTP=m 
     
    610602CONFIG_WIRELESS_EXT=y 
    611603CONFIG_MAC80211=m 
     604CONFIG_MAC80211_LEDS=y 
    612605