Whamcloud - gitweb
LU-5317 build: fix build of Xeon Phi client RPMs
[fs/lustre-release.git] / contrib / lbuild / lbuild
index 7d0c690..8c24402 100755 (executable)
@@ -60,9 +60,6 @@ EXTRA_VERSION=
 STAGEDIR=
 TMPDIR=${TMPDIR:-"/var/tmp"}
 TIMESTAMP=
-# this is a dir to try reuse old kernel RPMs in (although, it seems to be
-# unused in any real manner
-REUSERPM=
 # this is the dir that should be used to store reuse products
 REUSEBUILD=
 # should cached products be used or force rebuilding?
@@ -137,9 +134,6 @@ Usage: ${0##*/} [OPTION]... [-- <lustre configure options>]
   --timestamp=TIMESTAMP
     Date of building lustre in format YYYYMMDDhhmmss
 
-  --reuserpm=DIR
-    Try to reuse old kernel RPMs from DIR
-
   --reusebuild=DIR
     Try to reuse old kernel builds from DIR
 
@@ -551,7 +545,7 @@ download_ofed() {
         OFED_BASE_VERSION=${OFED_VERSION%.*}
     fi
 
-    local location="http://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VERSION}/"
+    local location="https://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VERSION}/"
 
     if [[ $OFED_VERSION = *-[rR][cC][0-9] ]]; then
         local Mmv
@@ -961,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
@@ -1038,6 +1037,16 @@ build_lustre() {
 
 }
 
+build_lustre_dkms() {
+    [ -n "$MPSS_VERSION" ] && return 0
+    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
 #
@@ -1058,8 +1067,8 @@ build_spl_zfs() {
     # The spl/zfs spec files expect RPM_BUILD_ROOT to point to the root of the
     # destination for the rpms
     export RPM_BUILD_ROOT=$TOPDIR
-    SPLZFSVER=${SPLZFSVER:-0.6.2}
-    SPLZFSTAG=${SPLZFSTAG:-upstream-master}
+    SPLZFSVER=${SPLZFSVER:-0.6.3}
+    SPLZFSTAG=${SPLZFSTAG:-}
 
     # The files expect a kver to be set to the kernel version .
     local kver=$(find_linux_release)
@@ -1077,24 +1086,24 @@ build_spl_zfs() {
         git clone ${SPLZFSGITREPO:-"https://github.com/zfsonlinux"}/$pkg.git $pkg 2>&1
 
         pushd $pkg || return 255
-       if [ -n "$SPLZFSTAG" ]; then
-           git checkout $SPLZFSTAG
-       else
-           git checkout -b lbuild $pkg-$SPLZFSVER
-       fi
-
-       # This differentiates between older zfs versions
-       if [ -f $pkg-modules.spec.in ]; then
-           rpmpkg=$pkg-modules
-           specdir=.
-           speclist="$pkg.spec $rpmpkg.spec"
-       else
+        if [ -n "$SPLZFSTAG" ]; then
+            git checkout $SPLZFSTAG
+        else
+            git checkout -b lbuild $pkg-$SPLZFSVER
+        fi
+
+        # This differentiates between older zfs versions
+        if [ -f $pkg-modules.spec.in ]; then
+            rpmpkg=$pkg-modules
+            specdir=.
+            speclist="$pkg.spec $rpmpkg.spec"
+        else
             rpmpkg=kmod-$pkg-devel
-           specdir=rpm/generic
-           speclist="$pkg.spec $pkg-kmod.spec $pkg-dkms.spec"
-       fi
+            specdir=rpm/generic
+            speclist="$pkg.spec $pkg-kmod.spec $pkg-dkms.spec"
+        fi
 
-       sh autogen.sh || return 255
+        sh autogen.sh || return 255
 
         if  ! ./configure --with-linux=${LINUX} --with-linux-obj=${LINUXOBJ:-$LINUX} \
                           ${spldir:+--with-spl="${spldir}"} 2>&1 ||
@@ -1106,40 +1115,36 @@ build_spl_zfs() {
 
         ln -f $pkg/$pkg-*.tar.gz $TOPDIR/SOURCES ||
            error "failed to link $pkg/$pkg-*.tar.gz into $TOPDIR/SOURCES"
-       if [ -f $pkg/scripts/kmodtool ]; then
-           ln -f $pkg/scripts/kmodtool $TOPDIR/SOURCES/
-       fi
-
-       local rpmb
-       if $DO_SRC; then
-           rpmb=-ba
-       else
-           rpmb=-bb
-       fi
-
-       # set search dir for our own kmodtool to find correct
-       # directories
-       export KERNELSOURCE=$(dirname ${LINUX})
-       # Manually build rpms
-       for spec in $speclist; do
-           echo "Building RPMs from $pkg/$specdir/$spec"
+        if [ -f $pkg/scripts/kmodtool ]; then
+            ln -f $pkg/scripts/kmodtool $TOPDIR/SOURCES/
+        fi
+
+        local rpmb
+        if $DO_SRC; then
+            rpmb=-ba
+        else
+            rpmb=-bb
+        fi
+
+        # set search dir for our own kmodtool to find correct
+        # directories
+        export KERNELSOURCE=$(dirname ${LINUX})
+        # Manually build rpms
+        for spec in $speclist; do
+            echo "Building RPMs from $pkg/$specdir/$spec"
             if ! $RPMBUILD $rpmb $pkg/$specdir/$spec \
-               --nodeps -v \
-               --define "require_kdir ${LINUX}" \
-               ${LINUXOBJ:+--define "require_kobj ${LINUXOBJ}"} \
-               ${spldir:+--define "require_spldir ${spldir}"} \
-               --define "kver $kver" \
-               --define "kernels $kver" \
-               --define "_tmppath /var/tmp" \
-               --define "kernelbuildroot $TOPDIR/reused" \
-               --define "_topdir $TOPDIR" 2>&1; then
-               return 255
+                --nodeps -v \
+                --define "require_kdir ${LINUX}" \
+                ${LINUXOBJ:+--define "require_kobj ${LINUXOBJ}"} \
+                ${spldir:+--define "require_spldir ${spldir}"} \
+                --define "kver $kver" \
+                --define "kernels $kver" \
+                --define "_tmppath /var/tmp" \
+                --define "kernelbuildroot $TOPDIR/reused" \
+                --define "_topdir $TOPDIR" 2>&1; then
+                return 255
             fi
-       done
-
-#      $DO_SRC && mv $pkg*.src.rpm $TOPDIR/SRPMS/
-#      mv $pkg*.noarch.rpm $TOPDIR/RPMS/noarch/
-#      mv *$pkg*.$TARGET_ARCH.rpm $TOPDIR/RPMS/$(basearch $TARGET_ARCH)/
+        done
 
         # We have built the rpms for the package. Now we need to extract the
         # contained files so we can build further things against them
@@ -1147,19 +1152,25 @@ build_spl_zfs() {
 
         # cpio only extract to pwd so we need to go there.
         pushd $TOPDIR
-       local rpm
-       for rpm in $rpms; do
+        local rpm
+        for rpm in $rpms; do
             rpm2cpio $rpm | cpio -id
-       done
+        done
 
         if [ "$pkg" == "zfs" ]; then
-            mkdir -p $TOPDIR/zfsdevel
-            pushd $TOPDIR/zfsdevel
-            # We also need to extract zfs-devel rpm
-            local devel_rpm=$(ls -1 $TOPDIR/RPMS/*/$pkg-devel-*.rpm)
-            rpm2cpio $devel_rpm | cpio -id
-            popd
-            CONFIGURE_FLAGS="--with-$pkg-devel=$TOPDIR/zfsdevel ${CONFIGURE_FLAGS}"
+            # We also need to extract both the zfs and zfs-devel rpms
+            # the zfs rpm is needed because it has the actual libraries in
+            # it and the zfs-devel rpm only has unversioned symlinks to the
+            # libraries in the zfs rpm
+            # this will all change one day when we have a libzfs rpm per
+            # https://github.com/zfsonlinux/zfs/issues/2329
+            # and it looks like it could be one day soon:
+            # https://github.com/zfsonlinux/zfs/pull/2341
+            local devel_rpms=$(ls -1 $TOPDIR/RPMS/*/{$pkg-devel,$pkg-$SPLZFSVER,lib*}-*.rpm)
+            for rpm in $devel_rpms; do
+                rpm2cpio $rpm | cpio -id
+            done
+            CONFIGURE_FLAGS="--with-$pkg-devel=$TOPDIR ${CONFIGURE_FLAGS}"
         fi
         popd
 
@@ -1966,7 +1977,7 @@ set -E
 
 [ -r ~/.lbuildrc ] && . ~/.lbuildrc
 
-options=$(getopt -o D:h -l kerneltree:,distro:,kernelrpm:,reusebuild:,patchless,ldiskfs,ccache,reuse:,norpm,disable-datestamp,external-patches:,timestamp:,extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,noiokit,ofed-version:,mpss-version:,publish,release,set-value:,src,stage:,tag:,target:,target-archs:,with-linux:,xen -- "$@")
+options=$(getopt -o D:h -l kerneltree:,distro:,kernelrpm:,reusebuild:,patchless,ccache,norpm,external-patches:,timestamp:,extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,noiokit,ofed-version:,mpss-version:,publish,release,set-value:,src,stage:,target:,target-archs:,with-linux:,xen -- "$@")
 
 if [ $? != 0 ]; then
     usage 1
@@ -2018,10 +2029,6 @@ while [ "$1" ]; do
             DISTRO=$2
             shift 2
             ;;
-        --reuserpm)
-            REUSERPM=$2
-            shift 2
-            ;;
         --reusebuild)
             if ! REUSEBUILD=$(canon_path "$2"); then
                 fatal 1 "Could not determine the canonical location of $2"
@@ -2032,10 +2039,6 @@ while [ "$1" ]; do
             NORPM=true
             shift
             ;;
-        --ldiskfs)
-           echo "WARNING: \"--ldiskfs\" is deprecated" > 2
-            shift
-            ;;
         --noiokit)
             IOKITRPM=false
             shift
@@ -2091,10 +2094,6 @@ while [ "$1" ]; do
             STAGEDIR=$2
             shift 2
             ;;
-        --tag)
-            shift 2
-            echo "WARNING: \"--tag\" is deprecated" > 2
-            ;;
         --target)
             TARGET=$2
             shift 2