From babd429f5b35e608113403611de26af2f3a18537 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Wed, 18 Jun 2014 11:23:03 -0700 Subject: [PATCH] LU-5227 build: build dkms using lbuild To include dkms build in lbuild 1. before build lustre, generate lustre-dkms.spec with configure 2. use rpmbuild to build the src 3. rebuild dkms using the src Signed-off-by: Minh Diep Change-Id: Iac71d20110fe0f84b3bfffb071f3e3b84c7f5f17 Reviewed-on: http://review.whamcloud.com/10747 Tested-by: Jenkins Reviewed-by: Faccini Bruno Reviewed-by: Bob Glossman Tested-by: Maloo Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index be502e0..71e6d82 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -955,6 +955,11 @@ build_lustre() { pushd lustre >/dev/null + if ! build_lustre_dkms; then + popd >/dev/null # pushd lustre + return 255 + fi + echo "Building Lustre RPMs for: $BUILD_ARCHS..." local targets arch for arch in $BUILD_ARCHS; do @@ -1032,6 +1037,15 @@ build_lustre() { } +build_lustre_dkms() { + local ver=$(eval echo $(awk '/LUSTRE_VERSION_STRING/ {print $3}' lustre/include/lustre_ver.h)) + echo "Building Lustre DKMS RPMs for: $BUILD_ARCHS..." + ./configure --enable-dist || return 255 + $RPMBUILD --define="_topdir $TOPDIR" -bs lustre-dkms.spec || return 255 + $RPMBUILD --rebuild --define="_topdir $TOPDIR" $TOPDIR/SRPMS/lustre-dkms-$ver-*.src.rpm || return 255 + return 0 +} + ### # build_spl_zfs # -- 1.8.3.1