From 38f0e76f3d259219de4dbe19809d0e43c7e2b591 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Mon, 25 Jul 2005 13:55:23 +0000 Subject: [PATCH] Remove extra TEMP checking code that was commented out git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@280 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- gen_determineargs.sh | 6 ------ gen_package.sh | 16 ---------------- 2 files changed, 22 deletions(-) diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 102a6c9..32f916c 100644 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -3,10 +3,6 @@ get_KV() { if [ "${CMD_NO_KERNEL_SOURCES}" = '1' -a -e "${CMD_KERNCACHE}" ] then - #[ -d ${TEMP} ] && gen_die "temporary directory already exists! Exiting." - #(umask 077 && mkdir ${TEMP}) || { - # gen_die "Could not create temporary directory! Exiting." - #} /bin/tar -xj -C ${TEMP} -f ${CMD_KERNCACHE} kerncache.config if [ -e ${TEMP}/kerncache.config ] then @@ -25,10 +21,8 @@ get_KV() { fi else - #rm -r ${TEMP} gen_die "Could not find kerncache.config in the kernel cache! Exiting." fi - #rm -r ${TEMP} else # Configure the kernel diff --git a/gen_package.sh b/gen_package.sh index 80ec71c..d69f563 100644 --- a/gen_package.sh +++ b/gen_package.sh @@ -83,10 +83,6 @@ gen_kerncache() gen_kerncache_extract_kernel() { - #[ -d ${TEMP} ] && gen_die "temporary directory already exists! Exiting." - #(umask 077 && mkdir ${TEMP}) || { - # gen_die "Could not create temporary directory! Exiting." - #} /bin/tar -f ${KERNCACHE} -C ${TEMP} -xj cp "${TEMP}/kernel-${ARCH}-${KV}" "/boot/kernel-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy the kernel binary to /boot!' if [ "${KERNEL_BINARY_2}" != '' ] @@ -117,10 +113,6 @@ gen_kerncache_is_valid() BUILD_KERNEL=0 # Can make this more secure .... - #[ -d ${TEMP} ] && gen_die "temporary directory already exists! Exiting." - #(umask 077 && mkdir ${TEMP}) || { - # gen_die "Could not create temporary directory! Exiting." - #} /bin/tar -xj -f ${KERNCACHE} -C ${TEMP} if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${TEMP}/kernel-${ARCH}-${KV} ] @@ -128,16 +120,9 @@ gen_kerncache_is_valid() print_info 1 'Valid kernel cache found; no sources will be used' KERNCACHE_IS_VALID=1 fi - #/bin/rm -r ${TEMP} else if [ -e "${KERNCACHE}" ] then - #[ -d ${TEMP} ] && gen_die "temporary directory already exists! Exiting." - #(umask 077 && mkdir ${TEMP}) || { - # gen_die "Could not create temporary directory! Exiting." - # - #} - /bin/tar -xj -f ${KERNCACHE} -C ${TEMP} if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e /${KERNEL_DIR}/.config ] then @@ -153,7 +138,6 @@ gen_kerncache_is_valid() KERNCACHE_IS_VALID=1 fi fi - #/bin/rm -r ${TEMP} fi fi export KERNCACHE_IS_VALID -- 2.26.2