mirror: Fix separator for build metadata in version numbers
According to the rules of semantic versioning [0], a dash is used to
append a pre-release version number to a version number. When we
construct this number for bpftool in the mirror repository, we append
the hash of the kernel commit corresponding with the state of the
sources in the mirror. This is some metadata related to the build, and
should be separated by a plus sign, not a dash.
Let's use a plus sign before the commit hash, to remain compliant with
the semantic versioning specification.
[0] https://semver.org/
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
diff --git a/scripts/sync-kernel.sh b/scripts/sync-kernel.sh
index 5a9407f..24e1762 100755
--- a/scripts/sync-kernel.sh
+++ b/scripts/sync-kernel.sh
@@ -323,7 +323,7 @@
# 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}"
+BPFTOOL_VERSION="$(make kernelversion)+${TIP_COMMIT::12}"
# Now is time to re-apply bpftool-related linux patches to bpftool repo
cd_to ${BPFTOOL_REPO}
diff --git a/src/Makefile b/src/Makefile
index 213f2df..2699296 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,7 +38,7 @@
LIBBPF_BOOTSTRAP_INTERNAL_HDRS := $(addprefix $(LIBBPF_BOOTSTRAP_HDRS_DIR)/,hashmap.h)
ifeq ($(BPFTOOL_VERSION),)
-BPFTOOL_VERSION := 5.16.0-c446fdacb10d
+BPFTOOL_VERSION := 5.16.0+c446fdacb10d
endif
$(LIBBPF_OUTPUT) $(BOOTSTRAP_OUTPUT) $(LIBBPF_BOOTSTRAP_OUTPUT) $(LIBBPF_HDRS_DIR) $(LIBBPF_BOOTSTRAP_HDRS_DIR):
