]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
nfs-ganesha: Remove lizardFSAL patch 1442/head
authorBrad Hubbard <bhubbard@redhat.com>
Thu, 21 Nov 2019 22:03:39 +0000 (08:03 +1000)
committerBrad Hubbard <bhubbard@redhat.com>
Fri, 22 Nov 2019 01:41:25 +0000 (11:41 +1000)
This is a follow-up to 888793c4 to 'commit' the patch.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
nfs-ganesha/build/build_deb

index f988d5eda40117d93ebb053311d8656c29785b81..e25f5b7888dff6a90035c5209573b8d9c0a2b93d 100644 (file)
@@ -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)