From: Brad Hubbard Date: Fri, 22 Nov 2019 01:39:45 +0000 (+1000) Subject: Revert "nfs-ganesha: dpkg commit source after lizardFSAL patch" X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1441%2Fhead;p=ceph-build.git Revert "nfs-ganesha: dpkg commit source after lizardFSAL patch" --- diff --git a/nfs-ganesha/build/build_deb b/nfs-ganesha/build/build_deb index 0eac770c..f988d5ed 100644 --- a/nfs-ganesha/build/build_deb +++ b/nfs-ganesha/build/build_deb @@ -85,8 +85,7 @@ 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 see -# https://review.gerrithub.io/c/ffilz/nfs-ganesha/+/475437 +# create and apply a patch to disable LizardFS FSAL echo "LS0tIGEvZGViaWFuL3J1bGVzCisrKyBiL2RlYmlhbi9ydWxlcwpAQCAtMjgsNiArMjgsNyBAQCBv dmVycmlkZV9kaF9hdXRvX2NvbmZpZ3VyZToKIAkJLURVU0VfRlNBTF9YRlM9T0ZGIFwKIAkJLURV U0VfRlNBTF9DRVBIPU9OIFwKIAkJLURVU0VfRlNBTF9SR1c9T04gXAorCQktRFVTRV9GU0FMX0xJ @@ -95,9 +94,6 @@ PU9GRiBcCiAJCS1EVVNFX0ZTQUxfR0xVU1RFUj1PRkYgXAo="|base64 -d > disable-lizardfs-f patch -p1 < disable-lizardfs-fsal.patch -# This applies the above commit -sudo dpkg-source --commit - ## Get some basic information about the system and the repository DEB_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)