Skip to content

generate-defconfig: handle missing trailing newline #1604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
troglobit merged 1 commit into from
Sep 2, 2026
Merged

generate-defconfig: handle missing trailing newline #1604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion utils/generate-defconfig.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ for change in $changes; do
done

TMPDIR=`mktemp -d`
$MERGE_CONFIG -O "$TMPDIR" "$base" "$changes"

# Concatenate the changes with awk. This terminates every line, so a file
# without a trailing newline won't glue its last line to the next file's first.
awk '{print}' $changes > "$TMPDIR/changes.conf"
$MERGE_CONFIG -O "$TMPDIR" "$base" "$TMPDIR/changes.conf"

O="$TMPDIR" make savedefconfig
mv "$TMPDIR"/defconfig "$output"
Expand Down