Replace "# FOO=bar" by "#FOO=bar" in genkernel.conf (bug #398471)

diff --git a/ChangeLog b/ChangeLog
index 90a4e3d3cf2440dd3113c2927556933999fd3454..8b3c23e4f0cc79625edd6030c8d5c4287e57083b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Jan 2012; Sebastian Pipping <sping@gentoo.org> genkernel.conf:
+  Replace "# FOO=bar" by "#FOO=bar" in genkernel.conf to (1) distinguish
+  commented-out options from their explanatory comments and (2) to return
+  consistenty (bug #398471)
+
   12 Jan 2012; Sebastian Pipping <sping@gentoo.org> gen_compile.sh:
   Support application of patches before compilation for tools which previously
   lacked that support. Special thanks to Tomasz Wasiak (bug #398469)

diff --git a/genkernel.conf b/genkernel.conf
index c6378e2ce06c5db025a747f18db85a1455f5402c..b39a952ab3df9371a15786986e417f187396a39c 100644 (file)
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -28,13 +28,13 @@ CLEAN="yes"
 MRPROPER="yes"
 
 # Override the arch detection?
-# ARCH_OVERRIDE="x86"
+#ARCH_OVERRIDE="x86"
 
 # Mount BOOTDIR automatically if it isn't mounted?
 MOUNTBOOT="yes"
 
 # Make symlinks in BOOTDIR automatically?
-# SYMLINK="no"
+#SYMLINK="no"
 
 # Save the new configuration in /etc/kernels upon
 # successfull compilation
@@ -44,7 +44,7 @@ SAVE_CONFIG="yes"
 USECOLOR="yes"
 
 # Clear build cache dir
-# CLEAR_CACHE_DIR="yes"
+#CLEAR_CACHE_DIR="yes"
 
 # Clear all tmp files and caches after genkernel has run
 #POSTCLEAR="1"
@@ -54,63 +54,63 @@ USECOLOR="yes"
 # 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"
+#MAKEOPTS="-j2"
 
 # Add in LVM support from static binaries if they exist on the system, or
 # compile static LVM binaries if static ones do not exist.
-# LVM="no"
+#LVM="no"
 
 # Add in Luks support. Needs sys-fs/cryptsetup with -dynamic installed.
-# LUKS="no"
+#LUKS="no"
 
 # Add in GnuPG support
-# GPG="no"
+#GPG="no"
 
 # Add DMRAID support.
-# DMRAID="no"
+#DMRAID="no"
 
 # Include (or suppresses the inclusion of) busybox in the initrd or initramfs.
 # If included, busybox is rebuilt if the cached copy is out of date.
-# BUSYBOX="yes"
+#BUSYBOX="yes"
 
 # Includes mdadm/mdmon binaries in initramfs.
 # Without sys-fs/mdadm[static] installed, this will build a static mdadm.
-# MDADM="no"
+#MDADM="no"
 
 # Specify a custom mdadm.conf.
 # By default the ramdisk will be built *without* an mdadm.conf and will auto-detect
 # arrays during bootup.  Usually, this should not be needed.
-# MDADM_CONFIG="/etc/mdadm.conf"
+#MDADM_CONFIG="/etc/mdadm.conf"
 
 # Add Multipath support.
-# MULTIPATH="no"
+#MULTIPATH="no"
 
 # Add iSCSI support.
-# ISCSI="no"
+#ISCSI="no"
 
 # Include support for unionfs
 #UNIONFS="1"
 
 # Enable copying of firmware into initramfs
-# FIRMWARE="no"
+#FIRMWARE="no"
 # Specify directory to pull from
-# FIRMWARE_DIR="/lib/firmware"
+#FIRMWARE_DIR="/lib/firmware"
 # Specify specific firmware files to include. This overrides FIRMWARE_DIR
-# FIRMWARE_FILES=""
+#FIRMWARE_FILES=""
 
 # Enable disklabel support (copies blkid to initrd)
 DISKLABEL="yes"
 
 # Add new kernel to grub?
-# BOOTLOADER="grub"
+#BOOTLOADER="grub"
 
 # Enable splashutils in early space (initrd). Default is "no".
-# SPLASH="yes"
+#SPLASH="yes"
 
 # Use this splash theme. If commented out - the "default" name theme is used.
 # Also, SPLASH="yes" needs to be enabled for this one to one work.
 # This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).
-# SPLASH_THEME="gentoo"
+#SPLASH_THEME="gentoo"
 
 
 # =========Keymap Settings=========
@@ -126,34 +126,34 @@ DISKLABEL="yes"
 # =========Low Level Compile Settings=========
 #
 # GNU Make to use for kernel.  See also the --kernel-make command line option.
-# KERNEL_MAKE="make"
+#KERNEL_MAKE="make"
 
 # Compiler to use for the kernel (e.g. distcc).  See also the --kernel-cc
 # command line option.
-# KERNEL_CC="gcc"
+#KERNEL_CC="gcc"
 
 # Assembler to use for the kernel.  See also the --kernel-as command line
 # option.
-# KERNEL_AS="as"
+#KERNEL_AS="as"
 
 # Linker to use for the kernel.  See also the --kernel-ld command line option.
-# KERNEL_LD="ld"
+#KERNEL_LD="ld"
 
 # GNU Make to use for the utilities.  See also the --utils-make command line
 # option.
-# UTILS_MAKE="make"
+#UTILS_MAKE="make"
 
 # Compiler to use for the utilities (e.g. distcc).  See also the --utils-cc
 # command line option.
-# UTILS_CC="gcc"
+#UTILS_CC="gcc"
 
 # Assembler to use for the utilities.  See also the --utils-as command line
 # option.
-# UTILS_AS="as"
+#UTILS_AS="as"
 
 # Linker to use for the utilities.  See also the --utils-ld command line
 # option.
-# UTILS_LD="ld"
+#UTILS_LD="ld"
 
 
 # Common prefix of cros compile commands
@@ -171,7 +171,7 @@ DISKLABEL="yes"
 #   %%CACHE%% - Final determined cache location
 
 # Set genkernel's temporary work directory.  Default is /var/tmp/genkernel
-# TMPDIR="/var/tmp/genkernel"
+#TMPDIR="/var/tmp/genkernel"
 
 # Set the boot directory, default is /boot
 #BOOTDIR="/boot"
@@ -194,7 +194,7 @@ LOGLEVEL=1
 DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # Default kernel config (only use to override using
 # arch/%%ARCH%%/kernel-config-${VER}.${PAT} !)
-# DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config"
+#DEFAULT_KERNEL_CONFIG="${GK_SHARE}/arch/%%ARCH%%/kernel-config"
 
 # Specifies a user created busybox config
 #BUSYBOX_CONFIG="/path/to/file"
@@ -203,7 +203,7 @@ 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"
+#BUSYBOX_APPLETS="[ ash sh mount uname echo cut cat"
 
 DEVICE_MAPPER_VER="VERSION_DMAP"
 DEVICE_MAPPER_DIR="device-mapper.${DEVICE_MAPPER_VER}"