# HG changeset patch # User Christopher Rogers # Date 1292504394 0 # Node ID 645cf2faf48201864e7f940a2094368ef5e5c4ef # Parent 9c2f7943a3589eb064aec342c014081aab8ed9a9 Moved Module.sysvers to Module.sysvers-modules. This is cause i think making linux-without-modules bzImage is was change that file. Removed /usr/src/linux in pre_remove function in linux-module-headers. Added /usr/src/linux soft link to post_install in linux-module-headers. diff -r 9c2f7943a358 -r 645cf2faf482 linux-ipv6/receipt --- a/linux-ipv6/receipt Thu Dec 16 09:03:59 2010 +0000 +++ b/linux-ipv6/receipt Thu Dec 16 12:59:54 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 9c2f7943a358 -r 645cf2faf482 linux-module-headers/receipt --- a/linux-module-headers/receipt Thu Dec 16 09:03:59 2010 +0000 +++ b/linux-module-headers/receipt Thu Dec 16 12:59:54 2010 +0000 @@ -25,9 +25,6 @@ $fs/$path/.config mkdir -p $fs/$path/include - # Added soft link to make it easier to point to kernel folder - ln -s linux-$KVERSION $fs/usr/src/linux - for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video; do cp -a $src/include/$i $fs/$path/include/ done @@ -37,7 +34,7 @@ cp -a $src/arch/x86/include $fs/$path/arch/x86/ # copy files necessary for later builds, like nvidia and vmware - cp -a $src/Module.symvers $fs/$path + cp -a $src/Module.symvers-modules $fs/$path/Module.symvers cp -a $src/scripts $fs/$path # fix permissions on scripts dir chmod og-w -R $fs/$path/scripts @@ -132,3 +129,13 @@ } +pre_remove() { + if [ -e $1/usr/src/linux ]; then + rm -rf $1/usr/src/linux + fi +} + +post_install() { + # Added soft link to make it easier to point to kernel folder + ln -sf /usr/src/linux-$KVERSION-slitaz $1/usr/src/linux +} diff -r 9c2f7943a358 -r 645cf2faf482 linux/receipt --- a/linux/receipt Thu Dec 16 09:03:59 2010 +0000 +++ b/linux/receipt Thu Dec 16 12:59:54 2010 +0000 @@ -87,6 +87,7 @@ # Compress all modules. $WOK/$PACKAGE/stuff/gztazmod.sh $PWD/_pkg/lib/modules/$VERSION-slitaz mv System.map System.map-modules + mv Module.symvers Module.symvers-modules sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config # We can't keep every driver in staging sed -i -e 's/^CONFIG_RTL8192/#&/' \