# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1289618863 0
# Node ID 7b2d17996a1553a2b692d19f3fcbac2a2d75d5e1
# Parent  df2d505e172710fcdfba6541dfcfd196539cce8b
Fixed wanted linux receipts to remove modules that are in modules-VERSION.list if they exist in other packages.

diff -r df2d505e1727 -r 7b2d17996a15 linux-acpi/receipt
--- a/linux-acpi/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-acpi/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -28,6 +28,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-agp/receipt
--- a/linux-agp/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-agp/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -22,6 +22,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-appletalk/receipt
--- a/linux-appletalk/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-appletalk/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -9,7 +9,6 @@
 WANTED="linux"
 WEB_SITE="http://www.kernel.org/"
 
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
@@ -26,6 +25,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-bluetooth/receipt
--- a/linux-bluetooth/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-bluetooth/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -22,6 +22,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-bridge/receipt
--- a/linux-bridge/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-bridge/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -22,6 +22,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-btrfs/receipt
--- a/linux-btrfs/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-btrfs/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -24,6 +24,12 @@
         cp -a $_pkg/$path/$module $fs/$dir
     done
     touch $fs/etc/filesystems
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-crypto/receipt
--- a/linux-crypto/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-crypto/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -23,6 +23,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-dialup/receipt
--- a/linux-dialup/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-dialup/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -24,6 +24,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-drm/receipt
--- a/linux-drm/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-drm/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -22,6 +22,12 @@
 		[ -d $fs/$dir ] || mkdir -p $fs/$dir
 		cp -a $_pkg/$path/$module $fs/$dir
 	done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-firmware/receipt
--- a/linux-firmware/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-firmware/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -14,5 +14,10 @@
 {
 	mkdir -p $fs/lib
 	cp -a $_pkg/lib/firmware $fs/lib
+
+	# remove linux-sound firmware files
+	for i in ess korg sun yamaha; do
+		rm -rf $fs/lib/firmware/$i
+	done
 }
 
diff -r df2d505e1727 -r 7b2d17996a15 linux-input-misc/receipt
--- a/linux-input-misc/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-input-misc/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -22,6 +22,11 @@
         cp -a $_pkg/$path/$module $fs/$dir
     done
 
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-input-touchscreen/receipt
--- a/linux-input-touchscreen/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-input-touchscreen/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -23,6 +23,11 @@
         cp -a $_pkg/$path/$module $fs/$dir
     done
 
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-isdn/receipt
--- a/linux-isdn/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-isdn/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -22,6 +22,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-joystick/receipt
--- a/linux-joystick/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-joystick/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -24,6 +24,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-md/receipt
--- a/linux-md/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-md/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -26,6 +26,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-memstick/receipt
--- a/linux-memstick/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-memstick/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -9,7 +9,6 @@
 WANTED="linux"
 WEB_SITE="http://www.kernel.org/"
 
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
@@ -25,6 +24,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-mmc/receipt
--- a/linux-mmc/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-mmc/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -23,6 +23,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-udf/receipt
--- a/linux-udf/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-udf/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -24,6 +24,12 @@
         cp -a $_pkg/$path/$module $fs/$dir
     done
     touch $fs/etc/filesystems
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-wimax/receipt
--- a/linux-wimax/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-wimax/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -8,7 +8,6 @@
 WANTED="linux"
 WEB_SITE="http://www.kernel.org/"
 
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
@@ -24,6 +23,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.
diff -r df2d505e1727 -r 7b2d17996a15 linux-wireless/receipt
--- a/linux-wireless/receipt	Sat Nov 13 01:11:48 2010 +0000
+++ b/linux-wireless/receipt	Sat Nov 13 03:27:43 2010 +0000
@@ -29,6 +29,12 @@
     	[ -d $fs/$dir ] || mkdir -p $fs/$dir
         cp -a $_pkg/$path/$module $fs/$dir
     done
+
+    for i in $(cat $WOK/$WANTED/stuff/modules-$VERSION.list); do
+        if [ $fs/lib/modules/$VERSION-slitaz/kernel/$i ]; then
+	    rm -f $fs/lib/modules/$VERSION-slitaz/kernel/$i
+	fi
+    done
 }
 
 # Post install/remove commands for Tazpkg.