Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /
Date: Tue, 26 Mar 2019 08:07:23
Message-Id: 1553587444.ce40b55a84742a694ad8a02503fbc980e8ff8a63.whissi@gentoo
1 commit: ce40b55a84742a694ad8a02503fbc980e8ff8a63
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 26 06:04:25 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 26 08:04:04 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ce40b55a
7
8 Initialize booleans with their default value for clarity
9
10 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
11
12 gen_determineargs.sh | 62 ++++++++++++++++++++++++++--------------------------
13 genkernel.conf | 20 ++++++++---------
14 2 files changed, 41 insertions(+), 41 deletions(-)
15
16 diff --git a/gen_determineargs.sh b/gen_determineargs.sh
17 index 1b4a08b..e955540 100755
18 --- a/gen_determineargs.sh
19 +++ b/gen_determineargs.sh
20 @@ -99,58 +99,58 @@ determine_real_args() {
21
22 set_config_with_override BOOL SPLASH CMD_SPLASH "no"
23 set_config_with_override BOOL CLEAR_CACHEDIR CMD_CLEAR_CACHEDIR "no"
24 - set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR
25 - set_config_with_override BOOL MRPROPER CMD_MRPROPER
26 - set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG
27 - set_config_with_override BOOL GCONFIG CMD_GCONFIG
28 - set_config_with_override BOOL NCONFIG CMD_NCONFIG
29 - set_config_with_override BOOL XCONFIG CMD_XCONFIG
30 - set_config_with_override BOOL CLEAN CMD_CLEAN
31 + set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR "no"
32 + set_config_with_override BOOL MRPROPER CMD_MRPROPER "yes"
33 + set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG "no"
34 + set_config_with_override BOOL GCONFIG CMD_GCONFIG "no"
35 + set_config_with_override BOOL NCONFIG CMD_NCONFIG "no"
36 + set_config_with_override BOOL XCONFIG CMD_XCONFIG "no"
37 + set_config_with_override BOOL CLEAN CMD_CLEAN "yes"
38
39 set_config_with_override STRING MINKERNPACKAGE CMD_MINKERNPACKAGE
40 set_config_with_override STRING MODULESPACKAGE CMD_MODULESPACKAGE
41 set_config_with_override STRING KERNCACHE CMD_KERNCACHE
42 - set_config_with_override BOOL RAMDISKMODULES CMD_RAMDISKMODULES "yes"
43 - set_config_with_override BOOL ALLRAMDISKMODULES CMD_ALLRAMDISKMODULES
44 + set_config_with_override BOOL RAMDISKMODULES CMD_RAMDISKMODULES "yes"
45 + set_config_with_override BOOL ALLRAMDISKMODULES CMD_ALLRAMDISKMODULES "no"
46 set_config_with_override STRING INITRAMFS_OVERLAY CMD_INITRAMFS_OVERLAY
47 - set_config_with_override BOOL MOUNTBOOT CMD_MOUNTBOOT
48 - set_config_with_override BOOL BUILD_STATIC CMD_STATIC
49 - set_config_with_override BOOL SAVE_CONFIG CMD_SAVE_CONFIG
50 - set_config_with_override BOOL SYMLINK CMD_SYMLINK
51 + set_config_with_override BOOL MOUNTBOOT CMD_MOUNTBOOT "yes"
52 + set_config_with_override BOOL BUILD_STATIC CMD_STATIC "no"
53 + set_config_with_override BOOL SAVE_CONFIG CMD_SAVE_CONFIG "yes"
54 + set_config_with_override BOOL SYMLINK CMD_SYMLINK "no"
55 set_config_with_override STRING INSTALL_MOD_PATH CMD_INSTALL_MOD_PATH
56 - set_config_with_override BOOL OLDCONFIG CMD_OLDCONFIG
57 + set_config_with_override BOOL OLDCONFIG CMD_OLDCONFIG "yes"
58 set_config_with_override BOOL SSH CMD_SSH "no"
59 - set_config_with_override BOOL LVM CMD_LVM
60 - set_config_with_override BOOL DMRAID CMD_DMRAID
61 - set_config_with_override BOOL ISCSI CMD_ISCSI
62 - set_config_with_override BOOL HYPERV CMD_HYPERV
63 + set_config_with_override BOOL LVM CMD_LVM "no"
64 + set_config_with_override BOOL DMRAID CMD_DMRAID "no"
65 + set_config_with_override BOOL ISCSI CMD_ISCSI "no"
66 + set_config_with_override BOOL HYPERV CMD_HYPERV "no"
67 set_config_with_override STRING BOOTLOADER CMD_BOOTLOADER "no"
68 set_config_with_override BOOL BUSYBOX CMD_BUSYBOX "yes"
69 set_config_with_override BOOL NFS CMD_NFS "yes"
70 set_config_with_override STRING MICROCODE CMD_MICROCODE "all"
71 set_config_with_override BOOL MICROCODE_INITRAMFS CMD_MICROCODE_INITRAMFS "yes"
72 - set_config_with_override BOOL UNIONFS CMD_UNIONFS
73 - set_config_with_override BOOL NETBOOT CMD_NETBOOT
74 + set_config_with_override BOOL UNIONFS CMD_UNIONFS "no"
75 + set_config_with_override BOOL NETBOOT CMD_NETBOOT "no"
76 set_config_with_override STRING REAL_ROOT CMD_REAL_ROOT
77 - set_config_with_override BOOL DISKLABEL CMD_DISKLABEL
78 - set_config_with_override BOOL LUKS CMD_LUKS
79 - set_config_with_override BOOL GPG CMD_GPG
80 - set_config_with_override BOOL MDADM CMD_MDADM
81 + set_config_with_override BOOL DISKLABEL CMD_DISKLABEL "yes"
82 + set_config_with_override BOOL LUKS CMD_LUKS "no"
83 + set_config_with_override BOOL GPG CMD_GPG "no"
84 + set_config_with_override BOOL MDADM CMD_MDADM "no"
85 set_config_with_override STRING MDADM_CONFIG CMD_MDADM_CONFIG
86 set_config_with_override BOOL E2FSPROGS CMD_E2FSPROGS "no"
87 set_config_with_override BOOL ZFS CMD_ZFS "$(rootfs_type_is zfs)"
88 set_config_with_override BOOL BTRFS CMD_BTRFS "$(rootfs_type_is btrfs)"
89 - set_config_with_override BOOL VIRTIO CMD_VIRTIO "no"
90 - set_config_with_override BOOL MULTIPATH CMD_MULTIPATH
91 - set_config_with_override BOOL FIRMWARE CMD_FIRMWARE
92 + set_config_with_override BOOL VIRTIO CMD_VIRTIO "no"
93 + set_config_with_override BOOL MULTIPATH CMD_MULTIPATH "no"
94 + set_config_with_override BOOL FIRMWARE CMD_FIRMWARE "no"
95 set_config_with_override STRING FIRMWARE_DIR CMD_FIRMWARE_DIR "/lib/firmware"
96 set_config_with_override STRING FIRMWARE_FILES CMD_FIRMWARE_FILES
97 set_config_with_override BOOL FIRMWARE_INSTALL CMD_FIRMWARE_INSTALL "no"
98 - set_config_with_override BOOL INTEGRATED_INITRAMFS CMD_INTEGRATED_INITRAMFS
99 - set_config_with_override BOOL WRAP_INITRD CMD_WRAP_INITRD
100 - set_config_with_override BOOL GENZIMAGE CMD_GENZIMAGE
101 + set_config_with_override BOOL INTEGRATED_INITRAMFS CMD_INTEGRATED_INITRAMFS "no"
102 + set_config_with_override BOOL WRAP_INITRD CMD_WRAP_INITRD "no"
103 + set_config_with_override BOOL GENZIMAGE CMD_GENZIMAGE "no"
104 set_config_with_override BOOL KEYMAP CMD_KEYMAP "yes"
105 - set_config_with_override BOOL DOKEYMAPAUTO CMD_DOKEYMAPAUTO
106 + set_config_with_override BOOL DOKEYMAPAUTO CMD_DOKEYMAPAUTO "no"
107 set_config_with_override STRING BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG
108 set_config_with_override STRING STRIP_TYPE CMD_STRIP_TYPE "modules"
109 set_config_with_override BOOL INSTALL CMD_INSTALL "yes"
110
111 diff --git a/genkernel.conf b/genkernel.conf
112 index 4574f7c..74e4b04 100644
113 --- a/genkernel.conf
114 +++ b/genkernel.conf
115 @@ -11,41 +11,41 @@
116 #INSTALL="yes"
117
118 # Run 'make oldconfig' before compiling this kernel
119 -OLDCONFIG="yes"
120 +#OLDCONFIG="yes"
121
122 # Run 'make menuconfig' before compiling this kernel
123 -MENUCONFIG="no"
124 +#MENUCONFIG="no"
125
126 # Run 'make gconfig' before compiling this kernel
127 -GCONFIG="no"
128 +#GCONFIG="no"
129
130 # Run 'make nconfig' (ncurses 'menuconfig') before compiling this kernel
131 -NCONFIG="no"
132 +#NCONFIG="no"
133
134 # Run 'make xconfig' before compiling this kernel
135 -XCONFIG="no"
136 +#XCONFIG="no"
137
138 # Run 'make clean' before compilation
139 # If set to NO, implies MRPROPER WILL NOT be run
140 # Also, if clean is NO, it won't copy over any configuration
141 # file, it will use what's there.
142 -CLEAN="yes"
143 +#CLEAN="yes"
144
145 # Run 'make mrproper' before configuration/compilation
146 -MRPROPER="yes"
147 +#MRPROPER="yes"
148
149 # Override the arch detection
150 #ARCH_OVERRIDE="x86"
151
152 # Mount BOOTDIR automatically if it isn't mounted
153 -MOUNTBOOT="yes"
154 +#MOUNTBOOT="yes"
155
156 # Make symlinks in BOOTDIR automatically
157 #SYMLINK="no"
158
159 # Save the new configuration in /etc/kernels upon
160 # successfull compilation
161 -SAVE_CONFIG="yes"
162 +#SAVE_CONFIG="yes"
163
164 # Enable color output in genkernel
165 USECOLOR="yes"
166 @@ -140,7 +140,7 @@ USECOLOR="yes"
167 #FIRMWARE_FILES=""
168
169 # Add disklabel support (copies blkid to initramfs)
170 -DISKLABEL="yes"
171 +#DISKLABEL="yes"
172
173 # Add new kernel to grub
174 # Possible values: empty/"no", "grub", "grub2"