X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild;h=575bd37c2272493a00f7d83e7828d8a8afd20b41;hb=813a6595c97813a33408d2e11656249d3c02cb49;hp=b3186d41253cacd5b844e88006b2e24a6d95b97f;hpb=d48d1d811ad512a38a5eaee798b1309321d4a63d;p=fs%2Flustre-release.git

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index b3186d4..575bd37 100755
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -620,7 +620,7 @@ load_target() {
     fi
 
     if [ -f $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET-$TARGET_ARCH.config ]; then
-        CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH${RPMSMPTYPE:+-}${RPMSMPTYPE}.config"
+        CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH.config"
     fi
 
     local lnxrelnew=${lnxrel//-/_}
@@ -748,39 +748,6 @@ do_patch_linux() {
 
 }
 
-build_iokit() {
-    local rpmbuildopt="$1"
-
-    pushd lustre-iokit > /dev/null || return 255
-
-    if ! ./configure; then
-        echo "failed to configure in lustre-iokit"
-        popd >/dev/null # pushd lustre-iokit
-        return 255
-    fi
-
-    if ! make dist; then
-        echo "failed to make dist in lustre-iokit"
-        popd >/dev/null # pushd lustre-iokit
-        return 255
-    fi
-
-    if ! $RPMBUILD $rpmbuildopt lustre-iokit*.tar.gz \
-        --define "_tmppath /var/tmp" \
-        --define "_topdir $TOPDIR" 2>&1; then
-        popd >/dev/null # pushd lustre-iokit
-        return 255
-    fi
-
-    if $DO_SRC && ! $RPMBUILD -ts lustre-iokit*.tar.gz \
-            --define "_tmppath /var/tmp" \
-            --define "_topdir $TOPDIR" 2>&1; then
-            popd >/dev/null # pushd lustre-iokit
-            return 255
-    fi
-    popd >/dev/null # pushd lustre-iokit
-}
-
 build_lustre() {
     local linux="$1"
     local linuxobj="$2"
@@ -818,14 +785,6 @@ build_lustre() {
         fi
     fi
 
-    if $IOKITRPM; then
-        if ! build_iokit $rpmbuildopt; then
-            echo "failed to build lustre-iokit"
-            popd >/dev/null # pushd lustre
-            return 255
-        fi
-    fi
-
     # convert the $PATCHLESS boolean to an empty/not-empty boolean
     # as silly as this seems, it makes the syntax of the rpmbuild command
     # simpler and not need an eval to deal with the quotes in the quotes
@@ -840,6 +799,11 @@ build_lustre() {
         lustre_tests="no"
     fi
 
+    local lustre_iokit=""
+    if ! $IOKITRPM; then
+        lustre_iokit="no"
+    fi
+
     local osd_zfs=""
     if $OSDZFSRPM; then
         osd_zfs="yes"
@@ -853,6 +817,7 @@ build_lustre() {
     $RPMBUILD $targets $rpmbuildopt "$LUSTRE" \
         ${is_patchless:+--without servers} \
         ${lustre_tests:+--without lustre_tests} \
+        ${lustre_iokit:+--without lustre_iokit} \
         ${osd_zfs:+--with zfs} \
         ${osd_ldiskfs:+--with ldiskfs} \
         ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
@@ -867,6 +832,7 @@ build_lustre() {
         if ! $RPMBUILD -ts "$LUSTRE" \
                  ${is_patchless:+--without servers} \
                  ${lustre_tests:+--without lustre_tests} \
+                 ${lustre_iokit:+--without lustre_iokit} \
                  ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
                  --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
                  --define "kdir $linux" \