Move distfile cache to /var/cache/genkernel/src and add check to make sure all distfi...

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

diff --git a/ChangeLog b/ChangeLog
index a5d1338553b382207a999715d77d6041c17f1b39..eb103688c2e24207620b1871714100e3f5c0fe36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 May 2008; Andrew Gaffney <agaffney@gentoo.org> gen_funcs.sh, genkernel,
+  genkernel.conf:
+  Move distfile cache to /var/cache/genkernel/src and add check to make sure
+  all distfiles are present
+
   09 May 2008; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
   ia64/modules_load, mips/modules_load, parisc/modules_load,
   parisc64/modules_load, ppc/modules_load, ppc64/modules_load,

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 30f4b81fb2f7c4a5091924412aa6b7b159f62e10..0363ac1b63a0ff03d2ad0091b1201287a790b53b 100755 (executable)
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -515,3 +515,12 @@ set_config_with_override() {
        eval ${CfgVar}=\"${Result}\"
 }
 
+check_distfiles() {
+       for i in $BUSYBOX_SRCTAR $DEVICE_MAPPER_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $E2FSPROGS_SRCTAR
+       do
+               if [ ! -f "${i}" ]
+               then
+                       small_die "Could not find source tarball ${i}. Please refetch."
+               fi
+       done
+}

diff --git a/genkernel b/genkernel
index aa9e576c8dad589c5174eaec46eb2aa35622a2db..b45fb1003f46335d3be721c5892bbd48aeadaf3b 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -124,6 +124,8 @@ set_kernel_arch
 
 setup_cache_dir
 
+check_distfiles
+
 dump_debugcache
 
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."

diff --git a/genkernel.conf b/genkernel.conf
index d1291b3d94ab750e08f7e3e40dc0febfe7fae4a5..9b09ad13036c469ac7492cc7e8737cb3aa1e8b46 100755 (executable)
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -123,9 +123,9 @@ USECOLOR="yes"
 GK_SHARE="/usr/share/genkernel"
 
 # Location of the default cache
-CACHE_DIR="/var/cache/genkernel/%%ARCH%%"
+CACHE_DIR="/var/cache/genkernel"
 # Location of DISTDIR, where our source tarballs are stored
-DISTDIR="/usr/portage/distfiles"
+DISTDIR="${CACHE_DIR}/src"
 # Log output file
 LOGFILE="/var/log/genkernel.log"
 # Debug Level