Skip to content

Commit f98d033

Browse files
rincebrainadamdmoss
authored andcommitted
Added check for broken alien version
Added a check for alien 8.95.{1,2,3}, which is known to fail to generate debs 100% of the time, and instead print out a message informing the developer that it's known to be broken and linking them to more information. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rich Ercolani <[email protected]> Closes openzfs#11848 Closes openzfs#11850
1 parent 9dc13df commit f98d033

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

config/deb.am

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,19 @@ deb-local:
1414
"*** package for your distribution which provides ${ALIEN},\n" \
1515
"*** re-run configure, and try again.\n"; \
1616
exit 1; \
17-
fi)
17+
fi; \
18+
if test "${ALIEN_MAJOR}" = "8" && \
19+
test "${ALIEN_MINOR}" = "95"; then \
20+
if test "${ALIEN_POINT}" = "1" || \
21+
test "${ALIEN_POINT}" = "2" || \
22+
test "${ALIEN_POINT}" = "3"; then \
23+
/bin/echo -e "\n" \
24+
"*** Installed version of ${ALIEN} is known to be broken;\n" \
25+
"*** attempting to generate debs will fail! See\n" \
26+
"*** https://github.com/openzfs/zfs/issues/11650 for details.\n"; \
27+
exit 1; \
28+
fi; \
29+
fi)
1830

1931
deb-kmod: deb-local rpm-kmod
2032
name=${PACKAGE}; \

config/zfs-build.m4

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,9 @@ AC_DEFUN([ZFS_AC_ALIEN], [
437437
AC_MSG_CHECKING([whether $ALIEN is available])
438438
AS_IF([tmp=$($ALIEN --version 2>/dev/null)], [
439439
ALIEN_VERSION=$(echo $tmp | $AWK '{ print $[3] }')
440+
ALIEN_MAJOR=$(echo ${ALIEN_VERSION} | $AWK -F'.' '{ print $[1] }')
441+
ALIEN_MINOR=$(echo ${ALIEN_VERSION} | $AWK -F'.' '{ print $[2] }')
442+
ALIEN_POINT=$(echo ${ALIEN_VERSION} | $AWK -F'.' '{ print $[3] }')
440443
HAVE_ALIEN=yes
441444
AC_MSG_RESULT([$HAVE_ALIEN ($ALIEN_VERSION)])
442445
],[
@@ -447,6 +450,9 @@ AC_DEFUN([ZFS_AC_ALIEN], [
447450
AC_SUBST(HAVE_ALIEN)
448451
AC_SUBST(ALIEN)
449452
AC_SUBST(ALIEN_VERSION)
453+
AC_SUBST(ALIEN_MAJOR)
454+
AC_SUBST(ALIEN_MINOR)
455+
AC_SUBST(ALIEN_POINT)
450456
])
451457

452458
dnl #

0 commit comments

Comments
 (0)