Bugfix calculate-sources: hung on rm operation after kernel compile

eclass/calculate-kernel.eclass

@@ -81,6 +81,7 @@ calculate-kernel_src_compile() {
 		--no-menuconfig \
 		--clean \
 		--mrproper \
+		--no-cleartmp \
 		--disklabel \
 		--slowusb \
 		--splash=tty1 \

sys-kernel/calckernel/Manifest

@@ -1,6 +1,6 @@
 AUX calckernel-3.4.10.903-r15.patch 9850 RMD160 59a18be3318a798910a22f1ee03062167074578c SHA1 918783f6615a8cbee2475bf3989b93db13fe4021 SHA256 a5c036b0476f171daef09a61970d6727bb05bf30f6b85df42c60c3ae0eb68eb0
 AUX calckernel-3.4.10.903-r16.patch 9250 RMD160 849a11ab3e0e3d21cf807d9d28237f881196613b SHA1 26ee4e8aded9a5525cb35c3f22f95f2539a20b58 SHA256 60301770e69f18171b0c17aaf6eaafb3f3205b8ac1cc45d5dd9cecb6a968743e
-AUX calckernel-3.4.10.903-r18.patch 9675 RMD160 01fe22b4d3a48ffca1b77341042be24cef909ded SHA1 6568f6621430e10c0b4eba6df118712bcb7cb239 SHA256 01825f8a1c39d25c3c0e108079fa077eaa5703cb2ef03281cbdd5096d006b07e
+AUX calckernel-3.4.10.903-r19.patch 10671 RMD160 f61029ad1e9600bcdf259e0146de524779e81c8c SHA1 274a7d6bd668c3f72804046a9c849f3f34f1019e SHA256 a62f983a05989d3b732eec2f55d7e6f81a81287694d32280b85bd1458b8f5471
 AUX calckernel-3.4.10.903-r2.patch 3217 RMD160 2af53fea69a8c4bb7295326c8dcca874186163eb SHA1 6988125ac5ec2788aeb24b39b9648edec2fcc09d SHA256 787528254f20544155f00fd36626d11eee681350a4217edfac22e6e21d68eee1
 AUX calckernel-3.4.10.903-r5.patch 4900 RMD160 c06016481281a2a056f31cd1c2796ed783627997 SHA1 96bc1c4466598c33117b2a018a66631f9e5132a8 SHA256 c5ad1a6f4bc16ed3971bed3179a629445bb88cd2267facb261502454b3ab2d94
 AUX calckernel-3.4.10.903-r6.patch 4906 RMD160 166a07f41f72363750f94249c0d14a0e64ede600 SHA1 858b563247c9485453be53bc60296397df675521 SHA256 4fd297e02b19b1accd18bdf19f06eb4fdfc52e2f75c67ad0bb1734f7e3b57f42
@@ -24,7 +24,7 @@ DIST unionfs-fuse-0.22.tar.bz2 27355 RMD160 f29cbf41af0ba8f2181ac565a6663871676f
 EBUILD calckernel-3.4.10.903-r1.ebuild 4721 RMD160 0ad6351496f60f77f5cdb47f91e8887ad2b67111 SHA1 a7f6d9be941333647a4dbc578316792fdd942fc5 SHA256 2f5327f3b368a25cda0dcce60f287c38cd6a2a74e03b6e3280fdd846c1aaeaf8
 EBUILD calckernel-3.4.10.903-r15.ebuild 4797 RMD160 3f7804e47bbb2c36bdfad781250eba6a73329fb7 SHA1 a61c04ba488c87c144ec57845881300e664f8e37 SHA256 04268c64db9eae32db2c37d679ba0b2d09cb4fb146e71881ea685e20193502cd
 EBUILD calckernel-3.4.10.903-r16.ebuild 4797 RMD160 3f7804e47bbb2c36bdfad781250eba6a73329fb7 SHA1 a61c04ba488c87c144ec57845881300e664f8e37 SHA256 04268c64db9eae32db2c37d679ba0b2d09cb4fb146e71881ea685e20193502cd
-EBUILD calckernel-3.4.10.903-r18.ebuild 4797 RMD160 3f7804e47bbb2c36bdfad781250eba6a73329fb7 SHA1 a61c04ba488c87c144ec57845881300e664f8e37 SHA256 04268c64db9eae32db2c37d679ba0b2d09cb4fb146e71881ea685e20193502cd
+EBUILD calckernel-3.4.10.903-r19.ebuild 4797 RMD160 3f7804e47bbb2c36bdfad781250eba6a73329fb7 SHA1 a61c04ba488c87c144ec57845881300e664f8e37 SHA256 04268c64db9eae32db2c37d679ba0b2d09cb4fb146e71881ea685e20193502cd
 EBUILD calckernel-3.4.10.903-r2.ebuild 4722 RMD160 86a8fd0be899be5fe4db799269f0eae5063a30ac SHA1 2d52f4ff1805734cb0ffe572786015a9c0fe0311 SHA256 7ebc44592700cbfc4759508ddc147fe9cafe7c54116b731bfa42dfc7baa19206
 EBUILD calckernel-3.4.10.903-r5.ebuild 4722 RMD160 86a8fd0be899be5fe4db799269f0eae5063a30ac SHA1 2d52f4ff1805734cb0ffe572786015a9c0fe0311 SHA256 7ebc44592700cbfc4759508ddc147fe9cafe7c54116b731bfa42dfc7baa19206
 EBUILD calckernel-3.4.10.903-r6.ebuild 4722 RMD160 86a8fd0be899be5fe4db799269f0eae5063a30ac SHA1 2d52f4ff1805734cb0ffe572786015a9c0fe0311 SHA256 7ebc44592700cbfc4759508ddc147fe9cafe7c54116b731bfa42dfc7baa19206

sys-kernel/calckernel/files/calckernel-3.4.10.903-r19.patch

@@ -288,16 +288,47 @@ index d506f83..538b29b 100755
  			fi
  		else
  			bad_msg "Could not mount specified ROOT, try again"
+diff --git a/gen_cmdline.sh b/gen_cmdline.sh
+index a1ca537..66b2462 100755
+--- a/gen_cmdline.sh
++++ b/gen_cmdline.sh
+@@ -19,6 +19,7 @@ longusage() {
+   echo "	--logfile=<outfile>	Output file for debug info"
+   echo "	--color			Output debug in color"
+   echo "	--no-color		Do not output debug in color"
++  echo "	--no-cleartmp		Do not clear temp directory"
+   echo "  Kernel Configuration settings"
+   echo "	--menuconfig		Run menuconfig after oldconfig"
+   echo "	--no-menuconfig		Do not run menuconfig after oldconfig"
+@@ -426,6 +427,10 @@ parse_cmdline() {
+ 			print_info 2 "USECOLOR: ${USECOLOR}"
+ 			setColorVars
+ 			;;
++		--no-cleartmp)
++			NOCLEARTMP=1
++			print_info 2 "NOCLEARTMP: ${NOCLEARTMP}"
++			;;
+ 		--logfile=*)
+ 			CMD_LOGFILE=`parse_opt "$*"`
+ 			LOGFILE=`parse_opt "$*"`
 diff --git a/genkernel b/genkernel
-index f74846e..518f206 100755
+index f74846e..502aa1a 100755
 --- a/genkernel
 +++ b/genkernel
-@@ -55,7 +55,7 @@ trap_cleanup(){
+@@ -8,6 +8,7 @@ GK_V='3.4.10.902'
+ TMPDIR='/var/tmp/genkernel'
+ 
+ TODEBUGCACHE=1 # Until an error occurs or LOGFILE is fully qualified.
++NOCLEARTMP=0
+ 
+ small_die() {
+   echo $1
+@@ -55,7 +56,7 @@ trap_cleanup(){
  
  cleanup(){
      if [ -n "$TEMP" -a -d "$TEMP" ]; then
 -	rm -rf "$TEMP"
-+	rm -rf "$TEMP" &>/dev/null
++	[[ ${NOCLEARTMP} -ne 0 ]] && rm -rf "$TEMP" &>/dev/null
      fi
  
      if isTrue ${POSTCLEAR}

sys-kernel/calculate-sources/Manifest

@@ -1,6 +1,6 @@
 DIST calculate-sources-2.6.32.tar.bz2 133992 RMD160 6c8ad119807c591ad926435dad7986098f26e3ef SHA1 2b398bf6e9a6bceca26e3df42c471c9321c0a6f2 SHA256 b30e70642569bae7dff4c9b2046066774c6a8e2a2c1252b353b908824cf64bc4
 DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
 DIST patch-2.6.32.4.bz2 122823 RMD160 5ef2729a8c63d5ed725441295a85e945a43e4ffa SHA1 7d6ab17bf026499906375ed4fa43fb3c0051c977 SHA256 8a8a697fa755929506681ce988bbca5288953d9f2775e7a1fb87dc2bb9300af4
-EBUILD calculate-sources-2.6.32.4-r1.ebuild 655 RMD160 15d9f426588b3b808772079fcb70b22023325225 SHA1 81b203113a963b9b28cc01bcf003c1938165f4bf SHA256 3ec870dcb914c6fd81d586b7dde74e36424a3eb7f90f017836dbfe31c92911d2
+EBUILD calculate-sources-2.6.32.4-r2.ebuild 655 RMD160 53bd6a948aee9200a9aee1036dedb706c98a7e3c SHA1 b5393bc8e7efb47a7762f9b33e8bcb5745c05dac SHA256 1ca47f7c918d30fe5b91c2796c8328f4f6c42b416d73c95171814a06de0ebbb0
 MISC ChangeLog 222 RMD160 09c8c97e1cd55540efc157d0a9eb5932f535c553 SHA1 20867411aefaf53108597d80e907371d80cdb26d SHA256 ec5e7be9e57fda7d1335335e2ae9ddf4ae247e5d59759b391f191f80424b00f0
 MISC metadata.xml 279 RMD160 860d096ca59a4700ae40355018e42c3f74d0f81f SHA1 c89c24563ae4b5bcebf5c49a9ad573eabbbc5ca9 SHA256 f01d48d7d823bf111ad86c2b595d8bcc9b8b49c3f7439e29b65aa3d83fcd616d

sys-kernel/calculate-sources/calculate-sources-2.6.32.4-r2.ebuild

@@ -14,7 +14,7 @@ SRC_URI="${KERNEL_URI} ${ARCH_URI} ${CALC_URI}"
 
 UNIPATCH_LIST="${DISTDIR}/${PN}-${CKV}.tar.bz2"
 
-DEPEND=">=sys-kernel/calckernel-3.4.10.903-r18
+DEPEND=">=sys-kernel/calckernel-3.4.10.903-r19
 		>=sys-apps/calculate-1.3.3"
 
 pkg_postinst() {