Move software version defaults for defaults/software.sh to ease the etc-update game

3 files changed, 57 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index bee9ecb..0e32e8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  12 Aug 2012; Sebastian Pipping <sping@gentoo.org> +defaults/software.sh,
+  genkernel.conf:
+  Move software version defaults for defaults/software.sh to ease the
+  etc-update game
+
   12 Aug 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Fix parsing of --config=... command line option
 
diff --git a/defaults/software.sh b/defaults/software.sh
new file mode 100644
index 0000000..e0d2537
--- /dev/null
+++ b/defaults/software.sh
@@ -0,0 +1,51 @@
+# NOTE:
+# - This file (software.sh) is sourced by /etc/genkernel.conf .
+#   Rather than changing this very file, please override specific versions/variables
+#   somewhere after the (existing) line
+#
+#     source "${GK_SHARE}/defaults/software.sh"
+#
+#   in /etc/genkernel.conf .
+#
+# - The *_VER variables below in here are/were filled with actual version strings
+#   by the genkernel ebuild.
+
+BUSYBOX_VER="VERSION_BUSYBOX"
+BUSYBOX_SRCTAR="${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2"
+BUSYBOX_DIR="busybox-${BUSYBOX_VER}"
+BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2"
+
+LVM_VER="VERSION_LVM"
+LVM_DIR="LVM2.${LVM_VER}"
+LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz"
+LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2"
+
+MDADM_VER="VERSION_MDADM"
+MDADM_DIR="mdadm-${MDADM_VER}"
+MDADM_SRCTAR="${DISTDIR}/mdadm-${MDADM_VER}.tar.bz2"
+MDADM_BINCACHE="%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2"
+
+DMRAID_VER="VERSION_DMRAID"
+DMRAID_DIR="dmraid/${DMRAID_VER}/dmraid"
+DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2"
+DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2"
+
+ISCSI_VER="VERSION_ISCSI"
+ISCSI_DIR="open-iscsi-${ISCSI_VER}"
+ISCSI_SRCTAR="${DISTDIR}/open-iscsi-${ISCSI_VER}.tar.gz"
+ISCSI_BINCACHE="%%CACHE%%/iscsi-${ISCSI_VER}-%%ARCH%%.bz2"
+
+FUSE_VER="VERSION_FUSE"
+FUSE_DIR="fuse-${FUSE_VER}"
+FUSE_SRCTAR="${DISTDIR}/fuse-${FUSE_VER}.tar.gz"
+FUSE_BINCACHE="%%CACHE%%/fuse-${FUSE_VER}-%%ARCH%%.tar.bz2"
+
+UNIONFS_FUSE_VER="VERSION_UNIONFS_FUSE"
+UNIONFS_FUSE_DIR="unionfs-fuse-${UNIONFS_FUSE_VER}"
+UNIONFS_FUSE_SRCTAR="${DISTDIR}/unionfs-fuse-${UNIONFS_FUSE_VER}.tar.bz2"
+UNIONFS_FUSE_BINCACHE="%%CACHE%%/unionfs-fuse-${UNIONFS_FUSE_VER}-%%ARCH%%.bz2"
+
+GPG_VER="VERSION_GPG"
+GPG_DIR="gnupg-${GPG_VER}"
+GPG_SRCTAR="${DISTDIR}/gnupg-${GPG_VER}.tar.bz2"
+GPG_BINCACHE="%%CACHE%%/gnupg-${GPG_VER}-%%ARCH%%.bz2"
diff --git a/genkernel.conf b/genkernel.conf
index f50dd5f..8e9e424 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -198,47 +198,9 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 
 # Specifies a user created busybox config
 #BUSYBOX_CONFIG="/path/to/file"
-
-BUSYBOX_VER="VERSION_BUSYBOX"
-BUSYBOX_SRCTAR="${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2"
-BUSYBOX_DIR="busybox-${BUSYBOX_VER}"
-BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2"
 #BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat"
 
-LVM_VER="VERSION_LVM"
-LVM_DIR="LVM2.${LVM_VER}"
-LVM_SRCTAR="${DISTDIR}/LVM2.${LVM_VER}.tgz"
-LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2"
-
-MDADM_VER="VERSION_MDADM"
-MDADM_DIR="mdadm-${MDADM_VER}"
-MDADM_SRCTAR="${DISTDIR}/mdadm-${MDADM_VER}.tar.bz2"
-MDADM_BINCACHE="%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2"
-
-DMRAID_VER="VERSION_DMRAID"
-DMRAID_DIR="dmraid/${DMRAID_VER}/dmraid"
-DMRAID_SRCTAR="${DISTDIR}/dmraid-${DMRAID_VER}.tar.bz2"
-DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2"
-
-ISCSI_VER="VERSION_ISCSI"
-ISCSI_DIR="open-iscsi-${ISCSI_VER}"
-ISCSI_SRCTAR="${DISTDIR}/open-iscsi-${ISCSI_VER}.tar.gz"
-ISCSI_BINCACHE="%%CACHE%%/iscsi-${ISCSI_VER}-%%ARCH%%.bz2"
-
-FUSE_VER="VERSION_FUSE"
-FUSE_DIR="fuse-${FUSE_VER}"
-FUSE_SRCTAR="${DISTDIR}/fuse-${FUSE_VER}.tar.gz"
-FUSE_BINCACHE="%%CACHE%%/fuse-${FUSE_VER}-%%ARCH%%.tar.bz2"
-
-UNIONFS_FUSE_VER="VERSION_UNIONFS_FUSE"
-UNIONFS_FUSE_DIR="unionfs-fuse-${UNIONFS_FUSE_VER}"
-UNIONFS_FUSE_SRCTAR="${DISTDIR}/unionfs-fuse-${UNIONFS_FUSE_VER}.tar.bz2"
-UNIONFS_FUSE_BINCACHE="%%CACHE%%/unionfs-fuse-${UNIONFS_FUSE_VER}-%%ARCH%%.bz2"
-
-GPG_VER="VERSION_GPG"
-GPG_DIR="gnupg-${GPG_VER}"
-GPG_SRCTAR="${DISTDIR}/gnupg-${GPG_VER}.tar.bz2"
-GPG_BINCACHE="%%CACHE%%/gnupg-${GPG_VER}-%%ARCH%%.bz2"
+source "${GK_SHARE}/defaults/software.sh"
 
 
 # =========MISC KERNEL CONFIGURATION============