Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <behlendorf1@llnl.gov>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #11848 
Closes #11850
This commit is contained in:
Rich Ercolani 2021-04-08 17:37:51 -04:00 committed by Brian Behlendorf
parent f17d146ca6
commit 1eee2c7b27
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/deb.am
View File

@ -14,7 +14,19 @@ deb-local:
"*** package for your distribution which provides ${ALIEN},\n" \ "*** package for your distribution which provides ${ALIEN},\n" \
"*** re-run configure, and try again.\n"; \ "*** re-run configure, and try again.\n"; \
exit 1; \ exit 1; \
fi) 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 deb-kmod: deb-local rpm-kmod
name=${PACKAGE}; \ name=${PACKAGE}; \

6
config/zfs-build.m4
View File

@ -437,6 +437,9 @@ AC_DEFUN([ZFS_AC_ALIEN], [
AC_MSG_CHECKING([whether $ALIEN is available]) AC_MSG_CHECKING([whether $ALIEN is available])
AS_IF([tmp=$($ALIEN --version 2>/dev/null)], [ AS_IF([tmp=$($ALIEN --version 2>/dev/null)], [
ALIEN_VERSION=$(echo $tmp | $AWK '{ print $[3] }') 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 HAVE_ALIEN=yes
AC_MSG_RESULT([$HAVE_ALIEN ($ALIEN_VERSION)]) AC_MSG_RESULT([$HAVE_ALIEN ($ALIEN_VERSION)])
],[ ],[
@ -447,6 +450,9 @@ AC_DEFUN([ZFS_AC_ALIEN], [
AC_SUBST(HAVE_ALIEN) AC_SUBST(HAVE_ALIEN)
AC_SUBST(ALIEN) AC_SUBST(ALIEN)
AC_SUBST(ALIEN_VERSION) AC_SUBST(ALIEN_VERSION)
AC_SUBST(ALIEN_MAJOR)
AC_SUBST(ALIEN_MINOR)
AC_SUBST(ALIEN_POINT)
]) ])
dnl # dnl #