build: test for working coccinelle instead of version

We used a strict version check, which was for outdated, and also not
necessarily sufficient, as we saw with the two different 1.1.1 spatch versions
shipped in Ubuntu and Fedora.

Instead, we use a separate script that checks that spatch can actually parse
the patches, which is more robust than the version check.

Author: WanzenBug

Makefile

@@ -347,12 +347,8 @@ check-compat:
 		drbd/drbd-kernel-compat/check_patch_names.cocci \
 		drbd/drbd-kernel-compat/gen_patch_names.c
 
-COCCI_PATCHES := $(patsubst drbd/drbd-kernel-compat/cocci/%.cocci,%,$(wildcard drbd/drbd-kernel-compat/cocci/*.cocci))
-
 .PHONY: cocci-syntax
 cocci-syntax: $(addprefix cocci-syntax-,$(COCCI_PATCHES))
-
-cocci-syntax-%: drbd/drbd-kernel-compat/cocci/%.cocci
-	@spatch --very-quiet --parse-cocci $^ >/dev/null && echo "  COCCISYNTAX  OK  $$(basename $^)" || { echo "  COCCISYNTAX FAIL $$(basename $^)" ; exit 1 ; }
+	@drbd/drbd-kernel-compat/spatch_works.sh $(wildcard drbd/drbd-kernel-compat/cocci/*.cocci)
 
 Makefile: ;

drbd/drbd-kernel-compat/gen_compat_patch.sh

@@ -1,23 +1,12 @@
 #!/bin/bash
 
-MIN_SPATCH_VERSION=1.0.8
 [[ ${V:-0} != [02] ]] && set -x
 
 # to be passed in via environment
 : ${sources[@]?}
 : ${compat_patch?}
 : ${chksum?}
 
-# test if the version $1 is greater (more recent) than $2.
-function version_gt() {
-	test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"
-}
-
-function spatch_is_recent() {
-	ver=$(spatch --version | head -1 | sed -rn 's/^spatch version ([[:digit:]]\.[[:digit:]]\.[[:digit:]]).*/\1/p')
-	! version_gt $MIN_SPATCH_VERSION $ver
-}
-
 function die_no_spatch() {
 	echo "ERROR: no suitable spatch found in \$PATH. Install package 'coccinelle'!"
 	exit 1
@@ -37,11 +26,11 @@ if test -e .compat_patches_applied; then
 	rm -f .compat_patches_applied
 fi
 
-if ! spatch_is_recent; then
-	echo "INFO: spatch not recent enough, need spatch version >= $MIN_SPATCH_VERSION"
+if ! drbd-kernel-compat/spatch_works.sh drbd-kernel-compat/cocci/*.cocci >/dev/null 2>&1 ; then
+	echo "INFO: available spatch is not compatible with at least one patch"
 fi
 
-if hash spatch && spatch_is_recent; then
+if hash spatch && drbd-kernel-compat/spatch_works.sh drbd-kernel-compat/cocci/*.cocci >/dev/null 2>&1 ; then
 	K=$(cat $incdir/kernelrelease.txt || echo unknown kernel release)
 	echo "  GENPATCHNAMES   "$K
 	gcc -I $incdir -o $incdir/gen_patch_names -std=c99 drbd-kernel-compat/gen_patch_names.c
@@ -120,15 +109,15 @@ else
 	if test -e ../.git; then
 		echo "  INFO: not trying spatch-as-a-service because you are trying"
 		echo "  to build DRBD from a git checkout. Please install a suitable"
-		echo "  version of coccinelle (>1.0.8) or try building from a"
+		echo "  version of coccinelle (>=1.2) or try building from a"
 		echo "  release tarball."
 		die_no_spatch
 	fi
 
 	if [[ $SPAAS != true ]]; then
 		echo "  INFO: spatch-as-a-service was disabled by your package"
 		echo "  maintainer (\$SPAAS = false). Install a suitable version"
-		echo "  of coccinelle (>1.0.8) or allow spatch-as-a-service by"
+		echo "  of coccinelle (>=1.2) or allow spatch-as-a-service by"
 		echo "  setting \$SPAAS = true"
 		die_no_spatch
 	fi

drbd/drbd-kernel-compat/spatch_works.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for PATCH in "$@"; do
+	spatch --very-quiet --parse-cocci "$PATCH" >/dev/null && echo "  COCCISYNTAX  OK  $(basename "$PATCH")" || { echo "  COCCISYNTAX FAIL $(basename "$PATCH")" ; exit 1 ; }
+done