Added a note about the MAKEOPTS option to genkernel as suggested in bug #165980.

[genkernel.git] / genkernel.conf

diff --git a/genkernel.conf b/genkernel.conf
index 8955c4076eab9b0301b720b5a1e22e0a1b0ea041..13787b4e3cfcd16ef78d34df26f83f7958055d91 100755 (executable)
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -20,7 +20,7 @@ BOOTSPLASH="yes"
 # Override the arch detection?
 # ARCH_OVERRIDE="x86"
 
-# Mount /boot automatically if it isn't mounted?
+# Mount BOOTDIR automatically if it isn't mounted?
 MOUNTBOOT="yes"
 
 # Save the new configuration in /etc/kernels upon
@@ -33,11 +33,24 @@ USECOLOR="yes"
 # Add new kernel to grub?
 # BOOTLOADER="grub"
 
+# Clear build cache dir
+# CLEAR_CACHE_DIR="yes"
+
+# Genkernel uses an independent configuration for MAKEOPTS, and does not source
+# /etc/make.conf . You can override the default setting by uncommenting and
+# tweaking the following line. Default setting is set up by
+# ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j
+# argument is: <number of processors>*<number of cores per processor>+1
+# MAKEOPTS="-j2"
+
 # =========GENKERNEL LOCATION CONFIGURATION============
 # Variables:
 #   %%ARCH%%  - Final determined architecture
 #   %%CACHE%% - Final determined cache location
 
+# Set the boot directory, default is /boot
+#BOOTDIR="/boot"
+
 # Default share directory location
 GK_SHARE="/usr/share/genkernel"
 
@@ -59,7 +72,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # Configuration file for busybox
 BUSYBOX_CONFIG="${GK_SHARE}/%%ARCH%%/busy-config"
 # BusyBox Version
-BUSYBOX_VER="1.00-pre7-losetup-crypto-alpha"
+BUSYBOX_VER="1.1.3+gentoo"
 # Busybox bin-cache location, to store pre-compiled busybox
 # binary is just a bzip2 busybox executable
 BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.bz2"
@@ -90,28 +103,51 @@ DEVFSD_DIR="devfsd"
 DEVFSD_BINCACHE="%%CACHE%%/devfsd-${DEVFSD_VER}-%%ARCH%%.bz2"
 DEVFSD_CONF_BINCACHE="%%CACHE%%/devfsd-conf-${DIETLIBC_VER}-%%ARCH%%.bz2"
 
-UDEV_VER="054"
-UDEV_DIR="udev-${UDEV_VER}"
-UDEV_SRCTAR="${GK_SHARE}/pkg/udev-${UDEV_VER}.tar.bz2"
-UDEV_BINCACHE="%%CACHE%%/udev-${UDEV_VER}-%%ARCH%%.tar.bz2"
+#UDEV_VER="VERSION_UDEV"
+#UDEV_DIR="udev-${UDEV_VER}"
+#UDEV_SRCTAR="${GK_SHARE}/pkg/udev-${UDEV_VER}.tar.bz2"
+#UDEV_BINCACHE="%%CACHE%%/udev-${UDEV_VER}-%%ARCH%%.tar.bz2"
 
-DEVICE_MAPPER_VER="1.00.17"
+#KLIBC_VER="VERSION_KLIBC"
+#KLIBC_DIR="klibc-${KLIBC_VER}"
+#KLIBC_SRCTAR="${GK_SHARE}/pkg/klibc-${KLIBC_VER}.tar.bz2"
+#KLIBC_BINCACHE="%%CACHE%%/klibc-${KLIBC_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_BINCACHE="%%CACHE%%/device-mapper-${DEVICE_MAPPER_VER}-%%ARCH%%.tar.bz2"
 
-LVM2_VER="2.00.25"
+LVM2_VER="VERSION_LVM2"
 LVM2_DIR="LVM2.${LVM2_VER}"
 LVM2_SRCTAR="${GK_SHARE}/pkg/LVM2.${LVM2_VER}.tgz"
 LVM2_BINCACHE="%%CACHE%%/LVM2.${LVM2_VER}-%%ARCH%%.tar.bz2"
 
-DMRAID_VER="1.0.0.rc6"
+DMRAID_VER="VERSION_DMRAID"
 DMRAID_DIR="dmraid/${DMRAID_VER}"
 DMRAID_SRCTAR="${GK_SHARE}/pkg/dmraid-${DMRAID_VER}.tar.bz2"
 DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRAID_VER}-%%ARCH%%.tar.bz2"
 
-UNIONFS_VER="1.0.12a"
+# Kernel Version Compatibility
+# (from http://www.am-utils.org/project-unionfs.html)
+
+# 2.6.9 - 2.6.15       1.1.5
+# 2.6.16                       1.2
+# 2.6.17                       1.3
+
+UNIONFS_VER="VERSION_UNIONFS"
 UNIONFS_DIR="unionfs-${UNIONFS_VER}"
 UNIONFS_SRCTAR="${GK_SHARE}/pkg/unionfs-${UNIONFS_VER}.tar.gz"
 UNIONFS_BINCACHE="%%CACHE%%/unionfs-${UNIONFS_VER}-tools-%%ARCH%%.tar.bz2"
 UNIONFS_MODULES_BINCACHE="%%CACHE%%/unionfs-${UNIONFS_VER}-modules-%%KV%%-%%ARCH%%.tar.bz2"
+
+E2FSPROGS_VER="VERSION_E2FSPROGS"
+E2FSPROGS_DIR="e2fsprogs-${E2FSPROGS_VER}"
+E2FSPROGS_SRCTAR="${GK_SHARE}/pkg/e2fsprogs-${E2FSPROGS_VER}.tar.gz"
+BLKID_BINCACHE="%%CACHE%%/blkid-${E2FSPROGS_VER}-%%ARCH%%.bz2"
+
+SUSPEND_VER="VERSION_SUSPEND"
+SUSPEND_DIR="suspend-${SUSPEND_VER}"
+SUSPEND_SRCTAR="${GK_SHARE}/pkg/suspend-${SUSPEND_VER}.tar.gz"
+SUSPEND_BINCACHE="%%CACHE%%/suspend-${SUSPEND_VER}-%%ARCH%%.tar.bz2"
+