From 670e06a92318e793c0532a2f68269033785d7f1f Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Tue, 30 Oct 2018 09:16:28 -0400 Subject: [PATCH] nfs-ganesha: various nfs-ganesha build fixes - fix nfs-ganesha build for debian - add missing packages for stable rpm builds - cleanup for rpm nfs-ganesha build scripts Signed-off-by: Ali Maredia --- nfs-ganesha-stable/build/build_rpm | 2 ++ nfs-ganesha/build/build_deb | 30 +++++++++++++++--------------- nfs-ganesha/build/build_rpm | 4 ++-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/nfs-ganesha-stable/build/build_rpm b/nfs-ganesha-stable/build/build_rpm index 521fe0f5..cf2b3b8f 100644 --- a/nfs-ganesha-stable/build/build_rpm +++ b/nfs-ganesha-stable/build/build_rpm @@ -54,6 +54,8 @@ krb5-devel librados-devel-${CEPH_VERSION} librgw-devel-${CEPH_VERSION} libcephfs-devel-${CEPH_VERSION} +lttng-ust-devel +lttng-tools-devel " sudo yum install -y mock diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb index dea537d8..d6f36521 100644 --- a/nfs-ganesha/build/build_deb +++ b/nfs-ganesha/build/build_deb @@ -51,6 +51,21 @@ PACKAGE_MANAGER_VERSION="`git describe --long | sed 's/V//1'`-1${DIST}" # Version is in format X.XdevX-X-SHA1 VERSION=`git describe --long | sed -e 's/V//1'` +# create and apply a patch file to turn of USE_LTTNG in libntirpc submodule +echo "LS0tIGEvc3JjL0NNYWtlTGlzdHMudHh0CisrKyBiL3NyYy9DTWFrZUxpc3RzLnR4dApAQCAtMTAx +MywxMSArMTAxMywxNCBAQCBlbHNlIChVU0VfU1lTVEVNX05USVJQQykKICAgc2V0KFVTRV9HU1Mg +JHtVU0VfR1NTfSBDQUNIRSBCT09MICJVc2UgR1NTIikKICAgc2V0KENNQUtFX01PRFVMRV9QQVRI +ICR7Q01BS0VfTU9EVUxFX1BBVEh9CiAJICAiJHtDTUFLRV9TT1VSQ0VfRElSfS9saWJudGlycGMv +Y21ha2UvbW9kdWxlcy8iKQorICBzZXQoU0FWRV9MVFRORyAke1VTRV9MVFROR30pCisgIHNldChV +U0VfTFRUTkcgT0ZGKQogICBhZGRfc3ViZGlyZWN0b3J5KGxpYm50aXJwYykKICAgc2V0KE5USVJQ +Q19MSUJSQVJZIG50aXJwYykKICAgaWYgKFVTRV9MVFRORykKICAgICBzZXQoTlRJUlBDX0xJQlJB +UlkgJHtOVElSUENfTElCUkFSWX0gbnRpcnBjX2x0dG5nKQogICBlbmRpZiAoVVNFX0xUVE5HKQor +ICBzZXQoVVNFX0xUVE5HICR7U0FWRV9MVFROR30pCiAgIHNldChOVElSUENfSU5DTFVERV9ESVIg +IiR7UFJPSkVDVF9TT1VSQ0VfRElSfS9saWJudGlycGMvbnRpcnBjLyIpCiAgIG1lc3NhZ2UoU1RB +VFVTICJVc2luZyBudGlycGMgc3VibW9kdWxlIikKIGVuZGlmIChVU0VfU1lTVEVNX05USVJQQykK"| base64 -d > lttng-fix.patch + +patch -p1 < lttng-fix.patch + rm -rf .git cd $WORKSPACE @@ -67,21 +82,6 @@ tar xzf ${NFS_GANESHA_ORIG_TAR_GZ} cd $WORKSPACE/nfs-ganesha -# create and apply a patch file to turn of USE_LTTNG in libntirpc submodule -echo "LS0tIGEvc3JjL0NNYWtlTGlzdHMudHh0CisrKyBiL3NyYy9DTWFrZUxpc3RzLnR4dApAQCAtMTAx -MywxMSArMTAxMywxNCBAQCBlbHNlIChVU0VfU1lTVEVNX05USVJQQykKICAgc2V0KFVTRV9HU1Mg -JHtVU0VfR1NTfSBDQUNIRSBCT09MICJVc2UgR1NTIikKICAgc2V0KENNQUtFX01PRFVMRV9QQVRI -ICR7Q01BS0VfTU9EVUxFX1BBVEh9CiAJICAiJHtDTUFLRV9TT1VSQ0VfRElSfS9saWJudGlycGMv -Y21ha2UvbW9kdWxlcy8iKQorICBzZXQoU0FWRV9MVFRORyAke1VTRV9MVFROR30pCisgIHNldChV -U0VfTFRUTkcgT0ZGKQogICBhZGRfc3ViZGlyZWN0b3J5KGxpYm50aXJwYykKICAgc2V0KE5USVJQ -Q19MSUJSQVJZIG50aXJwYykKICAgaWYgKFVTRV9MVFRORykKICAgICBzZXQoTlRJUlBDX0xJQlJB -UlkgJHtOVElSUENfTElCUkFSWX0gbnRpcnBjX2x0dG5nKQogICBlbmRpZiAoVVNFX0xUVE5HKQor -ICBzZXQoVVNFX0xUVE5HICR7U0FWRV9MVFROR30pCiAgIHNldChOVElSUENfSU5DTFVERV9ESVIg -IiR7UFJPSkVDVF9TT1VSQ0VfRElSfS9saWJudGlycGMvbnRpcnBjLyIpCiAgIG1lc3NhZ2UoU1RB -VFVTICJVc2luZyBudGlycGMgc3VibW9kdWxlIikKIGVuZGlmIChVU0VfU1lTVEVNX05USVJQQykK"| base64 -d > lttng-fix.patch - -patch -p1 < lttng-fix.patch - # add debian directory next to src mv $WORKSPACE/nfs-ganesha-debian/debian $WORKSPACE/nfs-ganesha/ diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm index 935bcb69..67c5eca4 100644 --- a/nfs-ganesha/build/build_rpm +++ b/nfs-ganesha/build/build_rpm @@ -45,14 +45,14 @@ libcap-devel libnfsidmap-devel libwbclient-devel krb5-devel +librados-devel librgw-devel libcephfs-devel lttng-ust-devel lttng-tools-devel " -# 1-17-17 will remove on next push of EPEL 7 stable, can remove in a couple days -sudo yum install -y mock --enablerepo=epel-testing +sudo yum install -y mock # Normalize variables across rpm/deb builds NORMAL_DISTRO=$DISTRO -- 2.39.5