Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions scripts/series-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -623,14 +623,16 @@ for S in "${series[@]}"; do
elif [ "$(series_vendor_key "$vendor")" != "$(series_vendor_key "$build")" ]; then
bkey=$(series_vendor_key "$build")
at=''
for c in $(git rev-list -n "$base_scan_depth" "$vendor"); do
# The whole strand, as series-vendor.sh walks it: a firing vendors up to
# 100 commits onto it before the buffer picks any, far past the base scan.
for c in $(git rev-list "$vendor"); do
if [ "$(series_vendor_key "$c")" = "$bkey" ]; then at=$c; break; fi
done
if [ -n "$at" ]; then
echo " VENDOR $S-vendor is $(git rev-list --count "$at..$vendor") commit(s) ahead of $S-build; stage 1 picks them:"
echo " scripts/series-vendor.sh $S --remote $remote --push # from a worktree at $S-build"
else
echo " VENDOR $S-build's vendor paths match none of the newest $base_scan_depth commits of $S-vendor:"
echo " VENDOR $S-build's vendor paths match no commit of $S-vendor:"
echo " something vendored onto the buffer directly. Vendor onto the strand"
echo " (vendor-one.sh --strand) and pick; the buffer never leads it."
fi
Expand Down
6 changes: 6 additions & 0 deletions scripts/vendor-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ glue_compiles() { # [failures]
for probe in "${series_glue_probes[@]}"; do
line=$(glue_compile_line "$probe" "$extra")
[ -n "$line" ] || { rm -f "$own"; return 2; }
# What GCC 14 and the link make errors, a C compiler before them only
# warns about: a call to a function the engine dropped, or a callback of
# the wrong type. C only, because C++ rejects both already.
if [ "${probe##*.}" = c ]; then
line="$line -Werror=implicit-function-declaration -Werror=incompatible-pointer-types"
fi
# shellcheck disable=SC2016 # the sh child expands $CMD and $1, not this shell
(cd src && shopt -s nullglob && files=(*."${probe##*.}") && [ ${#files[@]} -gt 0 ] &&
printf '%s\n' "${files[@]}" |
Expand Down
16 changes: 16 additions & 0 deletions scripts/vendor-one.sh
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,9 @@ while [ $commits_vendored -lt $num_commits ]; do

message=
is_tag=
# Candidates this pass regenerated and found unchanged but for the version
# stamp, oldest first: they fold into the next commit that moves.
skipped=

for commit in $original; do
echo "Importing commit $commit"
Expand Down Expand Up @@ -344,6 +347,18 @@ while [ $commits_vendored -lt $num_commits ]; do
echo " $0 ${strand_flag:+$strand_flag }--commits 1 <upstream>"
echo " git reset --soft HEAD~2 && git commit -C HEAD@{1} # keep the vendor message, then"
echo " git commit --amend -F <file> # the same plus an 'R-side fix' section"
if [ -n "$skipped" ]; then
last_skipped=${skipped##* }
echo ""
echo "This pass skipped$skipped before ${commit}: each changed nothing but"
echo "the version stamp, and the stack applied to each. A patch rebased for"
echo "${commit} need not apply to them, and the rerun walks them again,"
echo "so make the temporary commit name the last one, which then counts as"
echo "vendored and starts the walk at ${commit}:"
echo " restamp $series_stamp_file for ${last_skipped} (git describe --tags, core.abbrev=9), and"
echo " git commit -m 'tmp: fix generation, ${owner}@${last_skipped}' -- patch $series_stamp_file"
echo "The squash folds that stamp away again."
fi
exit 4
fi
done
Expand Down Expand Up @@ -377,6 +392,7 @@ while [ $commits_vendored -lt $num_commits ]; do
message="vendor: Update vendored sources to ${owner}@$commit"
break
fi
skipped="$skipped $commit"
done

if [ "$message" = "" ]; then
Expand Down
Loading