wok-4.x rev 4472
linux .config (some changes similar to 2.6.29.3); add a modules check to receipt
| author | Rohit Joshi <jozee@slitaz.org> |
|---|---|
| date | Mon Nov 09 14:00:35 2009 +0000 (2009-11-09) |
| parents | f4510863ea79 |
| children | d3eca578f816 |
| files | linux-wireless/receipt linux/receipt linux/stuff/check_modules.sh linux/stuff/linux-2.6.30.6-slitaz.config linux/stuff/modules-2.6.30.6.list |
line diff
1.1 --- a/linux-wireless/receipt Mon Nov 09 18:34:36 2009 +0000 1.2 +++ b/linux-wireless/receipt Mon Nov 09 14:00:35 2009 +0000 1.3 @@ -21,7 +21,7 @@ 1.4 export _pkg 1.5 1.6 $src/slitaz/list_modules.sh drivers/net/wireless drivers/staging/wlan-ng \ 1.7 - drivers/staging/rt2860 drivers/staging/rt2870 drivers/staging/echo drivers/leds net/wireless net/mac80211 | while read module; do 1.8 + drivers/staging/rt2860 drivers/staging/rt2870 drivers/staging/rt3070 drivers/staging/echo drivers/leds net/wireless net/mac80211 | while read module; do 1.9 dir=$path/$(dirname $module) 1.10 [ -d $fs/$dir ] || mkdir -p $fs/$dir 1.11 cp -a $_pkg/$path/$module $fs/$dir
2.1 --- a/linux/receipt Mon Nov 09 18:34:36 2009 +0000 2.2 +++ b/linux/receipt Mon Nov 09 14:00:35 2009 +0000 2.3 @@ -20,6 +20,7 @@ 2.4 git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2 2.5 cd aufs2 && git checkout origin/aufs2-30 2.6 cp -a Documentation fs include $src 2.7 + cp -a *.patch ../stuff 2.8 fi 2.9 cd $src 2.10 # SliTaz db 2.11 @@ -30,22 +31,23 @@ 2.12 # Misc patches from pascal 2.13 while read patch_file; do 2.14 echo "$patch_file" >> slitaz/patches 2.15 - cp ../stuff/$patch_file slitaz/$patch_file 2.16 + #cp ../stuff/$patch_file slitaz/$patch_file 2.17 + cp ../stuff/$patch_file slitaz 2.18 if [ -f done.$patch_file ]; then 2.19 echo "Skipping $patch_file" 2.20 continue 2.21 fi 2.22 echo "Apply $patch_file" 2.23 - patch -p1 < $patch_file || exit 1 2.24 + patch -p1 < slitaz/$patch_file || exit 1 2.25 touch done.$patch_file 2.26 done <<EOT 2.27 -../stuff/$PACKAGE-utf8-$VERSION.u 2.28 -../stuff/$PACKAGE-diff-$VERSION.u 2.29 -../stuff/$PACKAGE-freeinitrd-$VERSION.u 2.30 -../stuff/$PACKAGE-unlzma-$VERSION.u 2.31 -../aufs2/aufs2-base.patch 2.32 -../aufs2/aufs2-kbuild.patch 2.33 -../aufs2/aufs2-standalone.patch 2.34 +$PACKAGE-utf8-$VERSION.u 2.35 +$PACKAGE-diff-$VERSION.u 2.36 +$PACKAGE-freeinitrd-$VERSION.u 2.37 +$PACKAGE-unlzma-$VERSION.u 2.38 +aufs2-base.patch 2.39 +aufs2-kbuild.patch 2.40 +aufs2-standalone.patch 2.41 EOT 2.42 make mrproper 2.43 cp ../stuff/$PACKAGE-$VERSION-slitaz.config .config 2.44 @@ -93,6 +95,8 @@ 2.45 do 2.46 echo tazwok cook ${i%/receipt} 2.47 done 2.48 + # check and echo any module in kernel .config that's not added to one of linux-* pkgs 2.49 + ./stuff/check_modules.sh 2.50 } 2.51 2.52 # Pre and post install commands for Tazpkg.
3.1 --- a/linux/stuff/check_modules.sh Mon Nov 09 18:34:36 2009 +0000 3.2 +++ b/linux/stuff/check_modules.sh Mon Nov 09 14:00:35 2009 +0000 3.3 @@ -2,10 +2,11 @@ 3.4 # Echo any module in kernel .config that's not added to one of linux-* pkgs 3.5 # 2009/06/18 <jozee@slitaz.org> - GNU General Public License. 3.6 # 3.7 - 3.8 - VERSION=$1 3.9 - WOK=$2 3.10 - src=$WOK/linux/linux-$VERSION 3.11 + . /etc/tazwok.conf 3.12 + 3.13 + VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 3.14 + src="$WOK/linux/linux-$VERSION" 3.15 + 3.16 cd $src 3.17 mkdir -p ../stuff/tmp 3.18 rm -f ../stuff/tmp/* # clean up 3.19 @@ -35,9 +36,11 @@ 3.20 done 3.21 if [ -f ../stuff/tmp/unpackaged-modules-"$VERSION".list ]; then 3.22 echo "======================================================================" 3.23 - echo " Some modules selected in .config were not categorized in linux-* pkgs" 3.24 - echo "Check linux/stuff/tmp/unpackaged-modules-$VERSION.list to see" 3.25 + echo " These modules selected in .config were not categorized in linux-* pkgs:" 3.26 cat ../stuff/tmp/unpackaged-modules-$VERSION.list 3.27 + #echo "Check linux/stuff/tmp/unpackaged-modules-$VERSION.list to see" 3.28 + echo "======================================================================" 3.29 else 3.30 rm -r ../stuff/tmp 3.31 fi 3.32 +
4.1 --- a/linux/stuff/linux-2.6.30.6-slitaz.config Mon Nov 09 18:34:36 2009 +0000 4.2 +++ b/linux/stuff/linux-2.6.30.6-slitaz.config Mon Nov 09 14:00:35 2009 +0000 4.3 @@ -1,7 +1,7 @@ 4.4 # 4.5 # Automatically generated make config: don't edit 4.6 # Linux kernel version: 2.6.30.6 4.7 -# Fri Sep 25 01:17:11 2009 4.8 +# Fri Nov 6 10:51:41 2009 4.9 # 4.10 # CONFIG_64BIT is not set 4.11 CONFIG_X86_32=y 4.12 @@ -343,11 +343,11 @@ 4.13 CONFIG_ACPI_PROCFS_POWER=y 4.14 CONFIG_ACPI_SYSFS_POWER=y 4.15 CONFIG_ACPI_PROC_EVENT=y 4.16 -CONFIG_ACPI_AC=m 4.17 -CONFIG_ACPI_BATTERY=m 4.18 +CONFIG_ACPI_AC=y 4.19 +CONFIG_ACPI_BATTERY=y 4.20 # CONFIG_ACPI_BUTTON is not set 4.21 CONFIG_ACPI_VIDEO=m 4.22 -# CONFIG_ACPI_FAN is not set 4.23 +CONFIG_ACPI_FAN=y 4.24 CONFIG_ACPI_DOCK=y 4.25 CONFIG_ACPI_PROCESSOR=y 4.26 CONFIG_ACPI_HOTPLUG_CPU=y 4.27 @@ -376,8 +376,8 @@ 4.28 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set 4.29 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 4.30 CONFIG_CPU_FREQ_GOV_POWERSAVE=m 4.31 -CONFIG_CPU_FREQ_GOV_USERSPACE=m 4.32 -CONFIG_CPU_FREQ_GOV_ONDEMAND=m 4.33 +CONFIG_CPU_FREQ_GOV_USERSPACE=y 4.34 +CONFIG_CPU_FREQ_GOV_ONDEMAND=y 4.35 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m 4.36 4.37 # 4.38 @@ -939,7 +939,7 @@ 4.39 # CONFIG_PNPBIOS is not set 4.40 CONFIG_PNPACPI=y 4.41 CONFIG_BLK_DEV=y 4.42 -CONFIG_BLK_DEV_FD=y 4.43 +CONFIG_BLK_DEV_FD=m 4.44 # CONFIG_BLK_DEV_XD is not set 4.45 # CONFIG_PARIDE is not set 4.46 # CONFIG_BLK_CPQ_DA is not set 4.47 @@ -1272,7 +1272,7 @@ 4.48 # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set 4.49 # CONFIG_IEEE1394_ETH1394 is not set 4.50 CONFIG_IEEE1394_RAWIO=m 4.51 -# CONFIG_IEEE1394_VIDEO1394 is not set 4.52 +CONFIG_IEEE1394_VIDEO1394=m 4.53 # CONFIG_IEEE1394_DV1394 is not set 4.54 # CONFIG_IEEE1394_VERBOSEDEBUG is not set 4.55 # CONFIG_I2O is not set 4.56 @@ -1378,7 +1378,7 @@ 4.57 CONFIG_ADAPTEC_STARFIRE=m 4.58 # CONFIG_AC3200 is not set 4.59 CONFIG_APRICOT=m 4.60 -CONFIG_B44=y 4.61 +CONFIG_B44=m 4.62 CONFIG_B44_PCI_AUTOSELECT=y 4.63 CONFIG_B44_PCICORE_AUTOSELECT=y 4.64 CONFIG_B44_PCI=y 4.65 @@ -1480,17 +1480,20 @@ 4.66 CONFIG_LIBIPW=m 4.67 # CONFIG_LIBIPW_DEBUG is not set 4.68 CONFIG_IWLWIFI=m 4.69 -# CONFIG_IWLWIFI_LEDS is not set 4.70 -# CONFIG_IWLWIFI_RFKILL is not set 4.71 +CONFIG_IWLWIFI_LEDS=y 4.72 +CONFIG_IWLWIFI_RFKILL=y 4.73 # CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set 4.74 # CONFIG_IWLWIFI_DEBUG is not set 4.75 -# CONFIG_IWLAGN is not set 4.76 +CONFIG_IWLAGN=m 4.77 +CONFIG_IWL4965=y 4.78 +CONFIG_IWL5000=y 4.79 CONFIG_IWL3945=m 4.80 CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y 4.81 # CONFIG_HOSTAP is not set 4.82 CONFIG_B43=m 4.83 CONFIG_B43_PCI_AUTOSELECT=y 4.84 CONFIG_B43_PCICORE_AUTOSELECT=y 4.85 +# CONFIG_B43_PCMCIA is not set 4.86 CONFIG_B43_LEDS=y 4.87 # CONFIG_B43_DEBUG is not set 4.88 CONFIG_B43LEGACY=m 4.89 @@ -1674,7 +1677,7 @@ 4.90 CONFIG_MOUSE_PS2_TRACKPOINT=y 4.91 # CONFIG_MOUSE_PS2_ELANTECH is not set 4.92 # CONFIG_MOUSE_PS2_TOUCHKIT is not set 4.93 -CONFIG_MOUSE_SERIAL=y 4.94 +CONFIG_MOUSE_SERIAL=m 4.95 # CONFIG_MOUSE_APPLETOUCH is not set 4.96 # CONFIG_MOUSE_BCM5974 is not set 4.97 CONFIG_MOUSE_INPORT=m 4.98 @@ -2085,11 +2088,13 @@ 4.99 # 4.100 # Sonics Silicon Backplane 4.101 # 4.102 -CONFIG_SSB=y 4.103 +CONFIG_SSB=m 4.104 CONFIG_SSB_SPROM=y 4.105 CONFIG_SSB_PCIHOST_POSSIBLE=y 4.106 CONFIG_SSB_PCIHOST=y 4.107 CONFIG_SSB_B43_PCI_BRIDGE=y 4.108 +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y 4.109 +# CONFIG_SSB_PCMCIAHOST is not set 4.110 # CONFIG_SSB_DEBUG is not set 4.111 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y 4.112 CONFIG_SSB_DRIVER_PCICORE=y 4.113 @@ -2502,7 +2507,8 @@ 4.114 CONFIG_SND_HDA_CODEC_CMEDIA=y 4.115 CONFIG_SND_HDA_CODEC_SI3054=y 4.116 CONFIG_SND_HDA_GENERIC=y 4.117 -# CONFIG_SND_HDA_POWER_SAVE is not set 4.118 +CONFIG_SND_HDA_POWER_SAVE=y 4.119 +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5 4.120 CONFIG_SND_HDSP=m 4.121 CONFIG_SND_HDSPM=m 4.122 CONFIG_SND_HIFIER=m 4.123 @@ -2595,9 +2601,9 @@ 4.124 CONFIG_USB_DEVICEFS=y 4.125 CONFIG_USB_DEVICE_CLASS=y 4.126 # CONFIG_USB_DYNAMIC_MINORS is not set 4.127 -# CONFIG_USB_SUSPEND is not set 4.128 +CONFIG_USB_SUSPEND=y 4.129 # CONFIG_USB_OTG is not set 4.130 -# CONFIG_USB_MON is not set 4.131 +CONFIG_USB_MON=m 4.132 CONFIG_USB_WUSB=m 4.133 CONFIG_USB_WUSB_CBAF=m 4.134 # CONFIG_USB_WUSB_CBAF_DEBUG is not set 4.135 @@ -2613,7 +2619,6 @@ 4.136 # CONFIG_USB_ISP116X_HCD is not set 4.137 # CONFIG_USB_ISP1760_HCD is not set 4.138 CONFIG_USB_OHCI_HCD=y 4.139 -# CONFIG_USB_OHCI_HCD_SSB is not set 4.140 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 4.141 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 4.142 CONFIG_USB_OHCI_LITTLE_ENDIAN=y 4.143 @@ -2842,7 +2847,7 @@ 4.144 # CONFIG_OTUS is not set 4.145 CONFIG_RT2860=m 4.146 CONFIG_RT2870=m 4.147 -# CONFIG_RT3070 is not set 4.148 +CONFIG_RT3070=m 4.149 # CONFIG_COMEDI is not set 4.150 # CONFIG_ASUS_OLED is not set 4.151 # CONFIG_PANEL is not set 4.152 @@ -3017,8 +3022,8 @@ 4.153 # CONFIG_AUFS_SHWH is not set 4.154 # CONFIG_AUFS_BR_RAMFS is not set 4.155 # CONFIG_AUFS_BR_FUSE is not set 4.156 +CONFIG_AUFS_BDEV_LOOP=y 4.157 # CONFIG_AUFS_DEBUG is not set 4.158 -CONFIG_AUFS_BDEV_LOOP=y 4.159 # CONFIG_NILFS2_FS is not set 4.160 CONFIG_NETWORK_FILESYSTEMS=y 4.161 CONFIG_NFS_FS=y
5.1 --- a/linux/stuff/modules-2.6.30.6.list Mon Nov 09 18:34:36 2009 +0000 5.2 +++ b/linux/stuff/modules-2.6.30.6.list Mon Nov 09 14:00:35 2009 +0000 5.3 @@ -56,7 +56,9 @@ 5.4 drivers/net/phy/libphy.ko.gz 5.5 drivers/net/phy/lxt.ko.gz 5.6 drivers/net/phy/marvell.ko.gz 5.7 -drivers/net/phy/qsemi.ko.gz 5.8 +drivers/net/phy/qsemi.ko.gz 5.9 +drivers/net/phy/smsc.ko.gz 5.10 +drivers/net/dnet.ko.gz 5.11 drivers/net/sc92031.ko.gz 5.12 drivers/net/sis190.ko.gz 5.13 drivers/net/skge.ko.gz 5.14 @@ -78,9 +80,13 @@ 5.15 drivers/net/usb/rndis_host.ko.gz 5.16 drivers/net/usb/usbnet.ko.gz 5.17 drivers/net/usb/zaurus.ko.gz 5.18 +drivers/net/usb/cdc_eem.ko.gz 5.19 +drivers/net/usb/dm9601.ko.gz 5.20 drivers/net/via-velocity.ko.gz 5.21 drivers/net/wd.ko.gz 5.22 drivers/net/8390p.ko.gz 5.23 +drivers/net/b44.ko.gz 5.24 +drivers/net/r6040.ko.gz 5.25 drivers/ide/ide-cs.ko.gz 5.26 drivers/watchdog/softdog.ko.gz 5.27 drivers/parport/parport.ko.gz 5.28 @@ -97,7 +103,12 @@ 5.29 drivers/usb/serial/ch341.ko.gz 5.30 drivers/usb/serial/pl2303.ko.gz 5.31 drivers/usb/serial/usbserial.ko.gz 5.32 +drivers/usb/mon/usbmon.ko.gz 5.33 +drivers/ssb/ssb.ko.gz 5.34 +drivers/block/floppy.ko.gz 5.35 +drivers/input/mouse/sermouse.ko.gz 5.36 fs/binfmt_misc.ko.gz 5.37 +fs/fat/msdos.ko.gz 5.38 net/ipv4/netfilter/ipt_REJECT.ko.gz 5.39 net/netfilter/nfnetlink.ko.gz 5.40 net/netfilter/nfnetlink_log.ko.gz