File tree Expand file tree Collapse file tree 1 file changed +15
-1
lines changed Expand file tree Collapse file tree 1 file changed +15
-1
lines changed Original file line number Diff line number Diff line change @@ -15,9 +15,20 @@ if [[ -n "${KERNEL_CONFIG_SNIPPETS:-}" ]]; then
1515 IFS=' ,' read -ra snippets <<< " $KERNEL_CONFIG_SNIPPETS"
1616 for snippet in " ${snippets[@]} " ; do
1717 snippet_file=" $SRCDIR /$snippet "
18- [[ -f " $snippet_file " ]] && cat " $snippet_file " >> " $config_file "
18+ if [[ -f " $snippet_file " ]]; then
19+ cat " $snippet_file " >> " $config_file " || true
20+ fi
1921 done
2022fi
23+ for snippets_var in " ${! KERNEL_CONFIG_SNIPPETS_@ } " ; do
24+ IFS=' ,' read -ra snippets <<< " ${!snippets_var}"
25+ for snippet in " ${snippets[@]} " ; do
26+ snippet_file=" $SRCDIR /$snippet "
27+ if [[ -f " $snippet_file " ]]; then
28+ cat " $snippet_file " >> " $config_file " || true
29+ fi
30+ done
31+ done
2132
2233# Calculate cache key and paths
2334config_hash=$( sha256sum " $config_file " | cut -d' ' -f1 | cut -c1-12)
4354 mkosi-chroot --chdir " /build/kernel-${KERNEL_VERSION} " make olddefconfig
4455 mkosi-chroot --chdir " /build/kernel-${KERNEL_VERSION} " make -j " $( nproc 2> /dev/null || echo 2) " bzImage ARCH=x86_64 CONFIG_EFI_STUB=y
4556
57+ echo " # kernel config:"
58+ mkosi-chroot --chdir " /build/kernel-${KERNEL_VERSION} " cat .config
59+
4660 # Cache result
4761 mkdir -p " $cache_dir "
4862 cp arch/x86_64/boot/bzImage " $cache_dir /"
You can’t perform that action at this time.
0 commit comments