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 1QSgDA-0007yR-0a for garchives@archives.gentoo.org; Sat, 04 Jun 2011 02:03:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A63E1C11A; 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 E19871C11A for ; Sat, 4 Jun 2011 02:03:23 +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 4E8741B402F 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 A7D508050C for ; Sat, 4 Jun 2011 02:03:22 +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: <50525acdfd981bb1c8fc7296c41493b092cacb25.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: maintenance/, / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_determineargs.sh gen_funcs.sh maintenance/docmatcher.py X-VCS-Directories: maintenance/ / X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 50525acdfd981bb1c8fc7296c41493b092cacb25 Date: Sat, 4 Jun 2011 02:03:22 +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: 84ec4b3e3c05d399e0bbc3e5bf365949 commit: 50525acdfd981bb1c8fc7296c41493b092cacb25 Author: Sebastian Pipping pipping org> AuthorDate: Sat Jun 4 00:29:35 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=3D50525acd 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 set= tings." =20 - # 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_COMPIL= E - 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_INITRAMF= S - 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_SOUR= CES + 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_C= OMPILE + set_config_with_override STRING UTILS_CROSS_COMPILE CMD_UTILS_CROSS_CO= MPILE + 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_NORAMDISKMODUL= ES + set_config_with_override BOOL ALLRAMDISKMODULES CMD_ALLRAMDISKMODU= LES + set_config_with_override STRING INITRAMFS_OVERLAY CMD_INITRAMFS_OVER= LAY + 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_PA= TH + 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_INI= TRAMFS + 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 =20 BOOTDIR=3D`arch_replace "${BOOTDIR}"` BOOTDIR=3D${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 =20 - if [ "${VarType}" =3D "1" ] + if [ "${VarType}" =3D 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() =20 gen_determineargs_sh_variables =3D 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 =3D match.group(1) gen_determineargs_sh_variables.add(var_name) =20