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 1QSgDF-0007z4-Ix for garchives@archives.gentoo.org; Sat, 04 Jun 2011 02:03:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2BCE1C10A; Sat, 4 Jun 2011 02:03:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 71B4A1C10A for ; Sat, 4 Jun 2011 02:03:24 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E71881B4031 for ; Sat, 4 Jun 2011 02:03:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 22AEE80510 for ; Sat, 4 Jun 2011 02:03:23 +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: <440eab8fcad723aa7de21eca6411b59b94db0fa0.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: maintenance/, / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog genkernel.conf maintenance/docmatcher.py X-VCS-Directories: maintenance/ / X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 440eab8fcad723aa7de21eca6411b59b94db0fa0 Date: Sat, 4 Jun 2011 02:03:23 +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: X-Archives-Hash: 129f720e6083ce5524bceb80df4d6245 commit: 440eab8fcad723aa7de21eca6411b59b94db0fa0 Author: Sebastian Pipping pipping org> AuthorDate: Sat Jun 4 00:44:17 2011 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sat Jun 4 02:02:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D440eab8f Document remaining options inside genkernel.conf, e.g. DOKEYMAPAUTO (bug = #367233) --- ChangeLog | 4 ++ genkernel.conf | 108 +++++++++++++++++++++++++++++++++++++++= ++++++ maintenance/docmatcher.py | 6 +++ 3 files changed, 118 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8dcc35..b5aba8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ =20 + 04 Jun 2011; Sebastian Pipping genkernel.conf, + maintenance/docmatcher.py: + Document remaining options inside genkiernel.conf (bug #367233) + 01 Jun 2011; Sebastian Pipping defaults/linuxrc, doc/genkernel.8.txt: Document option lvmraid=3D and make it imply dolvm (bug #153502) diff --git a/genkernel.conf b/genkernel.conf index a5988da..420eb93 100644 --- a/genkernel.conf +++ b/genkernel.conf @@ -42,6 +42,9 @@ USECOLOR=3D"yes" # Clear build cache dir # CLEAR_CACHE_DIR=3D"yes" =20 +# Clear all tmp files and caches after genkernel has run +#POSTCLEAR=3D"1" + # 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 @@ -85,6 +88,9 @@ USECOLOR=3D"yes" # Add iSCSI support. # ISCSI=3D"no" =20 +# Include support for unionfs +#UNIONFS=3D"1" + # Enable copying of firmware into initramfs # FIRMWARE=3D"no" # Specify directory to pull from @@ -106,6 +112,17 @@ DISKLABEL=3D"yes" # This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in ea= rly space). # SPLASH_THEME=3D"gentoo" =20 + +# =3D=3D=3D=3D=3D=3D=3D=3D=3DKeymap Settings=3D=3D=3D=3D=3D=3D=3D=3D=3D +# +# Force keymap selection at boot +#DOKEYMAPAUTO=3D"yes" + + +# Disables keymap selection support +#KEYMAP=3D"0" + + # =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. @@ -138,6 +155,16 @@ DISKLABEL=3D"yes" # option. # UTILS_LD=3D"ld" =20 + +# Common prefix of cros compile commands +#UTILS_CROSS_COMPILE=3D"x86_64-pc-linux-gnu" + + +# Value of CROSS_COMPILE utils variable +# during kernel compilation +#KERNEL_CROSS_COMPILE=3D"x86_64-pc-linux-gnu" + + # =3D=3D=3D=3D=3D=3D=3D=3D=3DGENKERNEL LOCATION CONFIGURATION=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D # Variables: # %%ARCH%% - Final determined architecture @@ -161,12 +188,17 @@ LOGFILE=3D"/var/log/genkernel.log" # Debug Level LOGLEVEL=3D1 =20 +# =3D=3D=3D=3D=3D=3D=3D=3D=3DCOMPILED UTILS CONFIGURATION=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D +# # Default location of kernel source 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" =20 +# Specifies a user created busybox config +#BUSYBOX_CONFIG=3D"/path/to/file" + BUSYBOX_VER=3D"VERSION_BUSYBOX" BUSYBOX_SRCTAR=3D"${DISTDIR}/busybox-${BUSYBOX_VER}.tar.bz2" BUSYBOX_DIR=3D"busybox-${BUSYBOX_VER}" @@ -217,3 +249,79 @@ GPG_VER=3D"VERSION_GPG" GPG_DIR=3D"gnupg-${GPG_VER}" GPG_SRCTAR=3D"${DISTDIR}/gnupg-${GPG_VER}.tar.bz2" GPG_BINCACHE=3D"%%CACHE%%/gnupg-${GPG_VER}-%%ARCH%%.bz2" + + +# =3D=3D=3D=3D=3D=3D=3D=3D=3DMISC KERNEL CONFIGURATION=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D +# +# Tag the kernel and ramdisk with a name: +# If not defined the option defaults to +# 'genkernel' +#KNAME=3D"genkernel" + + +# This option is only valid if kerncache is +# defined. If there is a valid kerncache no checks +# will be made against a kernel source tree +#NO_KERNEL_SOURCES=3D"1" + + +# Build a static (monolithic kernel) +#BUILD_STATIC=3D"1" + + +# Make and install kernelz image (PowerPC) +#GENZIMAGE=3D"1" + + +# File to output a .tar.bz2'd kernel contents +# of /lib/modules/ and the kernel config +# NOTE: This is created before the callbacks +# are run! +#KERNCACHE=3D"/path/to/file" + + +# Prefix to kernel module destination, modules +# will be installed in /lib/modules +# (.conf equivalent of --module-prefix=3D) +#INSTALL_MOD_PATH=3D"" + + +# =3D=3D=3D=3D=3D=3D=3D=3D=3DMISC INITRD CONFIGURATION=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D +# +# Copy all kernel modules to the ramdisk +#ALLRAMDISKMODULES=3D"1" + + +# Don't copy any modules to the ramdisk +#NORAMDISKMODULES=3D"1" + + +# File to output a .tar.bz2'd kernel and ramdisk: +# No modules outside of the ramdisk will be +# included... +#MINKERNPACKAGE=3D"/path/to/file.bz2" + + +# File to output a .tar.bz2'd modules after the +# callbacks have run +#MODULESPACKAGE=3D"/path/to/file.bz2" + + +# Directory structure to include in the initramfs, +# only available on >=3D2.6 kernels +#INITRAMFS_OVERLAY=3D"" + + +# Build the generated initramfs into the kernel instead of +# keeping it as a separate file +#INTEGRATED_INITRAMFS=3D"1" + + +# Create a self-contained env in the initramfs +#NETBOOT=3D"1" + + +# =3D=3D=3D=3D=3D=3D=3D=3D=3DMISC BOOT CONFIGURATION=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D +# +# Specify a default for real_root=3D +#REAL_ROOT=3D"/dev/one/two/gentoo" diff --git a/maintenance/docmatcher.py b/maintenance/docmatcher.py index f215c5a..848774a 100644 --- a/maintenance/docmatcher.py +++ b/maintenance/docmatcher.py @@ -14,6 +14,10 @@ NON_VARIABLES =3D ('UTF', 'USE', 'TCP', 'SMP', 'PXE', = 'PPC', 'MAC', 'TFTP', 'SYSTEM', 'SPARC', 'RAID', 'LABEL', 'PROMPT', 'KERNEL', 'GRP', 'DOCTYPE', 'DHCP', 'DEFAULT', 'ATARAID', 'APPEND') =20 +NON_CONFIG_VARIABLES =3D ('BUILD_KERNEL', 'BUILD_MODULES', 'BUILD_RAMDIS= K', + 'TERM_COLUMNS', 'TERM_LINES', 'SPLASH_RES', 'TEMP') + + EXTRA_VARIABLES =3D ['ARCH_OVERRIDE', 'BOOTLOADER', 'CLEAR_CACHE_DIR', '= DEFAULT_KERNEL_SOURCE', 'DISTDIR', 'GK_SHARE', 'BUSYBOX_APPLETS'] for app in ('DEVICE_MAPPER', 'UNIONFS_FUSE', 'BUSYBOX', 'DMRAID', 'LVM',= 'ISCSI', 'FUSE', 'GPG', 'MDADM'): for prop in ('DIR', 'SRCTAR', 'VER'): @@ -67,6 +71,8 @@ def exract_gen_cmdline_sh(): var_name =3D match.group(1) if var_name.startswith('CMD_'): continue + if var_name in NON_CONFIG_VARIABLES: + continue gen_cmdline_sh_variables.add(var_name) =20 del parsing_code