From d61103d329bad5b92c951c8ad06a4f1b431759aa Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Wed, 28 Nov 2018 17:31:40 -0500 Subject: [PATCH] LU-11394 build: Remove SPL requirements Because ZFS and SPL are version locked, and ZFS has explicit requirements for SPL, remove lustre's SPL requirements. lbuild: Make building spl optional when version is changed. Test-Parameters: trivial Test-Parameters: mdtfilesystemtype=zfs ostfilesystemtype=zfs ostcount=2 Signed-off-by: Nathaniel Clark Change-Id: Iedba8d4047ba1fa852a2f99db2cd1b6caff33326 Reviewed-on: https://review.whamcloud.com/33743 Reviewed-by: Minh Diep Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 179 +++++++++++++++++++++++++---------------------- lustre-dkms.spec.in | 1 - lustre-dkms_pre-build.sh | 10 +-- 3 files changed, 97 insertions(+), 93 deletions(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index f11778d..13c7d92 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1024,20 +1024,22 @@ build_spl_zfs() { export RPM_BUILD_ROOT=$TOPDIR SPLZFSVER=${SPLZFSVER:-0.7.13} SPLZFSTAG=${SPLZFSTAG:-} + # "spl zfs" prior to 0.8.0 + # "zfs" for 0.8.0 and later + SPLZFSPKGS="spl zfs" # The files expect a kver to be set to the kernel version . local kver=$(find_linux_release) # build and install the spl and zfs (and -devel) RPMs for lustre to use local pkg - for pkg in spl zfs; do + local spldir + for pkg in $SPLZFSPKGS; do - local rpmpkg + local rpmpkg - [ "$pkg" == "zfs" ] && spldir="$(ls -d $TOPDIR/usr/src/spl-*|tail -1)" - - # need to fetch the repo in order to build it. - # default to github but allow override + # need to fetch the repo in order to build it. + # default to github but allow override git clone -n ${SPLZFSGITREPO:-"https://github.com/zfsonlinux"}/$pkg.git $pkg 2>&1 pushd $pkg || return 255 @@ -1049,91 +1051,98 @@ build_spl_zfs() { fi git checkout -b lbuild $tag || fatal 1 "Failed to checkout \"$tag\" for $pkg.git" - # 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 - - sh autogen.sh || return 255 - - if ! ./configure --with-linux=${LINUX} --with-linux-obj=${LINUXOBJ:-$LINUX} \ - ${spldir:+--with-spl="${spldir}"} 2>&1 || - ! make dist 2>&1; then - popd - return 255 - fi - popd + # 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 - 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 + sh autogen.sh || return 255 - 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 "_use_internal_dependency_generator 0" \ - --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 + if ! ./configure --with-linux=${LINUX} --with-linux-obj=${LINUXOBJ:-$LINUX} \ + ${spldir:+--with-spl="${spldir}"} 2>&1 || + ! make dist 2>&1; then + popd + return 255 + fi + popd - # We have built the rpms for the package. Now we need to extract the - # contained files so we can build further things against them - local rpms=$(ls -1 $TOPDIR/RPMS/*/$rpmpkg-*.rpm) + 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 - # cpio only extract to pwd so we need to go there. - pushd $TOPDIR - local rpm - for rpm in $rpms; do - rpm2cpio $rpm | cpio -id - done + local rpmb + if $DO_SRC; then + rpmb=-ba + else + rpmb=-bb + fi - 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 + # 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 "_use_internal_dependency_generator 0" \ + --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 + + # We have built the rpms for the package. Now we need to extract the + # contained files so we can build further things against them + local rpms=$(ls -1 $TOPDIR/RPMS/*/$rpmpkg-*.rpm) + + # cpio only extract to pwd so we need to go there. + pushd $TOPDIR + local rpm + for rpm in $rpms; do + rpm2cpio $rpm | cpio -id + 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}" + if [ -z "$spldir" ]; then + # if spldir is empty, then we are only building ZFS and need to define SPL config flags + CONFIGURE_FLAGS="--with-spl=$(ls -d $TOPDIR/usr/src/spl-*|tail -1) ${CONFIGURE_FLAGS}" + CONFIGURE_FLAGS="--with-spl-obj=$(ls -d $TOPDIR/usr/src/$pkg-*/$kver*|tail -1) ${CONFIGURE_FLAGS}" + fi + elif [ "$pkg" == "spl" ]; then + spldir="$(ls -d $TOPDIR/usr/src/spl-*|tail -1)" + fi + popd - CONFIGURE_FLAGS="--with-$pkg=$(ls -d $TOPDIR/usr/src/$pkg-*|tail -1) ${CONFIGURE_FLAGS}" - CONFIGURE_FLAGS="--with-$pkg-obj=$(ls -d $TOPDIR/usr/src/$pkg-*/$kver*|tail -1) ${CONFIGURE_FLAGS}" + CONFIGURE_FLAGS="--with-$pkg=$(ls -d $TOPDIR/usr/src/$pkg-*|tail -1) ${CONFIGURE_FLAGS}" + CONFIGURE_FLAGS="--with-$pkg-obj=$(ls -d $TOPDIR/usr/src/$pkg-*/$kver*|tail -1) ${CONFIGURE_FLAGS}" done OSDZFSRPM=true diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in index 89527e1..76ecf36 100644 --- a/lustre-dkms.spec.in +++ b/lustre-dkms.spec.in @@ -65,7 +65,6 @@ Requires: zlib-devel # the packages are split into independent client/server/common packages. Obsoletes: @PACKAGE@-client < %{version} %if %{with zfs} -Requires: spl-dkms >= 0.6.5 Requires: zfs-dkms >= 0.6.5 Requires: @PACKAGE@-osd-zfs-mount Conflicts: @PACKAGE@-ldiskfs-dkms diff --git a/lustre-dkms_pre-build.sh b/lustre-dkms_pre-build.sh index f1688fa..eea05e2 100755 --- a/lustre-dkms_pre-build.sh +++ b/lustre-dkms_pre-build.sh @@ -19,11 +19,7 @@ case $1 in LDISKFS="--disable-ldiskfs" fi - SPL_VERSION=$(dkms status -m spl -k $3 -a $5 | awk -F', ' '{print $2; exit 0}' | grep -v ': added$') - if [ -z $SPL_VERSION ] ; then - echo "spl-dkms package must already be installed and built under DKMS control" - exit 1 - fi + # ZFS and SPL are version locked ZFS_VERSION=$(dkms status -m zfs -k $3 -a $5 | awk -F', ' '{print $2; exit 0}' | grep -v ': added$') if [ -z $ZFS_VERSION ] ; then echo "zfs-dkms package must already be installed and built under DKMS control" @@ -32,8 +28,8 @@ case $1 in SERVER="--enable-server $LDISKFS \ --with-linux=$4 --with-linux-obj=$4 \ - --with-spl=$6/spl-${SPL_VERSION} \ - --with-spl-obj=$7/spl/${SPL_VERSION}/$3/$5 \ + --with-spl=$6/spl-${ZFS_VERSION} \ + --with-spl-obj=$7/spl/${ZFS_VERSION}/$3/$5 \ --with-zfs=$6/zfs-${ZFS_VERSION} \ --with-zfs-obj=$7/zfs/${ZFS_VERSION}/$3/$5" -- 1.8.3.1