* [gentoo-commits] proj/genkernel:master commit in: maintenance/, /
@ 2011-06-04 2:03 Sebastian Pipping
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2011-06-04 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 50525acdfd981bb1c8fc7296c41493b092cacb25
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jun 4 00:29:35 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 02:02:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=50525acd
Make set_config_with_override accept "BOOL"/"STRING" not 1/2
---
gen_determineargs.sh | 114 ++++++++++++++++++++++----------------------
gen_funcs.sh | 4 +-
maintenance/docmatcher.py | 2 +-
3 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e680569..baa8a04 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -68,67 +68,67 @@ get_KV() {
determine_real_args() {
print_info 4 "Resolving config file, command line, and arch default settings."
- # Config File Command Line Arch Default
- # ----------- ------------ ------------
- set_config_with_override 2 DEBUGFILE CMD_DEBUGFILE
- set_config_with_override 2 KERNEL_DIR CMD_KERNEL_DIR "${DEFAULT_KERNEL_SOURCE}"
- set_config_with_override 1 NO_KERNEL_SOURCES CMD_NO_KERNEL_SOURCES
- set_config_with_override 2 KNAME CMD_KERNNAME "genkernel"
-
- set_config_with_override 2 MAKEOPTS CMD_MAKEOPTS "$DEFAULT_MAKEOPTS"
- set_config_with_override 2 KERNEL_MAKE CMD_KERNEL_MAKE "$DEFAULT_KERNEL_MAKE"
- set_config_with_override 2 UTILS_MAKE CMD_UTILS_MAKE "$DEFAULT_UTILS_MAKE"
- set_config_with_override 2 KERNEL_CC CMD_KERNEL_CC "$DEFAULT_KERNEL_CC"
- set_config_with_override 2 KERNEL_LD CMD_KERNEL_LD "$DEFAULT_KERNEL_LD"
- set_config_with_override 2 KERNEL_AS CMD_KERNEL_AS "$DEFAULT_KERNEL_AS"
- set_config_with_override 2 UTILS_CC CMD_UTILS_CC "$DEFAULT_UTILS_CC"
- set_config_with_override 2 UTILS_LD CMD_UTILS_LD "$DEFAULT_UTILS_LD"
- set_config_with_override 2 UTILS_AS CMD_UTILS_AS "$DEFAULT_UTILS_AS"
-
- set_config_with_override 2 KERNEL_CROSS_COMPILE CMD_KERNEL_CROSS_COMPILE
- set_config_with_override 2 UTILS_CROSS_COMPILE CMD_UTILS_CROSS_COMPILE
- set_config_with_override 2 BOOTDIR CMD_BOOTDIR "/boot"
-
- set_config_with_override 1 SPLASH CMD_SPLASH
- set_config_with_override 1 POSTCLEAR CMD_POSTCLEAR
- set_config_with_override 1 MRPROPER CMD_MRPROPER
- set_config_with_override 1 MENUCONFIG CMD_MENUCONFIG
- set_config_with_override 1 CLEAN CMD_CLEAN
-
- set_config_with_override 2 MINKERNPACKAGE CMD_MINKERNPACKAGE
- set_config_with_override 2 MODULESPACKAGE CMD_MODULESPACKAGE
- set_config_with_override 2 KERNCACHE CMD_KERNCACHE
- set_config_with_override 1 NORAMDISKMODULES CMD_NORAMDISKMODULES
- set_config_with_override 1 ALLRAMDISKMODULES CMD_ALLRAMDISKMODULES
- set_config_with_override 2 INITRAMFS_OVERLAY CMD_INITRAMFS_OVERLAY
- set_config_with_override 1 MOUNTBOOT CMD_MOUNTBOOT
- set_config_with_override 1 BUILD_STATIC CMD_STATIC
- set_config_with_override 1 SAVE_CONFIG CMD_SAVE_CONFIG
- set_config_with_override 1 SYMLINK CMD_SYMLINK
- set_config_with_override 2 INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH
- set_config_with_override 1 OLDCONFIG CMD_OLDCONFIG
- set_config_with_override 1 LVM CMD_LVM
- set_config_with_override 1 EVMS CMD_EVMS
- set_config_with_override 1 DMRAID CMD_DMRAID
- set_config_with_override 1 ISCSI CMD_ISCSI
- set_config_with_override 1 BUSYBOX CMD_BUSYBOX "yes"
- set_config_with_override 1 UNIONFS CMD_UNIONFS
- set_config_with_override 1 NETBOOT CMD_NETBOOT
- set_config_with_override 2 REAL_ROOT CMD_REAL_ROOT
- set_config_with_override 1 DISKLABEL CMD_DISKLABEL
- set_config_with_override 1 LUKS CMD_LUKS
- set_config_with_override 1 GPG CMD_GPG
- set_config_with_override 1 MDADM CMD_MDADM
- set_config_with_override 2 MDADM_CONFIG CMD_MDADM_CONFIG
- set_config_with_override 1 MULTIPATH CMD_MULTIPATH
- set_config_with_override 1 FIRMWARE CMD_FIRMWARE
- set_config_with_override 2 FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware"
- set_config_with_override 2 FIRMWARE_FILES CMD_FIRMWARE_FILES
- set_config_with_override 1 INTEGRATED_INITRAMFS CMD_INTEGRATED_INITRAMFS
- set_config_with_override 1 GENZIMAGE CMD_GENZIMAGE
- set_config_with_override 1 KEYMAP CMD_KEYMAP "yes"
- set_config_with_override 1 DOKEYMAPAUTO CMD_DOKEYMAPAUTO
- set_config_with_override 2 BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG
+ # Dest / Config File Command Line Arch Default
+ # ------------------ ------------ ------------
+ set_config_with_override STRING DEBUGFILE CMD_DEBUGFILE
+ set_config_with_override STRING KERNEL_DIR CMD_KERNEL_DIR "${DEFAULT_KERNEL_SOURCE}"
+ set_config_with_override BOOL NO_KERNEL_SOURCES CMD_NO_KERNEL_SOURCES
+ set_config_with_override STRING KNAME CMD_KERNNAME "genkernel"
+
+ set_config_with_override STRING MAKEOPTS CMD_MAKEOPTS "$DEFAULT_MAKEOPTS"
+ set_config_with_override STRING KERNEL_MAKE CMD_KERNEL_MAKE "$DEFAULT_KERNEL_MAKE"
+ set_config_with_override STRING UTILS_MAKE CMD_UTILS_MAKE "$DEFAULT_UTILS_MAKE"
+ set_config_with_override STRING KERNEL_CC CMD_KERNEL_CC "$DEFAULT_KERNEL_CC"
+ set_config_with_override STRING KERNEL_LD CMD_KERNEL_LD "$DEFAULT_KERNEL_LD"
+ set_config_with_override STRING KERNEL_AS CMD_KERNEL_AS "$DEFAULT_KERNEL_AS"
+ set_config_with_override STRING UTILS_CC CMD_UTILS_CC "$DEFAULT_UTILS_CC"
+ set_config_with_override STRING UTILS_LD CMD_UTILS_LD "$DEFAULT_UTILS_LD"
+ set_config_with_override STRING UTILS_AS CMD_UTILS_AS "$DEFAULT_UTILS_AS"
+
+ set_config_with_override STRING KERNEL_CROSS_COMPILE CMD_KERNEL_CROSS_COMPILE
+ set_config_with_override STRING UTILS_CROSS_COMPILE CMD_UTILS_CROSS_COMPILE
+ set_config_with_override STRING BOOTDIR CMD_BOOTDIR "/boot"
+
+ set_config_with_override BOOL SPLASH CMD_SPLASH
+ set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR
+ set_config_with_override BOOL MRPROPER CMD_MRPROPER
+ set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG
+ set_config_with_override BOOL CLEAN CMD_CLEAN
+
+ set_config_with_override STRING MINKERNPACKAGE CMD_MINKERNPACKAGE
+ set_config_with_override STRING MODULESPACKAGE CMD_MODULESPACKAGE
+ set_config_with_override STRING KERNCACHE CMD_KERNCACHE
+ set_config_with_override BOOL NORAMDISKMODULES CMD_NORAMDISKMODULES
+ set_config_with_override BOOL ALLRAMDISKMODULES CMD_ALLRAMDISKMODULES
+ set_config_with_override STRING INITRAMFS_OVERLAY CMD_INITRAMFS_OVERLAY
+ set_config_with_override BOOL MOUNTBOOT CMD_MOUNTBOOT
+ set_config_with_override BOOL BUILD_STATIC CMD_STATIC
+ set_config_with_override BOOL SAVE_CONFIG CMD_SAVE_CONFIG
+ set_config_with_override BOOL SYMLINK CMD_SYMLINK
+ set_config_with_override STRING INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH
+ set_config_with_override BOOL OLDCONFIG CMD_OLDCONFIG
+ set_config_with_override BOOL LVM CMD_LVM
+ set_config_with_override BOOL EVMS CMD_EVMS
+ set_config_with_override BOOL DMRAID CMD_DMRAID
+ set_config_with_override BOOL ISCSI CMD_ISCSI
+ set_config_with_override BOOL BUSYBOX CMD_BUSYBOX "yes"
+ set_config_with_override BOOL UNIONFS CMD_UNIONFS
+ set_config_with_override BOOL NETBOOT CMD_NETBOOT
+ set_config_with_override STRING REAL_ROOT CMD_REAL_ROOT
+ set_config_with_override BOOL DISKLABEL CMD_DISKLABEL
+ set_config_with_override BOOL LUKS CMD_LUKS
+ set_config_with_override BOOL GPG CMD_GPG
+ set_config_with_override BOOL MDADM CMD_MDADM
+ set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG
+ set_config_with_override BOOL MULTIPATH CMD_MULTIPATH
+ set_config_with_override BOOL FIRMWARE CMD_FIRMWARE
+ set_config_with_override STRING FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware"
+ set_config_with_override STRING FIRMWARE_FILES CMD_FIRMWARE_FILES
+ set_config_with_override BOOL INTEGRATED_INITRAMFS CMD_INTEGRATED_INITRAMFS
+ set_config_with_override BOOL GENZIMAGE CMD_GENZIMAGE
+ set_config_with_override BOOL KEYMAP CMD_KEYMAP "yes"
+ set_config_with_override BOOL DOKEYMAPAUTO CMD_DOKEYMAPAUTO
+ set_config_with_override STRING BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG
BOOTDIR=`arch_replace "${BOOTDIR}"`
BOOTDIR=${BOOTDIR%/} # Remove any trailing slash
diff --git a/gen_funcs.sh b/gen_funcs.sh
index beff660..a5cd5df 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -444,7 +444,7 @@ set_config_with_override() {
# Syntax check the function arguments.
#
case "$VarType" in
- 1|2)
+ BOOL|STRING)
;;
*)
gen_die "Illegal variable type \"$VarType\" passed to set_config_with_override()."
@@ -480,7 +480,7 @@ set_config_with_override() {
fi
fi
- if [ "${VarType}" = "1" ]
+ if [ "${VarType}" = BOOL ]
then
if isTrue "${Result}"
then
diff --git a/maintenance/docmatcher.py b/maintenance/docmatcher.py
index 9e82c53..f215c5a 100644
--- a/maintenance/docmatcher.py
+++ b/maintenance/docmatcher.py
@@ -166,7 +166,7 @@ def extract_gen_determineargs_sh():
f.close()
gen_determineargs_sh_variables = set()
- for match in re.finditer('set_config_with_override\s+[0-9]+\s+([A-Z_]+)', gen_determineargs_sh):
+ for match in re.finditer('set_config_with_override\s+(?:BOOL|STRING)\s+([A-Z_]+)', gen_determineargs_sh):
var_name = match.group(1)
gen_determineargs_sh_variables.add(var_name)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/genkernel:master commit in: maintenance/, /
@ 2011-06-04 2:03 Sebastian Pipping
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2011-06-04 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 440eab8fcad723aa7de21eca6411b59b94db0fa0
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jun 4 00:44:17 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 02:02:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=440eab8f
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$
+ 04 Jun 2011; Sebastian Pipping <sping@gentoo.org> genkernel.conf,
+ maintenance/docmatcher.py:
+ Document remaining options inside genkiernel.conf (bug #367233)
+
01 Jun 2011; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc,
doc/genkernel.8.txt:
Document option lvmraid= 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="yes"
# Clear build cache dir
# CLEAR_CACHE_DIR="yes"
+# Clear all tmp files and caches after genkernel has run
+#POSTCLEAR="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="yes"
# Add iSCSI support.
# ISCSI="no"
+# Include support for unionfs
+#UNIONFS="1"
+
# Enable copying of firmware into initramfs
# FIRMWARE="no"
# Specify directory to pull from
@@ -106,6 +112,17 @@ DISKLABEL="yes"
# This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).
# SPLASH_THEME="gentoo"
+
+# =========Keymap Settings=========
+#
+# Force keymap selection at boot
+#DOKEYMAPAUTO="yes"
+
+
+# Disables keymap selection support
+#KEYMAP="0"
+
+
# =========Low Level Compile Settings=========
#
# GNU Make to use for kernel. See also the --kernel-make command line option.
@@ -138,6 +155,16 @@ DISKLABEL="yes"
# option.
# UTILS_LD="ld"
+
+# Common prefix of cros compile commands
+#UTILS_CROSS_COMPILE="x86_64-pc-linux-gnu"
+
+
+# Value of CROSS_COMPILE utils variable
+# during kernel compilation
+#KERNEL_CROSS_COMPILE="x86_64-pc-linux-gnu"
+
+
# =========GENKERNEL LOCATION CONFIGURATION============
# Variables:
# %%ARCH%% - Final determined architecture
@@ -161,12 +188,17 @@ LOGFILE="/var/log/genkernel.log"
# Debug Level
LOGLEVEL=1
+# =========COMPILED UTILS CONFIGURATION============
+#
# Default location of kernel source
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"
+# 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}"
@@ -217,3 +249,79 @@ 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"
+
+
+# =========MISC KERNEL CONFIGURATION============
+#
+# Tag the kernel and ramdisk with a name:
+# If not defined the option defaults to
+# 'genkernel'
+#KNAME="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="1"
+
+
+# Build a static (monolithic kernel)
+#BUILD_STATIC="1"
+
+
+# Make and install kernelz image (PowerPC)
+#GENZIMAGE="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="/path/to/file"
+
+
+# Prefix to kernel module destination, modules
+# will be installed in <prefix>/lib/modules
+# (.conf equivalent of --module-prefix=<dir>)
+#INSTALL_MOD_PATH=""
+
+
+# =========MISC INITRD CONFIGURATION============
+#
+# Copy all kernel modules to the ramdisk
+#ALLRAMDISKMODULES="1"
+
+
+# Don't copy any modules to the ramdisk
+#NORAMDISKMODULES="1"
+
+
+# File to output a .tar.bz2'd kernel and ramdisk:
+# No modules outside of the ramdisk will be
+# included...
+#MINKERNPACKAGE="/path/to/file.bz2"
+
+
+# File to output a .tar.bz2'd modules after the
+# callbacks have run
+#MODULESPACKAGE="/path/to/file.bz2"
+
+
+# Directory structure to include in the initramfs,
+# only available on >=2.6 kernels
+#INITRAMFS_OVERLAY=""
+
+
+# Build the generated initramfs into the kernel instead of
+# keeping it as a separate file
+#INTEGRATED_INITRAMFS="1"
+
+
+# Create a self-contained env in the initramfs
+#NETBOOT="1"
+
+
+# =========MISC BOOT CONFIGURATION============
+#
+# Specify a default for real_root=
+#REAL_ROOT="/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 = ('UTF', 'USE', 'TCP', 'SMP', 'PXE', 'PPC', 'MAC',
'TFTP', 'SYSTEM', 'SPARC', 'RAID', 'LABEL', 'PROMPT', 'KERNEL',
'GRP', 'DOCTYPE', 'DHCP', 'DEFAULT', 'ATARAID', 'APPEND')
+NON_CONFIG_VARIABLES = ('BUILD_KERNEL', 'BUILD_MODULES', 'BUILD_RAMDISK',
+ 'TERM_COLUMNS', 'TERM_LINES', 'SPLASH_RES', 'TEMP')
+
+
EXTRA_VARIABLES = ['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 = match.group(1)
if var_name.startswith('CMD_'):
continue
+ if var_name in NON_CONFIG_VARIABLES:
+ continue
gen_cmdline_sh_variables.add(var_name)
del parsing_code
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-04 2:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-04 2:03 [gentoo-commits] proj/genkernel:master commit in: maintenance/, / Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2011-06-04 2:03 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox