From cdc35d27dbd9294d04652055457d568f8755d053 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Fri, 22 Jul 2005 16:08:27 +0000 Subject: [PATCH] Remove extra checks that fail git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@278 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- gen_determineargs.sh | 6 ------ gen_package.sh | 18 ------------------ 2 files changed, 24 deletions(-) diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 550955b..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 1386b32..eac457c 100644 --- a/gen_package.sh +++ b/gen_package.sh @@ -70,17 +70,11 @@ 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}" || { - rm -r ${TEMP} gen_die 'Could not copy the kernel binary to /boot!' } cp "${TEMP}/System.map-${ARCH}-${KV}" "/boot/System.map-${KNAME}-${ARCH}-${KV}" || { - rm -r ${TEMP} gen_die 'Could not copy System.map to /boot!' } rm -r ${TEMP} @@ -108,10 +102,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} ] @@ -119,16 +109,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 @@ -144,7 +127,6 @@ gen_kerncache_is_valid() KERNCACHE_IS_VALID=1 fi fi - /bin/rm -r ${TEMP} fi fi export KERNCACHE_IS_VALID -- 2.26.2