[Drbd-dev] [PATCH] compat: make spaas url configurable
Andrei Kvapil
kvapss at gmail.com
Wed Jun 15 16:06:20 CEST 2022
Add opportunity to override SPAAS_URL with local address in case of
building drbd in environments without external internet connectivity.
---
Makefile | 1 +
drbd/Makefile | 2 ++
drbd/drbd-kernel-compat/gen_compat_patch.sh | 7 ++++---
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 87c29518..37d7851d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ DOCKERIMAGESTARGETS = $(addprefix dockerimage.,$(DOCKERIMAGES))
# Use the SPAAS (spatch as a service) online service
# Have this as make variable for distributions.
SPAAS ?= true
+SPAAS_URL ?= https://drbd.io:2020
# default for KDIR/KVER
ifndef KVER
diff --git a/drbd/Makefile b/drbd/Makefile
index 597cf30f..089e5e3a 100644
--- a/drbd/Makefile
+++ b/drbd/Makefile
@@ -40,7 +40,9 @@ MAKEFLAGS += -rR --no-print-directory
# Use the SPAAS (spatch as a service) online service
# Have this as make variable for distributions.
SPAAS ?= true
+SPAAS_URL ?= https://drbd.io:2020
export SPAAS
+export SPAAS_URL
# since 2.6.16, KERNELRELEASE may be empty,
# e.g. when building against some (broken?) linux-header package.
diff --git a/drbd/drbd-kernel-compat/gen_compat_patch.sh b/drbd/drbd-kernel-compat/gen_compat_patch.sh
index c57b961c..b8595722 100644
--- a/drbd/drbd-kernel-compat/gen_compat_patch.sh
+++ b/drbd/drbd-kernel-compat/gen_compat_patch.sh
@@ -125,10 +125,11 @@ else
echo " SPAAS $chksum"
# check if SPAAS is even reachable
- if ! curl -fsS https://drbd.io:2020/api/v1/hello; then
+ SPAAS_URL=${SPAAS_URL:-https://drbd.io:2020}
+ if ! curl -fsS $SPAAS_URL/api/v1/hello; then
echo " ERROR: SPAAS is not reachable! Please check if your network"
echo " configuration or some firewall prohibits access to "
- echo " https://drbd.io:2020."
+ echo " $SPAAS_URL."
exit 1
fi
@@ -136,7 +137,7 @@ else
rm -f $compat_patch.tmp.header $compat_patch.tmp
if ! base64 $incdir/compat.h |
curl -T - -X POST -o $compat_patch.tmp -D $compat_patch.tmp.header -f \
- https://drbd.io:2020/api/v1/spatch/$REL_VERSION
+ $SPAAS_URL/api/v1/spatch/$REL_VERSION
then
ex=${PIPESTATUS[*]}
(
--
2.32.0 (Apple Git-132)
More information about the drbd-dev
mailing list