Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: Sun, 12 Jan 2020 14:59:32
Message-Id: 1578699221.66ec240910ffa979fd18fb8528df6660af2d5ee9.whissi@gentoo
1 commit: 66ec240910ffa979fd18fb8528df6660af2d5ee9
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 10 23:33:08 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 10 23:33:41 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=66ec2409
7
8 Style fix: Use curly braces
9
10 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
11
12 gen_bootloader.sh | 4 ++--
13 gen_cmdline.sh | 4 ++--
14 gen_compile.sh | 4 ++--
15 gen_configkernel.sh | 8 ++++----
16 gen_determineargs.sh | 30 +++++++++++++++---------------
17 gen_funcs.sh | 32 ++++++++++++++++----------------
18 genkernel | 2 +-
19 7 files changed, 42 insertions(+), 42 deletions(-)
20
21 diff --git a/gen_bootloader.sh b/gen_bootloader.sh
22 index 68eb721..06fb7ba 100755
23 --- a/gen_bootloader.sh
24 +++ b/gen_bootloader.sh
25 @@ -70,7 +70,7 @@ set_bootloader_grub() {
26 local GRUB_BOOTFS
27 if [ -n "${BOOTFS}" ]
28 then
29 - GRUB_BOOTFS=$BOOTFS
30 + GRUB_BOOTFS=${BOOTFS}
31 else
32 GRUB_BOOTFS=$(set_bootloader_read_fstab | cut -d' ' -f2)
33 fi
34 @@ -101,7 +101,7 @@ set_bootloader_grub() {
35
36 # Add grub configuration to grub.conf
37 echo "# Genkernel generated entry, see GRUB documentation for details" >> ${GRUB_CONF}
38 - echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF}
39 + echo "title=Gentoo Linux (${KV})" >> ${GRUB_CONF}
40 printf "%b\n" "\tkernel /${GK_FILENAME_KERNEL} root=${GRUB_ROOTFS}" >> ${GRUB_CONF}
41 if isTrue "${BUILD_RAMDISK}"
42 then
43
44 diff --git a/gen_cmdline.sh b/gen_cmdline.sh
45 index c33f738..025187f 100755
46 --- a/gen_cmdline.sh
47 +++ b/gen_cmdline.sh
48 @@ -273,7 +273,7 @@ usage() {
49 parse_optbool() {
50 local opt=${1/--no-*/no} # false
51 opt=${opt/--*/yes} # true
52 - echo $opt
53 + echo ${opt}
54 }
55
56 parse_cmdline() {
57 @@ -394,7 +394,7 @@ parse_cmdline() {
58 ;;
59 --microcode=*)
60 CMD_MICROCODE="${*#*=}"
61 - print_info 3 "CMD_MICROCODE: $CMD_MICROCODE"
62 + print_info 3 "CMD_MICROCODE: ${CMD_MICROCODE}"
63 ;;
64 --microcode-initramfs|--no-microcode-initramfs)
65 CMD_MICROCODE_INITRAMFS=$(parse_optbool "$*")
66
67 diff --git a/gen_compile.sh b/gen_compile.sh
68 index 4942a0c..3f10adb 100755
69 --- a/gen_compile.sh
70 +++ b/gen_compile.sh
71 @@ -294,7 +294,7 @@ compile_kernel() {
72 elif isTrue "${FIRMWARE_INSTALL}"
73 then
74 local cfg_CONFIG_FIRMWARE_IN_KERNEL=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" CONFIG_FIRMWARE_IN_KERNEL)
75 - if isTrue "$cfg_CONFIG_FIRMWARE_IN_KERNEL"
76 + if isTrue "${cfg_CONFIG_FIRMWARE_IN_KERNEL}"
77 then
78 print_info 1 "$(get_indent 1)>> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y) ..."
79 else
80 @@ -391,7 +391,7 @@ determine_busybox_config_file() {
81
82 if [ -f "${f}" ]
83 then
84 - BUSYBOX_CONFIG="$f"
85 + BUSYBOX_CONFIG="${f}"
86 break
87 else
88 print_info 3 "$(get_indent 3)- '${f}' not found; Skipping ..."
89
90 diff --git a/gen_configkernel.sh b/gen_configkernel.sh
91 index dd47df6..6943050 100755
92 --- a/gen_configkernel.sh
93 +++ b/gen_configkernel.sh
94 @@ -79,11 +79,11 @@ determine_kernel_config_file() {
95
96 if [ -f "${f}" ]
97 then
98 - if grep -sq THIS_CONFIG_IS_BROKEN "$f"
99 + if grep -sq THIS_CONFIG_IS_BROKEN "${f}"
100 then
101 print_info 2 "$(get_indent 1)- '${f}' is marked as broken; Skipping ..."
102 else
103 - KERNEL_CONFIG="$f" && break
104 + KERNEL_CONFIG="${f}" && break
105 fi
106 else
107 print_info 2 "$(get_indent 1)- '${f}' not found; Skipping ..."
108 @@ -845,12 +845,12 @@ config_kernel() {
109 local k
110 for k in "${kconfigs_microcode[@]}"
111 do
112 - local cfg=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "$k")
113 + local cfg=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "${k}")
114 case "${cfg}" in
115 y) ;; # Do nothing
116 *) cfg='y'
117 esac
118 - kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "${cfg}"
119 + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "${k}" "${cfg}"
120 done
121
122 required_kernel_options+=( 'CONFIG_MICROCODE' )
123
124 diff --git a/gen_determineargs.sh b/gen_determineargs.sh
125 index e4aea0c..616f4fe 100755
126 --- a/gen_determineargs.sh
127 +++ b/gen_determineargs.sh
128 @@ -72,8 +72,8 @@ determine_KV() {
129 fi
130 fi
131
132 - KV_MAJOR=$(echo $KV | cut -f1 -d.)
133 - KV_MINOR=$(echo $KV | cut -f2 -d.)
134 + KV_MAJOR=$(echo ${KV} | cut -f1 -d.)
135 + KV_MINOR=$(echo ${KV} | cut -f2 -d.)
136 KV_NUMERIC=$((${KV_MAJOR} * 1000 + ${KV_MINOR}))
137
138 if [ -n "${old_KV}" -a "${KV}" != "${old_KV}" ]
139 @@ -283,20 +283,20 @@ determine_real_args() {
140 set_config_with_override STRING CHECK_FREE_DISK_SPACE_BOOTDIR CMD_CHECK_FREE_DISK_SPACE_BOOTDIR
141 set_config_with_override STRING CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR CMD_CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR
142
143 - set_config_with_override STRING COMPRESS_INITRD CMD_COMPRESS_INITRD "$DEFAULT_COMPRESS_INITRD"
144 - set_config_with_override STRING COMPRESS_INITRD_TYPE CMD_COMPRESS_INITRD_TYPE "$DEFAULT_COMPRESS_INITRD_TYPE"
145 - set_config_with_override STRING MAKEOPTS CMD_MAKEOPTS "$DEFAULT_MAKEOPTS"
146 + set_config_with_override STRING COMPRESS_INITRD CMD_COMPRESS_INITRD "${DEFAULT_COMPRESS_INITRD}"
147 + set_config_with_override STRING COMPRESS_INITRD_TYPE CMD_COMPRESS_INITRD_TYPE "${DEFAULT_COMPRESS_INITRD_TYPE}"
148 + set_config_with_override STRING MAKEOPTS CMD_MAKEOPTS "${DEFAULT_MAKEOPTS}"
149 set_config_with_override STRING NICE CMD_NICE "10"
150 - set_config_with_override STRING KERNEL_MAKE CMD_KERNEL_MAKE "$DEFAULT_KERNEL_MAKE"
151 - set_config_with_override STRING UTILS_CFLAGS CMD_UTILS_CFLAGS "$DEFAULT_UTILS_CFLAGS"
152 - set_config_with_override STRING UTILS_MAKE CMD_UTILS_MAKE "$DEFAULT_UTILS_MAKE"
153 - set_config_with_override STRING KERNEL_CC CMD_KERNEL_CC "$DEFAULT_KERNEL_CC"
154 - set_config_with_override STRING KERNEL_LD CMD_KERNEL_LD "$DEFAULT_KERNEL_LD"
155 - set_config_with_override STRING KERNEL_AS CMD_KERNEL_AS "$DEFAULT_KERNEL_AS"
156 - set_config_with_override STRING UTILS_CC CMD_UTILS_CC "$DEFAULT_UTILS_CC"
157 - set_config_with_override STRING UTILS_CXX CMD_UTILS_CXX "$DEFAULT_UTILS_CXX"
158 - set_config_with_override STRING UTILS_LD CMD_UTILS_LD "$DEFAULT_UTILS_LD"
159 - set_config_with_override STRING UTILS_AS CMD_UTILS_AS "$DEFAULT_UTILS_AS"
160 + set_config_with_override STRING KERNEL_MAKE CMD_KERNEL_MAKE "${DEFAULT_KERNEL_MAKE}"
161 + set_config_with_override STRING UTILS_CFLAGS CMD_UTILS_CFLAGS "${DEFAULT_UTILS_CFLAGS}"
162 + set_config_with_override STRING UTILS_MAKE CMD_UTILS_MAKE "${DEFAULT_UTILS_MAKE}"
163 + set_config_with_override STRING KERNEL_CC CMD_KERNEL_CC "${DEFAULT_KERNEL_CC}"
164 + set_config_with_override STRING KERNEL_LD CMD_KERNEL_LD "${DEFAULT_KERNEL_LD}"
165 + set_config_with_override STRING KERNEL_AS CMD_KERNEL_AS "${DEFAULT_KERNEL_AS}"
166 + set_config_with_override STRING UTILS_CC CMD_UTILS_CC "${DEFAULT_UTILS_CC}"
167 + set_config_with_override STRING UTILS_CXX CMD_UTILS_CXX "${DEFAULT_UTILS_CXX}"
168 + set_config_with_override STRING UTILS_LD CMD_UTILS_LD "${DEFAULT_UTILS_LD}"
169 + set_config_with_override STRING UTILS_AS CMD_UTILS_AS "${DEFAULT_UTILS_AS}"
170
171 set_config_with_override STRING CROSS_COMPILE CMD_CROSS_COMPILE
172 set_config_with_override STRING BOOTDIR CMD_BOOTDIR "/boot"
173
174 diff --git a/gen_funcs.sh b/gen_funcs.sh
175 index 1f574ad..a19cb88 100755
176 --- a/gen_funcs.sh
177 +++ b/gen_funcs.sh
178 @@ -1537,20 +1537,20 @@ set_default_gk_trap() {
179 # - JRG
180 #
181 set_config_with_override() {
182 - local VarType=$1
183 - local CfgVar=$2
184 - local OverrideVar=$3
185 - local Default=$4
186 + local VarType=${1}
187 + local CfgVar=${2}
188 + local OverrideVar=${3}
189 + local Default=${4}
190 local Result
191
192 #
193 # Syntax check the function arguments.
194 #
195 - case "$VarType" in
196 + case "${VarType}" in
197 BOOL|STRING)
198 ;;
199 *)
200 - gen_die "Illegal variable type \"$VarType\" passed to set_config_with_override()."
201 + gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Variable type \"${VarType}\" is unknown!"
202 ;;
203 esac
204
205 @@ -1559,9 +1559,9 @@ set_config_with_override() {
206 Result=${!OverrideVar}
207 if [ -n "${!CfgVar}" ]
208 then
209 - print_info 5 " $CfgVar overridden on command line to \"$Result\"."
210 + print_info 5 " ${CfgVar} overridden on command line to \"${Result}\"."
211 else
212 - print_info 5 " $CfgVar set on command line to \"$Result\"."
213 + print_info 5 " ${CfgVar} set on command line to \"${Result}\"."
214 fi
215 else
216 if [ -n "${!CfgVar}" ]
217 @@ -1571,18 +1571,18 @@ set_config_with_override() {
218 eval ${OverrideVar}=\"${Result}\" \
219 || small_die "Failed to set variable '${OverrideVar}=${Result}' !"
220
221 - print_info 5 " $CfgVar set in config file to \"${Result}\"."
222 + print_info 5 " ${CfgVar} set in config file to \"${Result}\"."
223 else
224 - if [ -n "$Default" ]
225 + if [ -n "${Default}" ]
226 then
227 Result=${Default}
228 # set OverrideVar to Result, otherwise CMD_* may not be initialized...
229 eval ${OverrideVar}=\"${Result}\" \
230 || small_die "Failed to set variable '${OverrideVar}=${Result}' !"
231
232 - print_info 5 " $CfgVar defaulted to \"${Result}\"."
233 + print_info 5 " ${CfgVar} defaulted to \"${Result}\"."
234 else
235 - print_info 5 " $CfgVar not set."
236 + print_info 5 " ${CfgVar} not set."
237 fi
238 fi
239 fi
240 @@ -1688,7 +1688,7 @@ rootfs_type_is() {
241
242 # It is possible that the awk will return MULTIPLE lines, depending on your
243 # initramfs setup (one of the entries will be 'rootfs').
244 - if awk '($2=="/"){print $3}' /proc/mounts | grep -sq --line-regexp "$fstype" ;
245 + if awk '($2=="/"){print $3}' /proc/mounts | grep -sq --line-regexp "${fstype}"
246 then
247 echo yes
248 else
249 @@ -1854,7 +1854,7 @@ find_kernel_binary() {
250 do
251 if [ -e "${i}" ]
252 then
253 - tmp_kernel_binary=$i
254 + tmp_kernel_binary=${i}
255 break
256 fi
257 done
258 @@ -1889,7 +1889,7 @@ kconfig_set_opt() {
259 then
260 print_info 3 "$(get_indent ${indentlevel}) - Adding option '${optname}' with value '${optval}' to '${kconfig}'..."
261 echo "${optname}=${optval}" >> "${kconfig}" \
262 - || gen_die "Failed to add '${optname}=${optval}' to '$kconfig'"
263 + || gen_die "Failed to add '${optname}=${optval}' to '${kconfig}'"
264
265 [ ! -f "${TEMP}/.kconfig_modified" ] && touch "${TEMP}/.kconfig_modified"
266 elif [[ "${curropt}" != "*#*" && "${curropt#*=}" == "${optval}" ]]
267 @@ -1899,7 +1899,7 @@ kconfig_set_opt() {
268 print_info 3 "$(get_indent ${indentlevel}) - Setting option '${optname}' to '${optval}' in '${kconfig}'..."
269 sed -i "${kconfig}" \
270 -e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
271 - || gen_die "Failed to set '${optname}=${optval}' in '$kconfig'"
272 + || gen_die "Failed to set '${optname}=${optval}' in '${kconfig}'"
273
274 [ ! -f "${KCONFIG_MODIFIED_MARKER}" ] && touch "${KCONFIG_MODIFIED_MARKER}"
275 fi
276
277 diff --git a/genkernel b/genkernel
278 index 127844a..2e0aca9 100755
279 --- a/genkernel
280 +++ b/genkernel
281 @@ -164,7 +164,7 @@ unset _MODULES_LOAD
282 for v in ${override_module_vars}
283 do
284 newvar=override_${v}
285 - print_info 2 "Override $v, default (${!v}), new value (${!newvar})"
286 + print_info 2 "Override ${v}, default (${!v}), new value (${!newvar})"
287 eval "${v}='${!newvar}'"
288 done
289 unset v override_module_vars newvar
Report Message
Find on MARC Find on Google Groups