# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1207730976 0
# Node ID cd99ec38193815b9dcac4700b5ee66d879b2c7b0
# Parent  51851b822bbb358c0fd953aa647dc14fcded6f97
Linux: split to linux, linux-acpi, linux-ieee1394, linux-sound.
Add: linux-reiserfs, linux-wireless
Fix modules post_install

diff -r 51851b822bbb -r cd99ec381938 kqemu/receipt
--- a/kqemu/receipt	Wed Apr 09 00:36:02 2008 +0200
+++ b/kqemu/receipt	Wed Apr 09 08:49:36 2008 +0000
@@ -39,7 +39,7 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	depmod -a
+	depmod -a -b "$(dirname $1/lib/modules/*/modules.dep)"
 }
 
 post_remove()
diff -r 51851b822bbb -r cd99ec381938 linux-acpi/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-acpi/receipt	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,34 @@
+# SliTaz package receipt.
+
+PACKAGE="linux-acpi"
+VERSION="2.6.24.2"
+CATEGORY="base-system"
+SHORT_DESC="The Linux kernel acpi modules."
+MAINTAINER="pascal.bellard@slitaz.org"
+WANTED="linux"
+WEB_SITE="http://www.kernel.org/"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+    local path
+    path=lib/modules/$VERSION-slitaz/kernel
+    mkdir -p $fs/$path
+    while read module; do
+    	dir=$path/$(dirname $module)
+    	[ -d $fs/$dir ] || mkdir -p $fs/$dir
+        cp -a $_pkg/$path/$module $fs/$dir
+    done < stuff/modules-$VERSION.list
+}
+
+# Post install/remove commands for Tazpkg.
+post_install()
+{
+	depmod -a -b "$1/lib/modules/$VERSION-slitaz"
+}
+
+post_remove()
+{
+	depmod -a
+}
+
diff -r 51851b822bbb -r cd99ec381938 linux-acpi/stuff/modules-2.6.24.2.list
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-acpi/stuff/modules-2.6.24.2.list	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,2 @@
+drivers/acpi/ac.ko.gz
+drivers/acpi/battery.ko.gz
diff -r 51851b822bbb -r cd99ec381938 linux-ieee1394/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-ieee1394/receipt	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,34 @@
+# SliTaz package receipt.
+
+PACKAGE="linux-ieee1394"
+VERSION="2.6.24.2"
+CATEGORY="base-system"
+SHORT_DESC="The Linux kernel ieee1394 modules."
+MAINTAINER="pascal.bellard@slitaz.org"
+WANTED="linux"
+WEB_SITE="http://www.kernel.org/"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+    local path
+    path=lib/modules/$VERSION-slitaz/kernel
+    mkdir -p $fs/$path
+    while read module; do
+    	dir=$path/$(dirname $module)
+    	[ -d $fs/$dir ] || mkdir -p $fs/$dir
+        cp -a $_pkg/$path/$module $fs/$dir
+    done < stuff/modules-$VERSION.list
+}
+
+# Post install/remove commands for Tazpkg.
+post_install()
+{
+	depmod -a -b "$1/lib/modules/$VERSION-slitaz"
+}
+
+post_remove()
+{
+	depmod -a
+}
+
diff -r 51851b822bbb -r cd99ec381938 linux-ieee1394/stuff/modules-2.6.24.2.list
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-ieee1394/stuff/modules-2.6.24.2.list	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,3 @@
+drivers/ieee1394/raw1394.ko.gz
+drivers/ieee1394/ieee1394.ko.gz
+drivers/ieee1394/ohci1394.ko.gz
diff -r 51851b822bbb -r cd99ec381938 linux-reiserfs/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-reiserfs/receipt	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,34 @@
+# SliTaz package receipt.
+
+PACKAGE="linux-reiserfs"
+VERSION="2.6.24.2"
+CATEGORY="base-system"
+SHORT_DESC="The Linux kernel reiserfs module."
+MAINTAINER="pascal.bellard@slitaz.org"
+WANTED="linux"
+WEB_SITE="http://www.kernel.org/"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+    local path
+    path=lib/modules/$VERSION-slitaz/kernel
+    mkdir -p $fs/$path
+    while read module; do
+    	dir=$path/$(dirname $module)
+    	[ -d $fs/$dir ] || mkdir -p $fs/$dir
+        cp -a $_pkg/$path/$module $fs/$dir
+    done < stuff/modules-$VERSION.list
+}
+
+# Post install/remove commands for Tazpkg.
+post_install()
+{
+	depmod -a -b "$1/lib/modules/$VERSION-slitaz"
+}
+
+post_remove()
+{
+	depmod -a
+}
+
diff -r 51851b822bbb -r cd99ec381938 linux-reiserfs/stuff/modules-2.6.24.2.list
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-reiserfs/stuff/modules-2.6.24.2.list	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,1 @@
+fs/reiserfs/reiserfs.ko.gz
diff -r 51851b822bbb -r cd99ec381938 linux-sound/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-sound/receipt	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,31 @@
+# SliTaz package receipt.
+
+PACKAGE="linux-sound"
+VERSION="2.6.24.2"
+CATEGORY="base-system"
+SHORT_DESC="The Linux kernel sound modules."
+MAINTAINER="pascal.bellard@slitaz.org"
+WANTED="linux"
+WEB_SITE="http://www.kernel.org/"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+    local path
+    path=lib/modules/$VERSION-slitaz/kernel
+    mkdir -p $fs/$path
+    ( cd $_pkg/$path ; tar cf - sound ) | ( cd $fs/$path ; tar xf - )
+
+}
+
+# Post install/remove commands for Tazpkg.
+post_install()
+{
+	depmod -a -b "$1/lib/modules/$VERSION-slitaz"
+}
+
+post_remove()
+{
+	depmod -a
+}
+
diff -r 51851b822bbb -r cd99ec381938 linux-wireless/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-wireless/receipt	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,34 @@
+# SliTaz package receipt.
+
+PACKAGE="linux-wireless"
+VERSION="2.6.24.2"
+CATEGORY="base-system"
+SHORT_DESC="The Linux kernel wireless modules."
+MAINTAINER="pascal.bellard@slitaz.org"
+WANTED="linux"
+WEB_SITE="http://www.kernel.org/"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+    local path
+    path=lib/modules/$VERSION-slitaz/kernel
+    mkdir -p $fs/$path
+    while read module; do
+    	dir=$path/$(dirname $module)
+    	[ -d $fs/$dir ] || mkdir -p $fs/$dir
+        cp -a $_pkg/$path/$module $fs/$dir
+    done < stuff/modules-$VERSION.list
+}
+
+# Post install/remove commands for Tazpkg.
+post_install()
+{
+	depmod -a -b "$1/lib/modules/$VERSION-slitaz"
+}
+
+post_remove()
+{
+	depmod -a
+}
+
diff -r 51851b822bbb -r cd99ec381938 linux-wireless/stuff/modules-2.6.24.2.list
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux-wireless/stuff/modules-2.6.24.2.list	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,25 @@
+crypto/arc4.ko.gz
+crypto/ecb.ko.gz
+crypto/aes_generic.ko.gz
+crypto/michael_mic.ko.gz
+drivers/misc/eeprom_93cx6.ko.gz
+drivers/net/wireless/b43/b43.ko.gz
+drivers/net/wireless/b43legacy/b43legacy.ko.gz
+drivers/net/wireless/bcm43xx/bcm43xx.ko.gz
+drivers/net/wireless/rt2x00/rt2500usb.ko.gz
+drivers/net/wireless/rt2x00/rt2x00lib.ko.gz
+drivers/net/wireless/rt2x00/rt2x00pci.ko.gz
+drivers/net/wireless/rt2x00/rt2x00usb.ko.gz
+drivers/net/wireless/rt2x00/rt2400pci.ko.gz
+drivers/net/wireless/rt2x00/rt2500pci.ko.gz
+drivers/net/wireless/zd1211rw/zd1211rw.ko.gz
+drivers/net/wireless/ipw2100.ko.gz
+drivers/net/wireless/ipw2200.ko.gz
+net/ieee80211/ieee80211_crypt_ccmp.ko.gz
+net/ieee80211/ieee80211_crypt_tkip.ko.gz
+net/ieee80211/ieee80211_crypt_wep.ko.gz
+net/ieee80211/softmac/ieee80211softmac.ko.gz
+net/ieee80211/ieee80211.ko.gz
+net/ieee80211/ieee80211_crypt.ko.gz
+net/mac80211/mac80211.ko.gz
+net/wireless/cfg80211.ko.gz
diff -r 51851b822bbb -r cd99ec381938 linux/receipt
--- a/linux/receipt	Wed Apr 09 00:36:02 2008 +0200
+++ b/linux/receipt	Wed Apr 09 08:49:36 2008 +0000
@@ -14,16 +14,28 @@
 {
 	cd $src
 	# lzma and boot patch from pascal
-	patch -p1 < ../stuff/boot-kernel.u
-	patch -p1 < ../stuff/$PACKAGE-lzma-$VERSION.u
-	patch -p1 < ../stuff/decompress_unlzma.u
+	while read patch_file; do
+		echo "Apply $patch_file"
+		patch -p1 < ../stuff/$patch_file
+	done <<EOT
+boot-kernel.u
+$PACKAGE-lzma-$VERSION.u
+decompress_unlzma.u
+EOT
 	make mrproper	
 	cp ../stuff/$PACKAGE-$VERSION-slitaz.config .config
-	patch -p1 < ../stuff/config-acpi-$VERSION.u
-	patch -p1 < ../stuff/linux-utf8-$VERSION.u
-	patch -p1 < ../stuff/config-ieee1394-$VERSION.u
-	patch -p1 < ../stuff/linux-lzma-export.u
-	patch -p1 < ../stuff/config-tun-$VERSION.u
+	while read patch_file; do
+		echo "Apply $patch_file"
+		patch -p1 < ../stuff/$patch_file
+	done <<EOT
+config-acpi-$VERSION.u
+linux-utf8-$VERSION.u
+config-ieee1394-$VERSION.u
+linux-lzma-export.u
+config-tun-$VERSION.u
+config-reiserfs-$VERSION.u
+config-wireless-$VERSION.u
+EOT
 	make oldconfig
 	make bzImage
 	make modules
@@ -34,13 +46,21 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
+    local path
     mkdir $fs/boot
     cp -a $src/arch/x86/boot/bzImage $fs/boot/vmlinuz-$VERSION-slitaz
-    cp -a $_pkg/* $fs
     # Compress all modules.
     # Package module-init-tools is compiled with zlib support.
     #
-    ./stuff/gztazmod.sh $fs/lib/modules/$VERSION-slitaz
+    ./stuff/gztazmod.sh $_pkg/lib/modules/$VERSION-slitaz
+    path=$fs/lib/modules/$VERSION-slitaz/kernel
+    mkdir -p $path
+    cp -a $_pkg/lib/modules/$VERSION-slitaz/mo* $fs/lib/modules/$VERSION-slitaz
+    while read module; do
+    	dir=$(dirname $module)
+    	[ -d $fs/$dir ] || mkdir -p $fs/$dir
+        cp -a $_pkg/$path/$module $fs/$path/$dir
+    done < stuff/modules-$VERSION.list
     # Remove unresolved links
     rm -f $fs/lib/modules/$VERSION-slitaz/build
     rm -f $fs/lib/modules/$VERSION-slitaz/source
@@ -50,13 +70,14 @@
 # GRUB stuf.
 post_install()
 {
-  echo "Processing post-install commands..."
-  echo "----"
-  echo "If you have GRUB installed, you can add tree lines to boot SliTaz."
-  echo "Example /boot/grub/menu.lst"
-  echo -e "
+    echo "Processing post-install commands..."
+    depmod -a -b "$1/lib/modules/$VERSION-slitaz"
+    echo "----"
+    echo "If you have GRUB installed, you can add tree lines to boot SliTaz."
+    echo "Example /boot/grub/menu.lst"
+    echo -e "
 title  SliTaz GNU/Linux (Kernel $VERSION-slitaz)
        root(hd0,0)
        kernel /boot/vmlinuz-$VERSION-slitaz root=/dev/hda1 vga=771\n"
-  echo "----"
+    echo "----"
 }
diff -r 51851b822bbb -r cd99ec381938 linux/stuff/config-reiserfs-2.6.24.2.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux/stuff/config-reiserfs-2.6.24.2.u	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,14 @@
+--- linux-2.6.24.2.ori/.config	Sat Mar 29 03:02:43 2008
++++ linux-2.6.24.2/.config	Sat Mar 29 03:04:29 2008
+@@ -1597,7 +1597,10 @@
+ # CONFIG_EXT3_FS_XATTR is not set
+ # CONFIG_EXT4DEV_FS is not set
+ CONFIG_JBD=y
+-# CONFIG_REISERFS_FS is not set
++CONFIG_REISERFS_FS=m
++# CONFIG_REISERFS_CHECK is not set
++# CONFIG_REISERFS_PROC_INFO is not set
++# CONFIG_REISERFS_FS_XATTR is not set
+ # CONFIG_JFS_FS is not set
+ # CONFIG_FS_POSIX_ACL is not set
+ # CONFIG_XFS_FS is not set
diff -r 51851b822bbb -r cd99ec381938 linux/stuff/config-wireless-2.6.24.2.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/linux/stuff/config-wireless-2.6.24.2.u	Wed Apr 09 08:49:36 2008 +0000
@@ -0,0 +1,144 @@
+--- linux-2.6.24.2/.config
++++ linux-2.6.24.2/.config
+@@ -452,6 +452,7 @@
+ # CONFIG_ECONET is not set
+ # CONFIG_WAN_ROUTER is not set
+ # CONFIG_NET_SCHED is not set
++CONFIG_NET_SCH_FIFO=y
+ 
+ #
+ # Network testing
+@@ -465,10 +466,19 @@
+ #
+ # Wireless
+ #
+-# CONFIG_CFG80211 is not set
+-# CONFIG_WIRELESS_EXT is not set
+-# CONFIG_MAC80211 is not set
+-# CONFIG_IEEE80211 is not set
++CONFIG_CFG80211=m
++CONFIG_NL80211=y
++CONFIG_WIRELESS_EXT=y
++CONFIG_MAC80211=m
++CONFIG_MAC80211_RCSIMPLE=y
++# CONFIG_MAC80211_DEBUG is not set
++CONFIG_IEEE80211=m
++# CONFIG_IEEE80211_DEBUG is not set
++CONFIG_IEEE80211_CRYPT_WEP=m
++CONFIG_IEEE80211_CRYPT_CCMP=m
++CONFIG_IEEE80211_CRYPT_TKIP=m
++CONFIG_IEEE80211_SOFTMAC=m
++# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+ # CONFIG_RFKILL is not set
+ # CONFIG_NET_9P is not set
+ 
+@@ -521,7 +531,7 @@
+ CONFIG_MISC_DEVICES=y
+ # CONFIG_IBM_ASM is not set
+ # CONFIG_PHANTOM is not set
+-# CONFIG_EEPROM_93CX6 is not set
++CONFIG_EEPROM_93CX6=m
+ # CONFIG_SGI_IOC4 is not set
+ # CONFIG_TIFM_CORE is not set
+ # CONFIG_SONY_LAPTOP is not set
+@@ -953,7 +963,69 @@
+ # Wireless LAN
+ #
+ # CONFIG_WLAN_PRE80211 is not set
+-# CONFIG_WLAN_80211 is not set
++CONFIG_WLAN_80211=y
++# CONFIG_PCMCIA_RAYCS is not set
++CONFIG_IPW2100=m
++CONFIG_IPW2100_MONITOR=y
++# CONFIG_IPW2100_DEBUG is not set
++CONFIG_IPW2200=m
++CONFIG_IPW2200_MONITOR=y
++CONFIG_IPW2200_RADIOTAP=y
++CONFIG_IPW2200_PROMISCUOUS=y
++CONFIG_IPW2200_QOS=y
++# CONFIG_IPW2200_DEBUG is not set
++# CONFIG_LIBERTAS is not set
++# CONFIG_AIRO is not set
++# CONFIG_HERMES is not set
++# CONFIG_ATMEL is not set
++# CONFIG_AIRO_CS is not set
++# CONFIG_PCMCIA_WL3501 is not set
++# CONFIG_PRISM54 is not set
++# CONFIG_USB_ZD1201 is not set
++# CONFIG_RTL8187 is not set
++# CONFIG_ADM8211 is not set
++# CONFIG_P54_COMMON is not set
++# CONFIG_IWLWIFI is not set
++# CONFIG_HOSTAP is not set
++CONFIG_BCM43XX=m
++# CONFIG_BCM43XX_DEBUG is not set
++CONFIG_BCM43XX_DMA=y
++CONFIG_BCM43XX_PIO=y
++CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
++# CONFIG_BCM43XX_DMA_MODE is not set
++# CONFIG_BCM43XX_PIO_MODE is not set
++CONFIG_B43=m
++CONFIG_B43_PCI_AUTOSELECT=y
++CONFIG_B43_PCICORE_AUTOSELECT=y
++# CONFIG_B43_DEBUG is not set
++CONFIG_B43_DMA=y
++CONFIG_B43_PIO=y
++CONFIG_B43_DMA_AND_PIO_MODE=y
++# CONFIG_B43_DMA_MODE is not set
++# CONFIG_B43_PIO_MODE is not set
++CONFIG_B43LEGACY=m
++CONFIG_B43LEGACY_PCI_AUTOSELECT=y
++CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
++# CONFIG_B43LEGACY_DEBUG is not set
++CONFIG_B43LEGACY_DMA=y
++CONFIG_B43LEGACY_PIO=y
++CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
++# CONFIG_B43LEGACY_DMA_MODE is not set
++# CONFIG_B43LEGACY_PIO_MODE is not set
++CONFIG_ZD1211RW=m
++# CONFIG_ZD1211RW_DEBUG is not set
++CONFIG_RT2X00=m
++CONFIG_RT2X00_LIB=m
++CONFIG_RT2X00_LIB_PCI=m
++CONFIG_RT2X00_LIB_USB=m
++CONFIG_RT2400PCI=m
++# CONFIG_RT2400PCI_RFKILL is not set
++CONFIG_RT2500PCI=m
++# CONFIG_RT2500PCI_RFKILL is not set
++# CONFIG_RT61PCI is not set
++CONFIG_RT2500USB=m
++# CONFIG_RT73USB is not set
++# CONFIG_RT2X00_DEBUG is not set
+ 
+ #
+ # USB Network Adapters
+@@ -1791,7 +1863,7 @@
+ # CONFIG_CRYPTO_WP512 is not set
+ # CONFIG_CRYPTO_TGR192 is not set
+ # CONFIG_CRYPTO_GF128MUL is not set
+-# CONFIG_CRYPTO_ECB is not set
++CONFIG_CRYPTO_ECB=m
+ CONFIG_CRYPTO_CBC=y
+ CONFIG_CRYPTO_PCBC=m
+ # CONFIG_CRYPTO_LRW is not set
+@@ -1803,17 +1875,17 @@
+ # CONFIG_CRYPTO_TWOFISH is not set
+ # CONFIG_CRYPTO_TWOFISH_586 is not set
+ # CONFIG_CRYPTO_SERPENT is not set
+-# CONFIG_CRYPTO_AES is not set
++CONFIG_CRYPTO_AES=m
+ # CONFIG_CRYPTO_AES_586 is not set
+ # CONFIG_CRYPTO_CAST5 is not set
+ # CONFIG_CRYPTO_CAST6 is not set
+ # CONFIG_CRYPTO_TEA is not set
+-# CONFIG_CRYPTO_ARC4 is not set
++CONFIG_CRYPTO_ARC4=m
+ # CONFIG_CRYPTO_KHAZAD is not set
+ # CONFIG_CRYPTO_ANUBIS is not set
+ # CONFIG_CRYPTO_SEED is not set
+ CONFIG_CRYPTO_DEFLATE=y
+-# CONFIG_CRYPTO_MICHAEL_MIC is not set
++CONFIG_CRYPTO_MICHAEL_MIC=m
+ # CONFIG_CRYPTO_CRC32C is not set
+ # CONFIG_CRYPTO_CAMELLIA is not set
+ # CONFIG_CRYPTO_TEST is not set
diff -r 51851b822bbb -r cd99ec381938 shfs/receipt
--- a/shfs/receipt	Wed Apr 09 00:36:02 2008 +0200
+++ b/shfs/receipt	Wed Apr 09 08:49:36 2008 +0000
@@ -46,7 +46,7 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	depmod -a
+	depmod -a -b "$(dirname $1/lib/modules/*/modules.dep)"
 }
 
 post_remove()
diff -r 51851b822bbb -r cd99ec381938 squashfs/receipt
--- a/squashfs/receipt	Wed Apr 09 00:36:02 2008 +0200
+++ b/squashfs/receipt	Wed Apr 09 08:49:36 2008 +0000
@@ -82,7 +82,7 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	depmod -a
+	depmod -a -b "$(dirname $1/lib/modules/*/modules.dep)"
 }
 
 post_remove()