Revert "mirror: Auto-update bpftool version on sync up (align on kernel's)"
This reverts commit 87ce89640e319ae99c070d931aa171bb6284e653.
This is in preparation for the change of versioning scheme, with
bpftool's version number no longer depending on kernel's version number
(but on libbpf). As a consequence, we cannot keep the current step to
update bpftool's version number (this would be without effect on the
Makefile, but would result in erroneous version numbers in the commit
log description).
Signed-off-by: Quentin Monnet <[email protected]>
diff --git a/scripts/sync-kernel.sh b/scripts/sync-kernel.sh
index 7fd3469..366cbd3 100755
--- a/scripts/sync-kernel.sh
+++ b/scripts/sync-kernel.sh
@@ -324,10 +324,6 @@
# Exclude baseline commit and generate nice cover letter with summary
git format-patch ${SQUASH_BASE_TAG}..${SQUASH_TIP_TAG} --cover-letter -o ${TMP_DIR}/patches
-# Compute version by concatenating kernel tip's version and hash
-git -c advice.detachedHead=false checkout ${TIP_COMMIT}
-BPFTOOL_VERSION="$(make kernelversion)+${TIP_COMMIT::12}"
-
# Now is time to re-apply bpftool-related linux patches to bpftool repo
cd_to ${BPFTOOL_REPO}
@@ -337,10 +333,6 @@
fi
done
-# Bump bpftool version number if necessary
-sed -i "s/^\(BPFTOOL_VERSION := \).*/\1${BPFTOOL_VERSION}/" src/Makefile
-git add src/Makefile
-
# Use generated cover-letter as a template for "sync commit" with
# baseline and checkpoint commits from kernel repo (and leave summary
# from cover letter intact, of course)
@@ -356,8 +348,7 @@
Baseline bpf-next commit: ${BASELINE_COMMIT}\n\
Checkpoint bpf-next commit: ${TIP_COMMIT}\n\
Baseline bpf commit: ${BPF_BASELINE_COMMIT}\n\
-Checkpoint bpf commit: ${BPF_TIP_COMMIT}\n\
-Latest bpftool version: ${BPFTOOL_VERSION}/" | \
+Checkpoint bpf commit: ${BPF_TIP_COMMIT}/" | \
git commit --file=-
echo "SUCCESS! ${COMMIT_CNT} commits synced."
