From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/genkernel:master commit in: maintenance/, /
Date: Sat, 4 Jun 2011 02:03:22 +0000 (UTC) [thread overview]
Message-ID: <50525acdfd981bb1c8fc7296c41493b092cacb25.sping@gentoo> (raw)
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)
next reply other threads:[~2011-06-04 2:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-04 2:03 Sebastian Pipping [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-06-04 2:03 [gentoo-commits] proj/genkernel:master commit in: maintenance/, / Sebastian Pipping
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50525acdfd981bb1c8fc7296c41493b092cacb25.sping@gentoo \
--to=sping@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox