From: Brad Hubbard <bhubbard@redhat.com>
Date: Thu, 21 Nov 2019 22:03:39 +0000 (+1000)
Subject: nfs-ganesha: Remove lizardFSAL patch
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1442%2Fhead;p=ceph-build.git

nfs-ganesha: Remove lizardFSAL patch

This is a follow-up to 888793c4 to 'commit' the patch.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb
index f988d5ed..e25f5b78 100644
--- a/nfs-ganesha/build/build_deb
+++ b/nfs-ganesha/build/build_deb
@@ -85,7 +85,8 @@ cd $WORKSPACE/nfs-ganesha
 # add debian directory next to src
 mv $WORKSPACE/nfs-ganesha-debian/debian $WORKSPACE/nfs-ganesha/
 
-# create and apply a patch to disable LizardFS FSAL
+# create and apply a patch to disable LizardFS FSAL see
+# https://review.gerrithub.io/c/ffilz/nfs-ganesha/+/475437
 echo "LS0tIGEvZGViaWFuL3J1bGVzCisrKyBiL2RlYmlhbi9ydWxlcwpAQCAtMjgsNiArMjgsNyBAQCBv
 dmVycmlkZV9kaF9hdXRvX2NvbmZpZ3VyZToKIAkJLURVU0VfRlNBTF9YRlM9T0ZGIFwKIAkJLURV
 U0VfRlNBTF9DRVBIPU9OIFwKIAkJLURVU0VfRlNBTF9SR1c9T04gXAorCQktRFVTRV9GU0FMX0xJ
@@ -93,6 +94,7 @@ WkFSREZTPU9GRiBcCiAJCS1EVVNFX0ZTQUxfR1BGUz1PRkYgXAogCQktRFVTRV9GU0FMX1BBTkZT
 PU9GRiBcCiAJCS1EVVNFX0ZTQUxfR0xVU1RFUj1PRkYgXAo="|base64 -d > disable-lizardfs-fsal.patch
 
 patch -p1 < disable-lizardfs-fsal.patch
+rm -f disable-lizardfs-fsal.patch
 
 ## Get some basic information about the system and the repository
 DEB_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)