# HG changeset patch # User Christopher Rogers # Date 1298079337 0 # Node ID 53261b54542ea3ab3213912de59ceb52dc3ad035 # Parent 43ec05a2b26bad287ccdcf50e5b9f5c6b37f6c8c Fixed linux not to put a tmp folder in WOK. Instead its WOK/PACKAGE/tmp now. This fixes a problem with update-repository dying out cause of WOK/tmp folder. diff -r 43ec05a2b26b -r 53261b54542e linux/receipt --- a/linux/receipt Sat Feb 19 01:00:28 2011 +0000 +++ b/linux/receipt Sat Feb 19 01:35:37 2011 +0000 @@ -115,14 +115,14 @@ # Get the base modules export src export _pkg - mkdir $WOK/tmp + mkdir $WOK/$PACKAGE/tmp $WOK/$PACKAGE/stuff/list_modules.sh \ - $(cat stuff/modules-$VERSION.list) > $WOK/tmp/modules.list + $(cat stuff/modules-$VERSION.list) > $WOK/$PACKAGE/tmp/modules.list while read module; do dir=$(dirname $module) [ -d $path/$dir ] || mkdir -p $path/$dir cp -a $_pkg/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir - done < $WOK/tmp/modules.list + done < $WOK/$PACKAGE/tmp/modules.list # Remove unresolved links rm -f $fs/lib/modules/$VERSION-slitaz/build rm -f $fs/lib/modules/$VERSION-slitaz/source diff -r 43ec05a2b26b -r 53261b54542e linux/stuff/check_modules.sh --- a/linux/stuff/check_modules.sh Sat Feb 19 01:00:28 2011 +0000 +++ b/linux/stuff/check_modules.sh Sat Feb 19 01:35:37 2011 +0000 @@ -12,43 +12,43 @@ src="$WOK/linux/linux-$VERSION" cd $src -mkdir -p $WOK/tmp -rm -f $WOK/tmp/* +mkdir -p $WOK/$PACKAGE/tmp +rm -f $WOK/$PACKAGE/tmp/* echo -e "\nChecking for modules selected in .config but not in linux-* pkgs" echo "======================================================================" # create a packaged modules list -cat ../stuff/modules-"$VERSION".list >> $WOK/tmp/pkgs-modules-"$VERSION".list +cat ../stuff/modules-"$VERSION".list >> $WOK/$PACKAGE/tmp/pkgs-modules-"$VERSION".list for i in $(cd $WOK; ls -d linux-*) do tazpath="taz/$i-$VERSION" for j in $(cat $WOK/$i/$tazpath/files.list | grep ".ko.gz") do - basename $j >> $WOK/tmp/pkgs-modules-"$VERSION".list + basename $j >> $WOK/$PACKAGE/tmp/pkgs-modules-"$VERSION".list done done # get the original list in .config for i in $(find $_pkg -iname "*.ko.gz") do - basename $i >> $WOK/tmp/originial-"$VERSION".list + basename $i >> $WOK/$PACKAGE/tmp/originial-"$VERSION".list done # compare original .config and pkged modules -for i in $(cat $WOK/tmp/originial-$VERSION.list) +for i in $(cat $WOK/$PACKAGE/tmp/originial-$VERSION.list) do - if ! grep -qs "$i" $WOK/tmp/pkgs-modules-"$VERSION".list ; then + if ! grep -qs "$i" $WOK/$PACKAGE/tmp/pkgs-modules-"$VERSION".list ; then modpath=`find $_pkg -iname "$i"` echo "Orphan module: $i" - echo "$i : $modpath" >> $WOK/tmp/unpackaged-modules-"$VERSION".list + echo "$i : $modpath" >> $WOK/$PACKAGE/tmp/unpackaged-modules-"$VERSION".list fi done -if [ -f $WOK/tmp/unpackaged-modules-"$VERSION".list ]; then +if [ -f $WOK/$PACKAGE/tmp/unpackaged-modules-"$VERSION".list ]; then echo "======================================================================" echo -e "Check linux/tmp/unpackaged-modules-$VERSION.list for mod path\n" else echo -e "\nAll modules are packaged\n" echo "======================================================================" echo "" - rm -rf $WOK/tmp + rm -rf $WOK/$PACKAGE/tmp fi