Fix missing moddeps file by adding a test;Do not keep the initrd/initramfs with a kernelz system as it is already bundled together.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@324 67a159dc-881f-0410-a524-ba9dfbe2cb84

gen_initramfs.sh

@@ -516,6 +516,7 @@ merge_initramfs_cpio_archives(){
 	[ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] ||
 		[ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
 			cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz
+			rm ${TMPDIR}/initramfs-${KV}
 
 	# Mips also mimics Pegasos to merge the initramfs into the kernel
 	if [ "${MIPS_EMBEDDED_IMAGE}" != '' ]; then

gen_initrd.sh

@@ -398,6 +398,7 @@ create_initrd() {
 	[ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] ||
 		[ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
 		cp ${TMPDIR}/initrd-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz
+		rm ${TMPDIR}/initrd-${KV}
 
 	# Mips also mimics Pegasos to merge the initrd into the kernel
 	[ "${MIPS_EMBEDDED_IMAGE}" != '' ] \

gen_moddeps.sh

@@ -62,5 +62,8 @@ gen_dep_list()
 	done
 
 	# Only list each module once
+	if [ -f ${TEMP}/moddeps ]
+	then
 	    cat ${TEMP}/moddeps | sort | uniq
+	fi
 }

gen_package.sh

@@ -23,12 +23,17 @@ gen_minkernpackage()
             fi
 
 	fi
+	
+	if [ "${GENERATE_Z_IMAGE}" != '1' ]
+	then
 	    if [ "${KERN_24}" != '1' -a  "${CMD_BOOTSPLASH}" != '1' ]
 	    then
 		    [ "${BUILD_INITRD}" -ne 0 ] && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; }
 	    else
 		    [ "${BUILD_INITRD}" -ne 0 ] && { cp "${TMPDIR}/initrd-${KV}" "${TEMP}/minkernpackage/initrd-${ARCH}-${KV}" || gen_die 'Could not copy the initrd for the kernel package!'; }
 	    fi
+	fi
+	
 	cd "${TEMP}/minkernpackage" 
 	/bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the kernel package!'
 	cd "${TEMP}" && rm -rf "${TEMP}/minkernpackage" > /dev/null 2>&1