From e559b4da5b4cf0cf94990906f7523d6efcdcdbc9 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@videolan.org>
Date: Wed, 17 Feb 2021 18:22:27 +0300
Subject: [PATCH] modules: Added a hack to make build system fetch a requested
nginx version
We're now using a tip of default branch on pkg-oss which moves fast and
breaks things. A better solution is probably to check out a specific
nginx tag and build whatever is available for it. This, however, is not
currently possible with 1.19.6, and only works for 1.19.7. This should
probably be reverted once we have enough tags supporting it.
---
modules/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/Dockerfile b/modules/Dockerfile
index 9ea6df8..de4c0a7 100644
--- a/modules/Dockerfile
+++ b/modules/Dockerfile
@@ -45,9 +45,9 @@ RUN set -ex \
elif make -C /pkg-oss/debian list | grep -P "^$module\s+\d" > /dev/null; then \
echo "Building $module from pkg-oss sources"; \
cd /pkg-oss/debian; \
- make rules-module-$module BASE_VERSION=$NGINX_VERSION; \
+ make rules-module-$module BASE_VERSION=$NGINX_VERSION NGINX_VERSION=$NGINX_VERSION; \
mk-build-deps --install --tool="apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes" debuild-module-$module/nginx-$NGINX_VERSION/debian/control; \
- make module-$module BASE_VERSION=$NGINX_VERSION; \
+ make module-$module BASE_VERSION=$NGINX_VERSION NGINX_VERSION=$NGINX_VERSION; \
find ../../ -maxdepth 1 -mindepth 1 -type f -name "*.deb" -exec mv -v {} /tmp/packages/ \;; \
else \
echo "Don't know how to build $module module, exiting"; \
--
GitLab