From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RlmQ3-0001od-DC for garchives@archives.gentoo.org; Fri, 13 Jan 2012 19:04:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1675E058A; Fri, 13 Jan 2012 19:03:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B0180E058A for ; Fri, 13 Jan 2012 19:03:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBDBC1B400C for ; Fri, 13 Jan 2012 19:03:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 19F1580044 for ; Fri, 13 Jan 2012 19:03:56 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <146934e1a8c7c4199d7cee9b0fea6ffaa4d94678.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog genkernel.conf X-VCS-Directories: / X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 146934e1a8c7c4199d7cee9b0fea6ffaa4d94678 Date: Fri, 13 Jan 2012 19:03:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8469bc01-2a2d-45a4-b807-39a9ac6aa40a X-Archives-Hash: 0d0a61416ac0767fc901062918a04a60 commit: 146934e1a8c7c4199d7cee9b0fea6ffaa4d94678 Author: Sebastian Pipping pipping org> AuthorDate: Fri Jan 13 19:02:43 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Fri Jan 13 19:02:43 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D146934e1 Replace "# FOO=3Dbar" by "#FOO=3Dbar" in genkernel.conf (bug #398471) --- ChangeLog | 5 ++++ genkernel.conf | 60 ++++++++++++++++++++++++++++----------------------= ------ 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90a4e3d..8b3c23e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ # Distributed under the GPL v2 # $Id$ =20 + 13 Jan 2012; Sebastian Pipping genkernel.conf: + Replace "# FOO=3Dbar" by "#FOO=3Dbar" in genkernel.conf to (1) disting= uish + commented-out options from their explanatory comments and (2) to retur= n + consistenty (bug #398471) + 12 Jan 2012; Sebastian Pipping gen_compile.sh: Support application of patches before compilation for tools which prev= iously lacked that support. Special thanks to Tomasz Wasiak (bug #398469) diff --git a/genkernel.conf b/genkernel.conf index c6378e2..b39a952 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -28,13 +28,13 @@ CLEAN=3D"yes" MRPROPER=3D"yes" =20 # Override the arch detection? -# ARCH_OVERRIDE=3D"x86" +#ARCH_OVERRIDE=3D"x86" =20 # Mount BOOTDIR automatically if it isn't mounted? MOUNTBOOT=3D"yes" =20 # Make symlinks in BOOTDIR automatically? -# SYMLINK=3D"no" +#SYMLINK=3D"no" =20 # Save the new configuration in /etc/kernels upon # successfull compilation @@ -44,7 +44,7 @@ SAVE_CONFIG=3D"yes" USECOLOR=3D"yes" =20 # Clear build cache dir -# CLEAR_CACHE_DIR=3D"yes" +#CLEAR_CACHE_DIR=3D"yes" =20 # Clear all tmp files and caches after genkernel has run #POSTCLEAR=3D"1" @@ -54,63 +54,63 @@ USECOLOR=3D"yes" # tweaking the following line. Default setting is set up by # ${GK_SHARE}/${ARCH_OVERRIDE}/config.sh . The recommended value for -j # argument is: *+1 -# MAKEOPTS=3D"-j2" +#MAKEOPTS=3D"-j2" =20 # Add in LVM support from static binaries if they exist on the system, o= r # compile static LVM binaries if static ones do not exist. -# LVM=3D"no" +#LVM=3D"no" =20 # Add in Luks support. Needs sys-fs/cryptsetup with -dynamic installed. -# LUKS=3D"no" +#LUKS=3D"no" =20 # Add in GnuPG support -# GPG=3D"no" +#GPG=3D"no" =20 # Add DMRAID support. -# DMRAID=3D"no" +#DMRAID=3D"no" =20 # Include (or suppresses the inclusion of) busybox in the initrd or init= ramfs. # If included, busybox is rebuilt if the cached copy is out of date. -# BUSYBOX=3D"yes" +#BUSYBOX=3D"yes" =20 # Includes mdadm/mdmon binaries in initramfs. # Without sys-fs/mdadm[static] installed, this will build a static mdadm= . -# MDADM=3D"no" +#MDADM=3D"no" =20 # 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=3D"/etc/mdadm.conf" +#MDADM_CONFIG=3D"/etc/mdadm.conf" =20 # Add Multipath support. -# MULTIPATH=3D"no" +#MULTIPATH=3D"no" =20 # Add iSCSI support. -# ISCSI=3D"no" +#ISCSI=3D"no" =20 # Include support for unionfs #UNIONFS=3D"1" =20 # Enable copying of firmware into initramfs -# FIRMWARE=3D"no" +#FIRMWARE=3D"no" # Specify directory to pull from -# FIRMWARE_DIR=3D"/lib/firmware" +#FIRMWARE_DIR=3D"/lib/firmware" # Specify specific firmware files to include. This overrides FIRMWARE_DI= R -# FIRMWARE_FILES=3D"" +#FIRMWARE_FILES=3D"" =20 # Enable disklabel support (copies blkid to initrd) DISKLABEL=3D"yes" =20 # Add new kernel to grub? -# BOOTLOADER=3D"grub" +#BOOTLOADER=3D"grub" =20 # Enable splashutils in early space (initrd). Default is "no". -# SPLASH=3D"yes" +#SPLASH=3D"yes" =20 # Use this splash theme. If commented out - the "default" name theme is = used. # Also, SPLASH=3D"yes" needs to be enabled for this one to one work. # This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in ea= rly space). -# SPLASH_THEME=3D"gentoo" +#SPLASH_THEME=3D"gentoo" =20 =20 # =3D=3D=3D=3D=3D=3D=3D=3D=3DKeymap Settings=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -126,34 +126,34 @@ DISKLABEL=3D"yes" # =3D=3D=3D=3D=3D=3D=3D=3D=3DLow Level Compile Settings=3D=3D=3D=3D=3D=3D= =3D=3D=3D # # GNU Make to use for kernel. See also the --kernel-make command line o= ption. -# KERNEL_MAKE=3D"make" +#KERNEL_MAKE=3D"make" =20 # Compiler to use for the kernel (e.g. distcc). See also the --kernel-c= c # command line option. -# KERNEL_CC=3D"gcc" +#KERNEL_CC=3D"gcc" =20 # Assembler to use for the kernel. See also the --kernel-as command lin= e # option. -# KERNEL_AS=3D"as" +#KERNEL_AS=3D"as" =20 # Linker to use for the kernel. See also the --kernel-ld command line o= ption. -# KERNEL_LD=3D"ld" +#KERNEL_LD=3D"ld" =20 # GNU Make to use for the utilities. See also the --utils-make command = line # option. -# UTILS_MAKE=3D"make" +#UTILS_MAKE=3D"make" =20 # Compiler to use for the utilities (e.g. distcc). See also the --utils= -cc # command line option. -# UTILS_CC=3D"gcc" +#UTILS_CC=3D"gcc" =20 # Assembler to use for the utilities. See also the --utils-as command l= ine # option. -# UTILS_AS=3D"as" +#UTILS_AS=3D"as" =20 # Linker to use for the utilities. See also the --utils-ld command line # option. -# UTILS_LD=3D"ld" +#UTILS_LD=3D"ld" =20 =20 # Common prefix of cros compile commands @@ -171,7 +171,7 @@ DISKLABEL=3D"yes" # %%CACHE%% - Final determined cache location =20 # Set genkernel's temporary work directory. Default is /var/tmp/genkern= el -# TMPDIR=3D"/var/tmp/genkernel" +#TMPDIR=3D"/var/tmp/genkernel" =20 # Set the boot directory, default is /boot #BOOTDIR=3D"/boot" @@ -194,7 +194,7 @@ LOGLEVEL=3D1 DEFAULT_KERNEL_SOURCE=3D"/usr/src/linux" # Default kernel config (only use to override using # arch/%%ARCH%%/kernel-config-${VER}.${PAT} !) -# DEFAULT_KERNEL_CONFIG=3D"${GK_SHARE}/arch/%%ARCH%%/kernel-config" +#DEFAULT_KERNEL_CONFIG=3D"${GK_SHARE}/arch/%%ARCH%%/kernel-config" =20 # Specifies a user created busybox config #BUSYBOX_CONFIG=3D"/path/to/file" @@ -203,7 +203,7 @@ BUSYBOX_VER=3D"VERSION_BUSYBOX" BUSYBOX_SRCTAR=3D"${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2" BUSYBOX_DIR=3D"busybox-${BUSYBOX_VER}" BUSYBOX_BINCACHE=3D"%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.tar.bz2" -# BUSYBOX_APPLETS=3D"[ ash sh mount uname echo cut cat" +#BUSYBOX_APPLETS=3D"[ ash sh mount uname echo cut cat" =20 DEVICE_MAPPER_VER=3D"VERSION_DMAP" DEVICE_MAPPER_DIR=3D"device-mapper.${DEVICE_MAPPER_VER}"