Skip to content

Commit

Permalink
Added checks for 8.95.{1,2}
Browse files Browse the repository at this point in the history
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
  • Loading branch information
rincebrain committed Apr 7, 2021
1 parent f2fa812 commit b657ee4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
19 changes: 12 additions & 7 deletions config/deb.am
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,18 @@ deb-local:
"*** re-run configure, and try again.\n"; \
exit 1; \
fi; \
if test "${ALIEN_VERSION}" = "8.95.3"; then \
echo -e "\n" \
"*** Installed version of ${ALIEN} is known to be broken;\n" \
"*** attempting to generate debs will fail! See\n" \
"*** https://github.com/openzfs/zfs/issues/11650 for details.\n"; \
exit 1; \
fi)
if test "${ALIEN_MAJOR}" = "8" && \
test "${ALIEN_MINOR}" = "95"; then \
if test "${ALIEN_POINT}" = "1" || \
test "${ALIEN_POINT}" = "2" || \
test "${ALIEN_POINT}" = "3"; then \
/bin/echo -e "\n" \
"*** Installed version of ${ALIEN} is known to be broken;\n" \
"*** attempting to generate debs will fail! See\n" \
"*** https://github.com/openzfs/zfs/issues/11650 for details.\n"; \
exit 1; \
fi; \
fi)

deb-kmod: deb-local rpm-kmod
name=${PACKAGE}; \
Expand Down
6 changes: 6 additions & 0 deletions config/zfs-build.m4
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,9 @@ AC_DEFUN([ZFS_AC_ALIEN], [
AC_MSG_CHECKING([whether $ALIEN is available])
AS_IF([tmp=$($ALIEN --version 2>/dev/null)], [
ALIEN_VERSION=$(echo $tmp | $AWK '{ print $[3] }')
ALIEN_MAJOR=$(echo ${ALIEN_VERSION} | $AWK -F'.' '{ print $[1] }')
ALIEN_MINOR=$(echo ${ALIEN_VERSION} | $AWK -F'.' '{ print $[2] }')
ALIEN_POINT=$(echo ${ALIEN_VERSION} | $AWK -F'.' '{ print $[3] }')
HAVE_ALIEN=yes
AC_MSG_RESULT([$HAVE_ALIEN ($ALIEN_VERSION)])
],[
Expand All @@ -447,6 +450,9 @@ AC_DEFUN([ZFS_AC_ALIEN], [
AC_SUBST(HAVE_ALIEN)
AC_SUBST(ALIEN)
AC_SUBST(ALIEN_VERSION)
AC_SUBST(ALIEN_MAJOR)
AC_SUBST(ALIEN_MINOR)
AC_SUBST(ALIEN_POINT)
])

dnl #
Expand Down

0 comments on commit b657ee4

Please sign in to comment.