Removing pkg directory, since it is no longer necessary. From now on, we'll just...

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

diff --git a/ChangeLog b/ChangeLog
index a5a9a682d3faa605925ff85c293331a8a4d11757..86b521d747e9777b7f772c872c382c06581eede3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> genkernel,
+  genkernel.conf, -pkg/alpha/README, -pkg/ia64/README, -pkg/mips/.keep,
+  -pkg/parisc/README, -pkg/parisc64/README, -pkg/ppc/README,
+  -pkg/ppc64/README, -pkg/sparc/README, -pkg/sparc64/README, -pkg/um/README,
+  -pkg/x86/README, -pkg/x86_64/README, -pkg/xen0/README, -pkg/xenU/README:
+  Removing pkg directory, since it is no longer necessary. From now on, we'll
+  just pull the tarballs from DISTDIR directly, and we've already moved our
+  caches to /var/tmp/genkernel, so there's nothing left to keep here. This is
+  genkernel 3.4.10_pre7 for testing.
+
   14 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_package.sh:
   Copy the original kconfig with a different name than the one used to build
 

diff --git a/genkernel b/genkernel
index c9e651de22cd69c8c94e4006ea8ca29d2dced940..38b12a5345a10ee4f3a574fe495e90dc78963012 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.10_pre6'
+GK_V='3.4.10_pre7'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.

diff --git a/genkernel.conf b/genkernel.conf
index c7b6cd1b69de545d5fe0ca6ea4ad2e30cd6977b8..d1291b3d94ab750e08f7e3e40dc0febfe7fae4a5 100755 (executable)
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -124,6 +124,8 @@ GK_SHARE="/usr/share/genkernel"
 
 # Location of the default cache
 CACHE_DIR="/var/cache/genkernel/%%ARCH%%"
+# Location of DISTDIR, where our source tarballs are stored
+DISTDIR="/usr/portage/distfiles"
 # Log output file
 LOGFILE="/var/log/genkernel.log"
 # Debug Level
@@ -139,27 +141,27 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 BUSYBOX_CONFIG="${GK_SHARE}/%%ARCH%%/busy-config"
 
 BUSYBOX_VER="VERSION_BUSYBOX"
-BUSYBOX_SRCTAR="${GK_SHARE}/pkg/busybox-${BUSYBOX_VER}.tar.bz2"
+BUSYBOX_SRCTAR="${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2"
 BUSYBOX_DIR="busybox-${BUSYBOX_VER}"
 BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2"
 
 DEVICE_MAPPER_VER="VERSION_DMAP"
 DEVICE_MAPPER_DIR="device-mapper.${DEVICE_MAPPER_VER}"
-DEVICE_MAPPER_SRCTAR="${GK_SHARE}/pkg/device-mapper.${DEVICE_MAPPER_VER}.tgz"
+DEVICE_MAPPER_SRCTAR="${DISTDIR}/device-mapper.${DEVICE_MAPPER_VER}.tgz"
 DEVICE_MAPPER_BINCACHE="%%CACHE%%/device-mapper-${DEVICE_MAPPER_VER}-%%ARCH%%.tar.bz2"
 
 LVM_VER="VERSION_LVM"
 LVM_DIR="LVM2.${LVM_VER}"
-LVM_SRCTAR="${GK_SHARE}/pkg/LVM2.${LVM_VER}.tgz"
+LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz"
 LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2"
 
 DMRAID_VER="VERSION_DMRAID"
 DMRAID_DIR="dmraid/${DMRAID_VER}"
-DMRAID_SRCTAR="${GK_SHARE}/pkg/dmraid-${DMRAID_VER}.tar.bz2"
+DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2"
 DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2"
 
 E2FSPROGS_VER="VERSION_E2FSPROGS"
 E2FSPROGS_DIR="e2fsprogs-${E2FSPROGS_VER}"
-E2FSPROGS_SRCTAR="${GK_SHARE}/pkg/e2fsprogs-${E2FSPROGS_VER}.tar.gz"
+E2FSPROGS_SRCTAR="${DISTDIR}/e2fsprogs-${E2FSPROGS_VER}.tar.gz"
 BLKID_BINCACHE="%%CACHE%%/blkid-${E2FSPROGS_VER}-%%ARCH%%.bz2"
 

diff --git a/pkg/alpha/README b/pkg/alpha/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/alpha/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/ia64/README b/pkg/ia64/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/ia64/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/mips/.keep b/pkg/mips/.keep
deleted file mode 100644 (file)
index 8c0fd43..0000000
--- a/pkg/mips/.keep
+++ /dev/null
@@ -1 +0,0 @@
-# Hidden

diff --git a/pkg/parisc/README b/pkg/parisc/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/parisc/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/parisc64/README b/pkg/parisc64/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/parisc64/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/ppc/README b/pkg/ppc/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/ppc/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/ppc64/README b/pkg/ppc64/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/ppc64/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/sparc/README b/pkg/sparc/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/sparc/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/sparc64/README b/pkg/sparc64/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/sparc64/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/um/README b/pkg/um/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/um/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/x86/README b/pkg/x86/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/x86/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/x86_64/README b/pkg/x86_64/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/x86_64/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/xen0/README b/pkg/xen0/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/xen0/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES

diff --git a/pkg/xenU/README b/pkg/xenU/README
deleted file mode 100644 (file)
index d0e537d..0000000
--- a/pkg/xenU/README
+++ /dev/null
@@ -1 +0,0 @@
-PLACEHOLDER FOR BINCACHE PACKAGES