Merge pull request #2623 from pqarmitage/updates

snap: attempt 6 to fix close_range() snap build with Linux 5.8

Author: pqarmitage

snap/snapcraft.yaml

@@ -257,10 +257,13 @@ parts:
       cat /usr/include/linux/version.h
       ls -lR /usr/include/linux
       rm -rf ${CRAFT_STAGE}/keepalived-linux-libc-dev
-    echo CFLAGS=${CFLAGS:-}
       echo "Finding close_range.h"
       find /usr/include -name "close_range.h"
-      cat /usr/include/linux/close_range.h || true
+      if [ -f /usr/include/linux/close_range.h ]; then
+        cat /usr/include/linux/close_range.h
+      else
+        echo /usr/inclde/linux/close_range.h not found
+      fi
       echo -n "Build kernel:"
       printf " %d.%d.%d\n" $(printf "%6.6x" $(grep LINUX_VERSION_CODE /usr/include/linux/version.h | sed -e "s/.*CODE //") | sed -e "s/\(..\)\(..\)/0x\1 0x\2 0x/")
     stage: