if git branch >/dev/null 2>&1; then
ffw=0
hash=""
- ver=$(git describe --match [[0-9v]]\* --tags)
+ ver=$(git describe --match v[[0-9]]_*_[[0-9]] --tags)
if [[[ $ver = *-*-* ]]]; then
hash=${ver##*-}
ffw=${ver#*-}
if [[[ $ver = v*_*_*_0 ]]]; then
ver=${ver%_0}
fi
-
+ if [[[ $ver = v*_*_* ]]]; then
+ ver=${ver#v}
+ ver=${ver//_/.}
+ fi
# only do this test for lustre (not ldiskfs)
if test "$PACKAGE" = "lustre" -a "$ver" != "$VERSION"; then
AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.])
])
LUSTREIOKIT="$with_lustre_iokit"
- with_lustre_iokit="yes"
;;
esac
AC_SUBST(LUSTREIOKIT_SUBDIR)
;;
xinkernel)
AC_MSG_RESULT([inkernel])
- LB_CHECK_FILE([$LINUX/fs/ldiskfs/inode.c],[],[
- AC_MSG_ERROR([ldiskfs was not found in $LINUX/fs/ldiskfs/inode.c])
+ LB_CHECK_FILE([$LINUX/include/linux/ldiskfs_fs.h],[],[
+ AC_MSG_ERROR([ldiskfs was not found in $LINUX])
])
;;
*)
AM_CONDITIONAL(DARWIN, test x$lb_target_os = "xdarwin")
AM_CONDITIONAL(CRAY_XT3, test x$enable_cray_xt3 = "xyes")
AM_CONDITIONAL(SUNOS, test x$lb_target_os = "xSunOS")
+AM_CONDITIONAL(USES_DPKG, test x$uses_dpkg = "xyes")
# this lets lustre cancel libsysio, per-branch or if liblustre is
# disabled
LB_CONFIG_DIST
LB_DOWNSTREAM_RELEASE
+LB_USES_DPKG
LB_BUILDID
LB_LIBCFS_DIR