X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=genkernel.conf;h=af73931e6a20e6aa85ca1c53701887fb9e2ee576;hb=457cc95b07fc706f12bdd9adf6b862ce64361448;hp=c5e7aee90671cab2b4c84ec9cbe76ca1420a039d;hpb=66e5a247041af5406dfbc90acda436c3db0fa463;p=genkernel.git

diff --git a/genkernel.conf b/genkernel.conf
index c5e7aee..af73931 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -1,5 +1,4 @@
 # Configuration file for genkernel
-# $Id$
 
 # This file is sourced by genkernel at startup and determines which options
 # we will be using to compile our kernel.  The order of precidence is simple,
@@ -88,6 +87,9 @@ USECOLOR="yes"
 # Add iSCSI support.
 #ISCSI="no"
 
+# Add e2fsprogs support.
+#E2FSPROGS="no"
+
 # Include support for unionfs
 #UNIONFS="1"
 
@@ -198,52 +200,13 @@ 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"
-
-E2FSPROGS_VER="VERSION_E2FSPROGS"
-E2FSPROGS_DIR="e2fsprogs-${E2FSPROGS_VER}"
-E2FSPROGS_SRCTAR="${DISTDIR}/e2fsprogs-${E2FSPROGS_VER}.tar.gz"
-BLKID_BINCACHE="%%CACHE%%/blkid-${E2FSPROGS_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"
+# NOTE: Since genkernel 3.4.41 the version of
+#   busybox, lvm, mdadm, .. have been moved to
+#   /usr/share/genkernel/defaults/software.sh in order to
+#   reduce the merging you have to do during etc-update.
+#   You can still override these settings in here.
 
 
 # =========MISC KERNEL CONFIGURATION============