From baf83c76f11a28a105e92e59b178a7ca2fb66156 Mon Sep 17 00:00:00 2001 From: Gu Zheng Date: Thu, 27 Sep 2018 16:59:33 +0800 Subject: [PATCH] LU-11436 build: always dist debian stuff Always try to dist debian stuff, so that even on non-dpkg-using build targets (RHEL series), the tar dist will contain all debian stuff, and can be delivered to users who want to build lustre on debian series servers. Test-Parameters: trivial Change-Id: I8493f5a5e65078c0160c5493efee6906c87db6f1 Signed-off-by: Gu Zheng Reviewed-on: https://review.whamcloud.com/33246 Reviewed-by: Wang Shilong Tested-by: Jenkins Reviewed-by: Nathaniel Clark Reviewed-by: James Simmons Reviewed-by: Li Dongyang Tested-by: Maloo Reviewed-by: Oleg Drokin --- autoMakefile.am | 2 -- config/lustre-build-linux.m4 | 14 -------------- config/lustre-build.m4 | 2 -- 3 files changed, 18 deletions(-) diff --git a/autoMakefile.am b/autoMakefile.am index 8460b6b..4cddecb 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -333,9 +333,7 @@ dkms-debs: undef.h ../lustre_$${VER}.tar.gz ../lustre-*-modules-dkms_$${VER}_*.deb \ debs/ -if USES_DPKG EXTRA_DIST += debian/* -endif CSTK=/tmp/checkstack CSTKO=/tmp/checkstack.orig diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index ba250e3..a1b5155 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -412,20 +412,6 @@ LC_MODULE_LOADING ]) # -# LB_USES_DPKG -# -# Determine if the target is a dpkg system or rpm -# -AC_DEFUN([LB_USES_DPKG], [ -AC_CACHE_CHECK([if this distro uses dpkg], lb_cv_uses_dpkg, [ -lb_cv_uses_dpkg="no" -AS_CASE([$(lsb_release -i -s 2>/dev/null)], - [Ubuntu | Debian], [lb_cv_uses_dpkg="yes"]) -]) -uses_dpkg=$lb_cv_uses_dpkg -]) - -# # LB_CHECK_EXPORT # # check symbol exported or not diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index acc0cc1..ae95aec 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -375,7 +375,6 @@ AM_CONDITIONAL([TESTS], [test x$enable_tests = xyes]) AM_CONDITIONAL([DOC], [test x$ENABLE_DOC = x1]) AM_CONDITIONAL([MANPAGES], [test x$enable_manpages = xyes]) AM_CONDITIONAL([LINUX], [test x$lb_target_os = xlinux]) -AM_CONDITIONAL([USES_DPKG], [test x$uses_dpkg = xyes]) AM_CONDITIONAL([USE_QUILT], [test x$use_quilt = xyes]) AM_CONDITIONAL([RHEL], [test x$RHEL_KERNEL = xyes]) AM_CONDITIONAL([SUSE], [test x$SUSE_KERNEL = xyes]) @@ -570,7 +569,6 @@ LB_CANONICAL_SYSTEM LB_CONFIG_DIST LB_DOWNSTREAM_RELEASE -LB_USES_DPKG LB_LIBCFS_DIR -- 1.8.3.1