nfs-ganesha: fix broken builds 1806/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Wed, 28 Apr 2021 14:02:15 +0000 (16:02 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Wed, 28 Apr 2021 14:04:55 +0000 (16:04 +0200)
This job must be updated due to recent chances in nfs-ganesha (CMakeLists.txt)

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
nfs-ganesha/build/build_deb
nfs-ganesha/build/build_rpm

index 3744006e299a6b1cdf7cbf08a79cb6db986ab8b4..511b8aead171ab6526e214434bd2f3933baae151 100644 (file)
@@ -52,17 +52,17 @@ PACKAGE_MANAGER_VERSION="`git describe --long | sed 's/V//1'`-1${DIST}"
 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
+echo "LS0tIGEvc3JjL0NNYWtlTGlzdHMudHh0CisrKyBiL3NyYy9DTWFrZUxpc3RzLnR4dApAQCAtMTA4
+OSwxMSArMTA4OSwxNCBAQAogICBzZXQoVVNFX0dTUyAke1VTRV9HU1N9IENBQ0hFIEJPT0wgIlVz
+ZSBHU1MiKQogICBzZXQoQ01BS0VfTU9EVUxFX1BBVEggJHtDTUFLRV9NT0RVTEVfUEFUSH0KIAkg
+ICIke0dBTkVTSEFfVE9QX0NNQUtFX0RJUn0vbGlibnRpcnBjL2NtYWtlL21vZHVsZXMvIikKKyAg
+c2V0KFNBVkVfTFRUTkcgJHtVU0VfTFRUTkd9KQorICBzZXQoVVNFX0xUVE5HIE9GRikKICAgYWRk
+X3N1YmRpcmVjdG9yeShsaWJudGlycGMpCiAgIHNldChOVElSUENfTElCUkFSWSBudGlycGMpCiAg
+IGlmIChVU0VfTFRUTkcpCiAgICAgc2V0KE5USVJQQ19MSUJSQVJZICR7TlRJUlBDX0xJQlJBUll9
+IG50aXJwY19sdHRuZykKICAgZW5kaWYgKFVTRV9MVFRORykKKyAgc2V0KFVTRV9MVFRORyAke1NB
+VkVfTFRUTkd9KQogICBzZXQoTlRJUlBDX0lOQ0xVREVfRElSICIke1BST0pFQ1RfU09VUkNFX0RJ
+Un0vbGlibnRpcnBjL250aXJwYy8iKQogICBtZXNzYWdlKFNUQVRVUyAiVXNpbmcgbnRpcnBjIHN1
+Ym1vZHVsZSIpCiBlbmRpZiAoVVNFX1NZU1RFTV9OVElSUEMpCg==" | base64 -d > lttng-fix.patch
 
 patch -p1 < lttng-fix.patch
 
index 816678c36de4e1a98380cb5b539a17481733176a..71d2b3d911815239a5a0dfb3f4c74339ea0e93a6 100644 (file)
@@ -95,17 +95,17 @@ cd $WORKSPACE/nfs-ganesha
 git submodule update --init || git submodule sync
 
 # 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
+echo "LS0tIGEvc3JjL0NNYWtlTGlzdHMudHh0CisrKyBiL3NyYy9DTWFrZUxpc3RzLnR4dApAQCAtMTA4
+OSwxMSArMTA4OSwxNCBAQAogICBzZXQoVVNFX0dTUyAke1VTRV9HU1N9IENBQ0hFIEJPT0wgIlVz
+ZSBHU1MiKQogICBzZXQoQ01BS0VfTU9EVUxFX1BBVEggJHtDTUFLRV9NT0RVTEVfUEFUSH0KIAkg
+ICIke0dBTkVTSEFfVE9QX0NNQUtFX0RJUn0vbGlibnRpcnBjL2NtYWtlL21vZHVsZXMvIikKKyAg
+c2V0KFNBVkVfTFRUTkcgJHtVU0VfTFRUTkd9KQorICBzZXQoVVNFX0xUVE5HIE9GRikKICAgYWRk
+X3N1YmRpcmVjdG9yeShsaWJudGlycGMpCiAgIHNldChOVElSUENfTElCUkFSWSBudGlycGMpCiAg
+IGlmIChVU0VfTFRUTkcpCiAgICAgc2V0KE5USVJQQ19MSUJSQVJZICR7TlRJUlBDX0xJQlJBUll9
+IG50aXJwY19sdHRuZykKICAgZW5kaWYgKFVTRV9MVFRORykKKyAgc2V0KFVTRV9MVFRORyAke1NB
+VkVfTFRUTkd9KQogICBzZXQoTlRJUlBDX0lOQ0xVREVfRElSICIke1BST0pFQ1RfU09VUkNFX0RJ
+Un0vbGlibnRpcnBjL250aXJwYy8iKQogICBtZXNzYWdlKFNUQVRVUyAiVXNpbmcgbnRpcnBjIHN1
+Ym1vZHVsZSIpCiBlbmRpZiAoVVNFX1NZU1RFTV9OVElSUEMpCg==" | base64 -d > lttng-fix.patch
 
 patch -p1 < lttng-fix.patch