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?
# what does this do exactly? does it imply no kernel build?
NORPM=false
IOKITRPM=true
-LDISKFSRPM=true
OSDLDISKFSRPM=true
OSDZFSRPM=false
SMPTYPES="smp bigsmp default ''"
PATCHLESS=false
+WITH_ZFS=""
XEN=false
LINUXOBJ=
DISTRO=
--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
Path to an existing lustre source tarball to use.
--nodownload
- Do not try to download a kernel from downloads.lustre.org
+ Do not try to download a kernel from downloads.hpdd.intel.com
--nosrc
Do not build a .src.rpm, a full kernel patch, or a patched kernel
tarball.
--ldiskfs
- Do ldiskfs RPM. Now true by default
+ Build with ldiskfs support. (Deprecated, always true)
--noiokit
Do not build lustre-iokit RPM. Now true by default
Specifies that the files generated do not include timestamps, and
that this is an official release.
+ --disable-zfs
+ Build Lustre without ZFS.
+
--src
Build a .src.rpm, a full kernel patch, and a patched kernel tarball.
check_options() {
- if [ -z "$LUSTRE" -o ! -r "$LUSTRE"]; then
+ if [ -z "$LUSTRE" -o ! -r "$LUSTRE" ]; then
usage 1 "Could not find Lustre source tarball '$LUSTRE'."
fi
- [ -z "$DISTRO" ] && DISTRO=$(autodetect_distro)
+ if [ -z "$DISTRO" ] ; then
+ DISTRO=$(autodetect_distro)
+ # remove separator
+ DISTRO=${DISTRO/-/}
+ fi
+ DISTROMAJ=${DISTRO%%.*}
+
+ [ -z "$TARGET" ] && TARGET=$(autodetect_target "$DISTRO")
if [ -z "$LINUX" ]; then
[ "$KERNELDIR" -o "$KERNELTREE" ] || \
[ -d "$KERNELDIR" -o -d "$KERNELTREE" ] || \
usage 1 "$KERNELDIR and $KERNELTREE are not a directory."
- [ "$TARGET" ] || TARGET=$(autodetect_target "$DISTRO")
# TARGET_FILE="$TOPDIR/lustre/kernel_patches/targets/$TARGET.target"
# [ -r "$TARGET_FILE" ] || \
# usage 1 "Target '$TARGET' was not found."
fi
case $TARGET in
- 2.6-rhel6)
+ 3.10-rhel7)
+ CANONICAL_TARGET="rhel7"
+ ;;
+ 2.6-rhel6*)
CANONICAL_TARGET="rhel6"
;;
2.6-rhel5)
local url="$1"
local target="$2"
+ if [ -z "$target" ]; then
+ fatal 1 "fetch_url() called without a target to fetch to"
+ fi
+
+ if [ -d $target ]; then
+ target+="/${url##*/}"
+ fi
+
local rc=0
if which wget >/dev/null 2>&1; then
if ! wget -nv "$url" -O "$target"; then
rc=${PIPESTATUS[0]}
fi
elif which curl >/dev/null 2>&1; then
- if ! curl -L -s -o "$target" "$url"; then
+ if ! curl -n -L -s -o "$target" "$url"; then
rc=${PIPESTATUS[0]}
fi
else
if $force || [ ! -r "$KERNELDIR/$srpm" ] ||
[ ! -s "$KERNELDIR/$srpm" ]; then
if $DOWNLOAD; then
- local location="http://downloads.lustre.org/public/kernels/$target/old"
+ local location="https://downloads.hpdd.intel.com/public/kernels/$target/old"
# get the location from a distro specific method if it exists
if type -p kernel_srpm_location; then
location=$(kernel_srpm_location)
[ ! -s "$KERNELDIR/$srpm" ]; then
rm -f $KERNELDIR/$srpm
# punt to a distro specific method if it exists
- if ! type -p download_srpm-$DISTRO; then
+ if ! type -p download_srpm-$DISTROMAJ; then
fatal 1 "Could not download target $target's kernel SRPM $srpm from $location."
else
- if ! download_srpm-$DISTRO "$target" "$srpm" "$force"; then
- fatal 1 "Could not download target $target's kernel SRPM $srpm using download_srpm-$DISTRO."
+ if ! download_srpm-$DISTROMAJ "$target" "$srpm" "$force"; then
+ fatal 1 "Could not download target $target's kernel SRPM $srpm using download_srpm-$DISTROMAJ."
fi
fi
fi
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 = *-rc[0-9] ]]; then
+ if [[ $OFED_VERSION = *-[rR][cC][0-9] ]]; then
local Mmv
- Mmv=${OFED_VERSION%%-*}
- location="http://www.openfabrics.org/downloads/OFED/ofed-${Mmv}/"
+ Mmv=${OFED_VERSION%%-[rR][cC][0-9]}
+ location="https://www.openfabrics.org/downloads/OFED/ofed-${Mmv}/"
fi
if [[ $OFED_VERSION = daily-* ]]; then
- local Mmv daily
- OFED_VERSION=${OFED_VERSION/daily-/}
- Mmv=${OFED_VERSION%%-*}
+ local Mmv
+ Mmv=${OFED_VERSION/daily-/}
daily=${OFED_VERSION##$Mmv-}
- location="http://www.openfabrics.org/downloads/OFED/ofed-${Mmv}-daily/"
+ location="https://www.openfabrics.org/downloads/OFED/ofed-${Mmv}-daily/"
# find the filename for the version for the date specified
- OFED_VERSION=$(curl -s "$location" | sed -nre "/${daily}-/s/.*href=\"OFED-(${Mmv//./\\.}-${daily}-[0-9]{4,4}).tgz.*$/\1/p" | tail -1)
+ OFED_VERSION=$(curl -s "$location" | sed -nre "/${Mmv}-/s/.*href=\"OFED-(${Mmv}-[0-9]{8,8}-[0-9]{4,4}).tgz.*$/\1/p" | tail -1)
if [ -z "$OFED_VERSION" ]; then
fatal 1 "Could not determine the filename of the OFED snapshot for ${daily}"
fi
}
+parse_mpss_info() {
+ local file="$1"
+ local build="$2"
+ local distro="$3"
+
+ [ -r "$file" ] || fatal 1 "Could not find MPSS info file"
+
+ # convert to MPSS distro naming
+ distro=${distro/sles/suse}
+ distro_name=${distro%%-*}
+
+ # extract links from MPSS info file
+ local urls=$(cat "$file" | \
+ tr -d '\t\r\n' | sed -e 's?\(</[a-zA-Z]*>\)?\1\n?g' | \
+ grep '.intel.com/' | \
+ sed -e 's/^.*[hH][rR][eE][fF]="\([^>"]\+\)".*$/\1/g' | \
+ grep '.tar')
+ local res2=""
+ local res3=""
+ for url in $urls; do
+ local ver2=""
+ local ver3=""
+ # Try to match with MPSS 3.3 package
+ if [[ $url =~ mpss-[0-9].[0-9](.[0-9]*)?-linux.tar ]]; then
+ ver3=${url##*mpss-}
+ ver3=${ver3%%-linux.tar}
+ # Try to match with MPSS 3.x or 3.x.x distro package
+ elif [[ $url =~ mpss-[0-9].[0-9](.[0-9]*)?-$distro.tar ]]; then
+ ver3=${url##*mpss-}
+ ver3=${ver3%%-$distro.tar}
+ # Try to match with MPSS 3.x or 3.x.x source package
+ elif [[ $url =~ mpss-src-[0-9].[0-9](.[0-9]*)?.tar ]]; then
+ ver3=${url##*mpss-src-}
+ ver3=${ver3%%.tar}
+ # Try to match with MPSS 3.x or 3.x.x cross compiler package
+ elif [[ $url =~ mpss-[0-9].[0-9](.[0-9]*)?-k1om.tar ]]; then
+ ver3=${url##*mpss-}
+ ver3=${ver3%%-k1om.tar}
+ # Try to match with MPSS 2.1.x source package
+ elif [[ $url =~ _src-[0-9].[0-9].[0-9]*-[0-9]*_$distro_name.tar ]]; then
+ ver2=${url##*_src-}
+ ver2=${ver2%%_$distro_name.tar}
+ fi
+
+ if [ -n "$ver3" ]; then
+ ver3="${ver3}-0"
+ if [ -z "$build" ]; then
+ res3="$ver3"
+ elif [ "${build%%-*}" = "${ver3%%-*}" ]; then
+ res3="$res3 $url"
+ fi
+ elif [ -n "$ver2" ]; then
+ if [ -z "$build" ]; then
+ res2="$ver2"
+ elif [ "$build" = "$ver2" ]; then
+ res2="$res2 $url"
+ fi
+ fi
+
+ done
+
+ if [ -z "$build" ]; then
+ # return a last version of MPSS
+ if [ -n "$res3" ]; then
+ echo "$res3"
+ else
+ echo "$res2"
+ fi
+ elif [ "${build%%.*}" = "3" ]; then
+ # return URLs from MPSS info file
+ echo "$res3"
+ else
+ # return URLs from MPSS info file
+ echo "$res2"
+ fi
+}
+
+# Get public information about last releases of
+# Intel Manycore Platform Software Stack (MPSS)
+download_mpss_info() {
+ local file="$1"
+ local force="${2:-true}"
+ local url=${MPSS_URL:-"http://software.intel.com/en-us/articles/intel-manycore-platform-software-stack-mpss"}
+
+ download_file "$url" "$file" "$force"
+}
+
+download_mpss() {
+ local file="$1"
+ local force="${2:-false}"
+ local urls=$(parse_mpss_info "$file" ${MPSS_VERSION} ${MPSS_DISTRO})
+
+ [ -z "$urls" ] && return 0
+
+ local url
+ local i=0
+ for url in $urls; do
+ file="$KERNELTREE/mpss_src-${MPSS_VER}-${MPSS_BLD}-${MPSS_DISTRO}-part$i.tar"
+ download_file "$url" "$file" "$force"
+ i=$((i+1))
+ done
+}
+
load_target() {
EXTRA_VERSION_save="$EXTRA_VERSION"
# go away and the target just specify the $RPMSMPTYPE
[ -z "$RPMSMPTYPE" ] && set_rpm_smp_type
- # CC might have been overwriten in TARGET_FILE
+ # CC might have been overwritten in TARGET_FILE
if [[ $CC != ccache\ * ]] && which "$CCACHE" &>/dev/null; then
export CCACHE && export CC="ccache $CC"
fi
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//-/_}
tarflags() {
local file="$1"
+ echo -n '--wildcards '
case "$file" in
'')
fatal 1 "tarflags(): File name argument missing."
;;
*.tar.gz | *.tgz)
- echo 'zxf'
+ echo '-zxf'
;;
*.tar.bz2)
- echo 'jxf'
+ echo '-jxf'
;;
*.tar)
- echo 'xf'
+ echo '-xf'
;;
*)
fatal 1 "tarflags(): Unrecognized tar extension in file: $1"
}
+unpack_mpss() {
+
+ [ -d mpss ] && return 0
+
+ if [ "$MPSS_MAJ" = "3" ]; then
+ local file
+ local i
+ for i in $(seq 0 9); do
+ file="$KERNELTREE/mpss_src-${MPSS_VER}-${MPSS_BLD}-${MPSS_DISTRO}-part$i.tar"
+ if [ -r "$file" ]; then
+ untar "$file" \
+ "mpss-$MPSS_VER/*/linux-*.tar.bz2" \
+ "mpss-$MPSS_VER/*/kernel-dev-*.rpm" \
+ "mpss-$MPSS_VER/*/ofed-driver-devel-*.rpm" \
+ "mpss-$MPSS_VER/*/ofed-driver-*-devel-*.rpm"
+ fi
+ done
+ # Extract kernel configs
+ file=$(find mpss-$MPSS_VER -type f -path "*/kernel-dev-*.rpm" -print -quit)
+ if ! rpm2cpio "$file" | cpio -idm; then
+ echo "Error extracting MPSS kernel configs"
+ return 1
+ fi
+ # Unpack kernel sources
+ file=$(find mpss-$MPSS_VER -type f -path "*/linux-*.tar.bz2" -print -quit)
+ if ! untar "$file"; then
+ echo "Error unpacking MPSS kernel sources"
+ return 1
+ fi
+ # Extract OFED headers
+ file=$(find mpss-$MPSS_VER -type f -path "*/ofed-driver-*-devel-*.rpm" -print -quit)
+ if ! rpm2cpio "$file" | cpio -idm; then
+ # Name was changed in MPSS 3.3
+ file=$(find mpss-$MPSS_VER -type f -path "*/ofed-driver-devel-*.rpm" -print -quit)
+ if ! rpm2cpio "$file" | cpio -idm; then
+ echo "Error extracting MPSS OFED headers"
+ return 1
+ fi
+ fi
+ # Remove unpacked archives to save space
+ rm -rf mpss-$MPSS_VER
+ # Make link to MPSS kernel sources
+ ln -sf linux-* mpss
+ else
+ local dir="mpss-${MPSS_VER}-${MPSS_BLD}-${MPSS_DISTRO%%-*}"
+
+ mkdir $dir || return 255
+ pushd $dir >/dev/null || return 255
+ if ! untar "$KERNELTREE/mpss_src-${MPSS_VER}-${MPSS_BLD}-${MPSS_DISTRO}-part0.tar" "*/gpl/*full_src*"; then
+ popd >/dev/null
+ rm -rf $dir
+ echo "Error unpacking MPSS tarball 1"
+ return 1
+ fi
+ local file=$(find . -type f -path "*/gpl/*full_src*")
+ if ! untar "$file"; then
+ popd >/dev/null
+ rm -rf $dir
+ echo "Error unpacking MPSS tarball 2"
+ return 1
+ fi
+ popd >/dev/null
+ ln -sf $dir mpss
+ fi
+
+}
+
do_patch_linux() {
local do_patch=${1:-true}
}
-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"
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
targets="--target $arch $targets"
done
- local confoptions=""
-
- if $PATCHLESS; then
- confoptions="$confoptions --disable-server"
- fi
-
local rpmbuildopt='-tb'
if $NORPM; then
rpmbuildopt='-tc'
# These are required prior to the building of lustre server. Client does
# not require spl/zfs. Use !PATCHLESS to indicate server which follows the
# line above so is at least consistant.
- if [ $PATCHLESS == false ] && [ "x$ZFSNOTSUPPORTED" == "x" ]; then
+ if [ $PATCHLESS == false ] && [ "x$WITH_ZFS" == "x" ]; then
if ! build_spl_zfs; then
popd >/dev/null # pushd lustre
return 255
fi
fi
- ( $(skeep_ldiskfs_rpm) ) || {
-
- pushd ldiskfs > /dev/null || return 255
-
- if ! ./configure --enable-dist; then
- echo "failed to configure in ldiskfs"
- popd >/dev/null # pushd ldiskfs
- popd >/dev/null # pushd lustre
- return 255
- fi
-
- if ! make dist 2>&1; then
- popd >/dev/null # pushd ldiskfs
- popd >/dev/null # pushd lustre
- return 255
- fi
-
- #cp lustre-ldiskfs*.tar.gz $TOPDIR/SOURCES || \
- # fatal 1 "Could not copy lustre-ldiskfs*.tar.gz to $TOPDIR/SOURCES"
-
- if ! $RPMBUILD $targets $rpmbuildopt lustre-ldiskfs*.tar.gz \
- --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
- --define "kdir $linux" \
- ${linuxobj:+--define "kobjdir $linuxobj"} \
- --define "_tmppath /var/tmp" \
- --define "_topdir $TOPDIR" 2>&1; then
- popd >/dev/null # pushd ldiskfs
- popd >/dev/null # pushd lustre
- return 255
- fi
-
- if $DO_SRC; then
- if ! $RPMBUILD -ts lustre-ldiskfs*.tar.gz \
- --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
- --define "kdir $linux" \
- ${linuxobj:+--define "kobjdir $linuxobj"} \
- --define "_tmppath /var/tmp" \
- --define "_topdir $TOPDIR" 2>&1; then
- popd >/dev/null # pushd ldiskfs
- popd >/dev/null # pushd lustre
- return 255
- fi
- fi
- popd >/dev/null # pushd ldiskfs
-
- # tell lustre where ldiskfs is
- # XXX - pointing to the RPM BUILD dir is a hack. we need to flesh
- # out the ldiskfs RPM build so that it builds a
- # lustre-ldiskfs-devel RPM and install that and point lustre
- # to that instead
- confoptions="$confoptions --with-ldiskfs=$(ls -d $TOPDIR/BUILD/lustre-ldiskfs-*)"
- }
-
- 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
- local is_patchless=""
if $PATCHLESS; then
- is_patchless="yes"
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --without servers"
+ if [ -n "$CROSS_SUFFIX" ]; then
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"lustre_name lustre-client$CROSS_SUFFIX\""
+ fi
fi
# ditto for the lustre-tests boolean
- local lustre_tests=""
if ! $LUSTRE_TESTS; then
- lustre_tests="no"
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --without lustre_tests"
+ fi
+
+ if ! $IOKITRPM; then
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --without lustre_iokit"
fi
local osd_zfs=""
osd_ldiskfs="yes"
fi
- $RPMBUILD $targets $rpmbuildopt "$LUSTRE" \
- ${is_patchless:+--define "lustre_name lustre-client"} \
- ${lustre_tests:+--define "build_lustre_tests 0"} \
- ${osd_zfs:+--define "build_lustre_osd_zfs 1"} \
- ${osd_ldiskfs:+--define "build_lustre_osd_ldiskfs 1"} \
- ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
- --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
- --define "kdir $linux" \
- ${linuxobj:+--define "kobjdir $linuxobj"} \
- --define "_tmppath $TMPDIR" \
- --define "_topdir $TOPDIR" 2>&1 || \
+ RPMBUILD_DEFS="$RPMBUILD_DEFS ${FIND_REQUIRES:+--define \"__find_requires $FIND_REQUIRES\"}"
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"configure_args ${CONFIGURE_FLAGS}\""
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"kdir $linux\""
+ RPMBUILD_DEFS="$RPMBUILD_DEFS ${linuxobj:+--define \"kobjdir $linuxobj\"}"
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"_tmppath $TMPDIR\""
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"_topdir $TOPDIR\""
+
+ eval $RPMBUILD $targets $rpmbuildopt "$LUSTRE" $RPMBUILD_DEFS \
+ ${osd_zfs:+--with zfs} \
+ ${osd_ldiskfs:+--with ldiskfs} 2>&1 || \
fatal 1 "Error building rpms for $BUILD_ARCHS."
if $DO_SRC; then
- if ! $RPMBUILD -ts "$LUSTRE" \
- ${is_patchless:+--define "lustre_name lustre-client"} \
- ${lustre_tests:+--define "build_lustre_tests 0"} \
- ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
- --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
- --define "kdir $linux" \
- ${linuxobj:+--define "kobjdir $linuxobj"} \
- --define "_tmppath $TMPDIR" \
- --define "_topdir $TOPDIR" 2>&1; then
- popd
+ if ! eval $RPMBUILD -ts "$LUSTRE" $RPMBUILD_DEFS 2>&1; then
+ popd >/dev/null
return 255
fi
fi
}
+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
#
# 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.1}
- SPLZFSTAG=${SPLZFSTAG:-lustre-zfs}
+ SPLZFSVER=${SPLZFSVER:-0.6.3-1.2}
+ SPLZFSTAG=${SPLZFSTAG:-}
# The files expect a kver to be set to the kernel version .
local kver=$(find_linux_release)
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 ||
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
# 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
+ # 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
CONFIGURE_FLAGS="--with-$pkg=$(ls -d $TOPDIR/usr/src/$pkg-*/|tail -1) ${CONFIGURE_FLAGS}"
return 0
}
+prepare_mpss() {
+
+ pushd mpss >/dev/null || return 255
+ if [ "$MPSS_MAJ" = "3" ]; then
+ cp -f ../boot/config-* .config
+ if ! make ARCH=k1om silentoldconfig ; then
+ popd >/dev/null
+ return 1
+ fi
+ if ! make ARCH=k1om modules_prepare ; then
+ popd >/dev/null
+ return 1
+ fi
+ cp -f ../boot/Module.symvers-* Module.symvers
+ else
+ if ! make defconfig-miclinux; then
+ popd >/dev/null
+ return 1
+ fi
+ if ! make -C card/kernel ARCH=k1om modules_prepare ; then
+ popd >/dev/null
+ return 1
+ fi
+ fi
+ popd >/dev/null
+
+}
+
stage() {
[ "$STAGEDIR" ] || return 0
}
-#check if we need to build separate ldiskfs RPM
-skeep_ldiskfs_rpm() {
- local skip=false
-
- if ! $LDISKFSRPM; then
- skip=true
- elif $PATCHLESS; then
- skip=true
- fi
-
- echo $skip
-
-}
-
set_rpm_smp_type() {
local infact_arch="${TARGET_ARCH}"
fi
# call a distro specific hook, if available
- if type -p unpack_linux_devel_rpm-$DISTRO; then
- if ! unpack_linux_devel_rpm-$DISTRO "$kernelrpm"; then
+ if type -p unpack_linux_devel_rpm-$DISTROMAJ; then
+ if ! unpack_linux_devel_rpm-$DISTROMAJ "$kernelrpm"; then
return 255
fi
fi
K_SRC="KSRC"
fi
- local OFED_CORE="--with-core-mod --with-ipoib-mod --with-sdp-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod"
- local OFED_HARDWARE="--with-mthca-mod --with-mlx4-mod --with-mlx4_en-mod --with-cxgb3-mod --with-nes-mod"
+ local OFED_CORE="--with-core-mod --with-ipoib-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod"
+ local OFED_HARDWARE="--with-mthca-mod --with-mlx4-mod --with-mlx4_en-mod --with-cxgb3-mod --with-nes-mod --with-qib-mod"
if compare_version $OFED_VERSION 3.0; then
OFED_CORE="$OFED_CORE --with-madeye-mod --with-rds-mod"
else
- OFED_HARDWARE="$OFED_HARDWARE --with-cxgb4-mod"
+ OFED_HARDWARE="$OFED_HARDWARE --with-mlx5-mod --with-cxgb4-mod --with-ocrdma-mod --with-qib-mod"
fi
# some I/B drivers are architecture dependent and kernel-ib's configure
local SOURCE="${TOPDIR}/OFED/SRPMS/${kib_prefix}-*.src.rpm"
# but switch to building from the SPEC if we need to apply patches
- if ls ${TOPDIR}/lustre/build/patches/ofed/* >/dev/null; then
+ if ls ${TOPDIR}/lustre/contrib/patches/ofed/* >/dev/null; then
BUILD_TYPE="-bb"
rpm --define "_topdir ${TOPDIR}" -ivh $SOURCE
SOURCE="${TOPDIR}/SPECS/${kib_prefix}.spec"
local file ed_fragment1 ed_fragment2 n=1
- for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*.patch); do
+ for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.patch); do
ed_fragment1="$ed_fragment1
Patch$n: ${file%%*/}"
ed_fragment2="$ed_fragment2
cp $file ${TOPDIR}/SOURCES
let n=$n+1
done
- for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*.ed); do
+ for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.ed); do
# Only apply the ed-scripts that should be used for the canonical target
- # ed-files in ${TOPDIR}/lustre/build/patches/ofed/ have to follow the naming
+ # ed-files in ${TOPDIR}/lustre/contrib/patches/ofed/ have to follow the naming
# convention
# <two-digits>-<descriptive-name>:<canonical_target_1>: ...:<canonical_target_N>.ed
# To apply the same change to multiple canonical target simply specify
if $USE_BUILD_CACHE && [ -n "$REUSEBUILD" ]; then
local REUSE_SIGNATURE=$({ echo -en $release_str;
echo $BUILD_GEN;
- cat $CONFIG_FILE $TARGET_FILE $FULL_PATCH;
- cat ${0%/lbuild}/lbuild ${0%/lbuild}/lbuild-${DISTRO}; } |
+ cat "$CONFIG_FILE";
+ cat "$TARGET_FILE";
+ cat "$FULL_PATCH";
+ cat "$LBUILD_DIR/lbuild";
+ cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } |
md5sum | cut -d" " -f1)
# see if we can link to the reuse pool
# XXX - hrm. i'm not convinced this doesn't belong in the reuse
# XXX we need to better integrate a distro specific override with
# the rest of this function so that all of the reuse cache
# stuff is leveraged given that 80% of this function is reuse
- if type -p build_ofed-${DISTRO}; then
+ if type -p build_ofed-$DISTROMAJ; then
local ofed_location
- ofed_location=$(build_ofed-${DISTRO} ${STDOUT})
+ ofed_location=$(build_ofed-$DISTROMAJ ${STDOUT})
local rc=${PIPESTATUS[0]}
CONFIGURE_FLAGS="--with-o2ib=${ofed_location} ${CONFIGURE_FLAGS}"
return $rc
echo "$(find_linux_release;
echo "$BUILD_GEN")";
cat "${linux}/include/linux/autoconf.h";
- cat "${0%/lbuild}/lbuild" ;
- cat "${0%/lbuild}/lbuild-${DISTRO}"; } |
+ cat "$LBUILD_DIR/lbuild";
+ cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } |
md5sum | cut -d" " -f1)
# see if we can link to the reuse pool
# XXX - hrm. i'm not convinced this doesn't belong in the reuse
cd ${kib_rpm}-devel
# the actual ofed RPMs don't have the -rc$n or -$date string appened that
# might be present on the file
- local linuxrelease=$(find_linux_release)
- ofed_version=$(echo $ofed_version |
- sed -re 's/-(20[0-9]{6,6}-[0-9]{4,4}|rc[0-9]*)$//')
- local rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-${ofed_version}-${linuxrelease//-/_}.*.rpm)
+ #local linuxrelease=$(find_linux_release)
+ #ofed_version=$(echo $ofed_version |
+ # sed -re 's/-(20[0-9]{6,6}-[0-9]{4,4}|rc[0-9]*)$//')
+ # FIXME
+ # OFED version will have 'hyphen' for minor release. (e.g. 3.5-1, instead
+ # of 3.5.1) compat-rdma and compat-rdma-devel could have same version
+ # number, but currectly not. Once OFED fix this in the future release, we
+ # can remove following filter.
+ #ofed_version=$(echo $ofed_version |
+ # sed -re 's/-([0-9]*-[rR][cC][0-9]*)$//')
+ #local rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-${ofed_version}-${linuxrelease//-/_}.*.rpm)
+ # I dont' know why we have gone through the trouble to filter out the name
+ # of the rpm there should only be one ${kib_rpm}-devel built
+ local rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-*.rpm)
if ! rpm2cpio < $rpm | cpio -id; then
fatal 1 "could not unpack the ${kib_rpm}-devel rpm."
fi
# client build
local kernelrpm
if ! kernelrpm=$(find_linux_rpm "-$DEVEL_KERNEL_TYPE"); then
- fatal 1 "Could not find the kernel-$DEVEL_KERNEL_TYPE RPM in ${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}"
+ fatal 1 "Could not find the kernel-$DEVEL_KERNEL_TYPE RPM in $KERNELRPMSBASE/$lnxmaj/$DISTROMAJ"
fi
if ! lnxrel="$lnxrel" unpack_linux_devel_rpm "$kernelrpm" "-"; then
fatal 1 "Could not find the Linux tree in $kernelrpm"
[ -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:,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,disable-zfs,release,set-value:,src,stage:,target:,target-archs:,with-linux:,xen -- "$@")
if [ $? != 0 ]; then
usage 1
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"
NORPM=true
shift
;;
- --ldiskfs)
- LDISKFSRPM=true
- shift
- ;;
--noiokit)
IOKITRPM=false
shift
OFED_VERSION="$2"
shift 2
;;
+ --mpss-version)
+ MPSS_VERSION="$2"
+ shift 2
+ ;;
--publish)
shift
;;
+ --disable-zfs)
+ WITH_ZFS="no"
+ shift
+ ;;
--release)
RELEASE=true
shift
STAGEDIR=$2
shift 2
;;
- --tag)
- shift 2
- echo "WARNING: \"--tag\" is deprecated" > 2
- ;;
--target)
TARGET=$2
shift 2
LUSTRE_TESTS=false
fi
CONFIGURE_FLAGS=$@
- CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-liblustre --enable-liblustre-tests"
break
;;
*)
# XXX - should we _always_ get the buildid from the META file? what are the
# other (i.e. non-lustre-tarball use cases of lbuild)?
-BUILDID=$(sed -ne '/^BUILDID =/s/.*= *//p' lustre/META)
+BUILDID=$(sed -n -e 's/^BUILDID = //p' lustre/META)
load_target
unpack_ofed || fatal 1 "Error unpacking OFED tarball"
fi
+if [ -n "$MPSS_VERSION" ]; then
+ [ -z "$MPSS_DISTRO" ] && MPSS_DISTRO=$(autodetect_distro)
+
+ MPSS_INFO=$(mktemp -u mpss-info-XXXXXXXXXX.html)
+ download_mpss_info "$MPSS_INFO"
+
+ if [ "$MPSS_VERSION" = "last" ]; then
+ MPSS_VERSION=$(parse_mpss_info "$MPSS_INFO" "" ${MPSS_DISTRO})
+ [ -z "$MPSS_VERSION" ] &&
+ fatal 1 "Could not determine the last MPSS version"
+ fi
+
+ MPSS_MAJ=${MPSS_VERSION%%.*}
+ MPSS_VER=${MPSS_VERSION%%-*}
+ MPSS_BLD=${MPSS_VERSION##*-}
+ [ "$MPSS_VER" = "$MPSS_BLD" ] && MPSS_BLD=0
+
+ download_mpss "$MPSS_INFO"
+ [ -r "$MPSS_INFO" ] && rm -f "$MPSS_INFO"
+ echo "Building with MPSS $MPSS_VER-$MPSS_BLD"
+ unpack_mpss || fatal 1 "Error unpacking MPSS tarballs"
+ prepare_mpss || fatal 1 "Error preparing MPSS for kernel modules build"
+
+ if [ -z "$MPSS_OFED" ]; then
+ MPSS_OFED=$(find $PWD -type f -path "*/ofed-driver*/Module.symvers" -print -quit)
+ if [ -n "$MPSS_OFED" ]; then
+ MPSS_OFED="--with-o2ib=$(dirname $MPSS_OFED)"
+ else
+ MPSS_OFED="--without-o2ib"
+ fi
+ fi
+
+ # disable unsupported parts:
+ PATCHLESS=true
+ IOKITRPM=false
+ LDISKFSRPM=false
+ WITH_ZFS="no"
+
+ # define variables for cross compilation:
+ CROSS_SUFFIX="-mic"
+ if [ "$MPSS_MAJ" = "3" ]; then
+ CC_TARGET_ARCH=k1om-mpss-linux
+ LINUX="$TOPDIR/mpss"
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"cross_requires /bin/sh\""
+ else
+ CC_TARGET_ARCH=x86_64-k1om-linux
+ LINUX="$TOPDIR/mpss/card/kernel"
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"cross_requires intel-mic-gpl = $MPSS_VER\""
+ fi
+ LUSTRE_VERSION=$(sed -n -e 's/^VERSION = //p' lustre/META)
+ CONFIGURE_FLAGS="$CONFIGURE_FLAGS $MPSS_OFED --host=$CC_TARGET_ARCH --build=x86_64-pc-linux"
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"post_script build/gen_filelist.sh\""
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"make_args ARCH=k1om CROSS_COMPILE=${CC_TARGET_ARCH}-\""
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"cross_path ${CROSS_PATH:=/opt/lustre/${LUSTRE_VERSION}/${CC_TARGET_ARCH}}\""
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"rootdir %{cross_path}\""
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"_prefix %{cross_path}/usr\""
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"_mandir %{_prefix}/share/man\""
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"_sysconfdir %{cross_path}/etc\""
+ RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"kmoddir extra\""
+
+ # redefine CC for proper ./configure during rpmbuild
+ export CC=${CC_TARGET_ARCH}-gcc
+fi
+
# make sure the RPM build environment is set up
create_rpmbuild_dirs
# if an unpacked kernel source tree was given on the command line
# just build lustre with it (nothing distro kernel specific here)
if [ -n "$LINUX" ]; then
+ find_linux_release() {
+ _find_linux_release $LINUX
+ }
build_ofed "${LINUXOBJ:-$LINUX}" "$OFED_VERSION" ||
fatal 1 "error building OFED"
build_lustre "$LINUX" "$LINUXOBJ"
else
- if [ ! -f "${LBUILD_DIR}/lbuild-$DISTRO" ]; then
- fatal 1 "${LBUILD_DIR}/lbuild-$DISTRO not found"
+ if [ ! -f "${LBUILD_DIR}/lbuild-$DISTROMAJ" ]; then
+ fatal 1 "${LBUILD_DIR}/lbuild-$DISTROMAJ not found"
fi
- source ${LBUILD_DIR}/lbuild-$DISTRO
+ source ${LBUILD_DIR}/lbuild-$DISTROMAJ
build_with_srpm || fatal 1 "Failed to build_with_srpm"
fi
git://git.whamcloud.com / fs / lustre-release.git / blobdiff