Skip to content

Commit ba3e889

Browse files
thresheekthresheek
committed
Make variables consistent with names of contribs
1 parent 78d8ac9 commit ba3e889

File tree

18 files changed

+45
-45
lines changed

18 files changed

+45
-45
lines changed

‎alpine/Makefile.module-geoip2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ MODULE_CONTRIB_DEPS_geoip2= ngx_http_geoip2_module
66

77
include $(foreach dep,$(MODULE_CONTRIB_DEPS_geoip2),$(CONTRIB)/src/$(dep)/version)
88

9-
MODULE_VERSION_geoip2= $(GEOIP2_NGINX_MODULE_VERSION)
9+
MODULE_VERSION_geoip2= $(NGX_HTTP_GEOIP2_MODULE_VERSION)
1010
MODULE_RELEASE_geoip2= 1
1111

1212
MODULE_VERSION_PREFIX_geoip2=$(MODULE_TARGET_PREFIX)
1313

14-
MODULE_SOURCES_geoip2= ngx_http_geoip2_module-$(GEOIP2_NGINX_MODULE_VERSION).tar.gz
14+
MODULE_SOURCES_geoip2= ngx_http_geoip2_module-$(NGX_HTTP_GEOIP2_MODULE_VERSION).tar.gz
1515

16-
MODULE_CONFARGS_geoip2= --add-dynamic-module=$(MODSRC_PREFIX)ngx_http_geoip2_module-$(GEOIP2_NGINX_MODULE_VERSION)
16+
MODULE_CONFARGS_geoip2= --add-dynamic-module=$(MODSRC_PREFIX)ngx_http_geoip2_module-$(NGX_HTTP_GEOIP2_MODULE_VERSION)
1717

1818
prerequisites-for-module-geoip2:
1919

‎alpine/Makefile.module-subs-filter‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ MODULE_CONTRIB_DEPS_subs-filter= ngx_http_substitutions_filter_module
66

77
include $(foreach dep,$(MODULE_CONTRIB_DEPS_subs-filter),$(CONTRIB)/src/$(dep)/version)
88

9-
MODULE_VERSION_subs_filter= $(SUBSTITUTIONS_FILTER_NGINX_MODULE_VERSION)
9+
MODULE_VERSION_subs_filter= $(NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_VERSION)
1010
MODULE_RELEASE_subs_filter= 1
1111

1212
MODULE_VERSION_PREFIX_subs_filter=$(MODULE_TARGET_PREFIX)
1313

14-
MODULE_SOURCES_subs_filter= ngx_http_substitutions_filter_module-$(SUBSTITUTIONS_FILTER_NGINX_MODULE_GITHASH).tar.gz
14+
MODULE_SOURCES_subs_filter= ngx_http_substitutions_filter_module-$(NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_GITHASH).tar.gz
1515

16-
MODULE_CONFARGS_subs_filter= --add-dynamic-module=$(MODSRC_PREFIX)ngx_http_substitutions_filter_module-$(SUBSTITUTIONS_FILTER_NGINX_MODULE_GITHASH)
16+
MODULE_CONFARGS_subs_filter= --add-dynamic-module=$(MODSRC_PREFIX)ngx_http_substitutions_filter_module-$(NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_GITHASH)
1717

1818
prerequisites-for-module-subs-filter:
1919

‎contrib/src/abseil-cpp/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# abseil-cpp
22

33
include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/version
4-
ABSEIL_URL := $(GITHUB)/abseil/abseil-cpp/archive/refs/tags/$(ABSEIL_VERSION).tar.gz
4+
ABSEIL_CPP_URL := $(GITHUB)/abseil/abseil-cpp/archive/refs/tags/$(ABSEIL_CPP_VERSION).tar.gz
55

66
PKGS += abseil-cpp
77

8-
$(TARBALLS)/abseil-cpp-$(ABSEIL_VERSION).tar.gz:
9-
$(call download_pkg,$(ABSEIL_URL),abseil-cpp)
8+
$(TARBALLS)/abseil-cpp-$(ABSEIL_CPP_VERSION).tar.gz:
9+
$(call download_pkg,$(ABSEIL_CPP_URL),abseil-cpp)
1010

11-
.sum-abseil-cpp: abseil-cpp-$(ABSEIL_VERSION).tar.gz
11+
.sum-abseil-cpp: abseil-cpp-$(ABSEIL_CPP_VERSION).tar.gz
1212

13-
abseil-cpp: abseil-cpp-$(ABSEIL_VERSION).tar.gz .sum-abseil-cpp
13+
abseil-cpp: abseil-cpp-$(ABSEIL_CPP_VERSION).tar.gz .sum-abseil-cpp
1414
$(UNPACK)
1515
$(APPLY) $(SRC)/abseil-cpp/b957f0ccd00481cd4fd663d8320aa02ae0564f18.patch
1616
$(APPLY) $(SRC)/abseil-cpp/4500c2fada4e952037c59bd65e8be1ba0b29f21e.patch

‎contrib/src/abseil-cpp/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ABSEIL_VERSION=20211102.0
1+
ABSEIL_CPP_VERSION := 20211102.0

‎contrib/src/grpc/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
GRPC_VERSION=1.46.7
1+
GRPC_VERSION := 1.46.7

‎contrib/src/ngx_http_geoip2_module/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# ngx_http_geoip2_module
22

33
include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/version
4-
GEOIP2_NGINX_MODULE_URL := $(GITHUB)/leev/ngx_http_geoip2_module/archive/$(GEOIP2_NGINX_MODULE_VERSION).tar.gz
4+
NGX_HTTP_GEOIP2_MODULE_URL := $(GITHUB)/leev/ngx_http_geoip2_module/archive/$(NGX_HTTP_GEOIP2_MODULE_VERSION).tar.gz
55

66
PKGS += ngx_http_geoip2_module
77

8-
$(TARBALLS)/ngx_http_geoip2_module-$(GEOIP2_NGINX_MODULE_VERSION).tar.gz:
9-
$(call download_pkg,$(GEOIP2_NGINX_MODULE_URL),ngx_http_geoip2_module)
8+
$(TARBALLS)/ngx_http_geoip2_module-$(NGX_HTTP_GEOIP2_MODULE_VERSION).tar.gz:
9+
$(call download_pkg,$(NGX_HTTP_GEOIP2_MODULE_URL),ngx_http_geoip2_module)
1010

11-
.sum-ngx_http_geoip2_module: ngx_http_geoip2_module-$(GEOIP2_NGINX_MODULE_VERSION).tar.gz
11+
.sum-ngx_http_geoip2_module: ngx_http_geoip2_module-$(NGX_HTTP_GEOIP2_MODULE_VERSION).tar.gz
1212

13-
ngx_http_geoip2_module: ngx_http_geoip2_module-$(GEOIP2_NGINX_MODULE_VERSION).tar.gz .sum-ngx_http_geoip2_module
13+
ngx_http_geoip2_module: ngx_http_geoip2_module-$(NGX_HTTP_GEOIP2_MODULE_VERSION).tar.gz .sum-ngx_http_geoip2_module
1414
$(UNPACK)
1515
$(MOVE)
1616

‎contrib/src/ngx_http_geoip2_module/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
GEOIP2_NGINX_MODULE_VERSION := 3.4
1+
NGX_HTTP_GEOIP2_MODULE_VERSION := 3.4

‎contrib/src/ngx_http_substitutions_filter_module/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# ngx_http_substitutions_filter_module
22

33
include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/version
4-
SUBSTITUTIONS_FILTER_NGINX_MODULE_URL := $(GITHUB)/yaoweibin/ngx_http_substitutions_filter_module/archive/$(SUBSTITUTIONS_FILTER_NGINX_MODULE_GITHASH).tar.gz
4+
NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_URL := $(GITHUB)/yaoweibin/ngx_http_substitutions_filter_module/archive/$(NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_GITHASH).tar.gz
55

66
PKGS += ngx_http_substitutions_filter_module
77

8-
$(TARBALLS)/ngx_http_substitutions_filter_module-$(SUBSTITUTIONS_FILTER_NGINX_MODULE_GITHASH).tar.gz:
9-
$(call download_pkg,$(SUBSTITUTIONS_FILTER_NGINX_MODULE_URL),ngx_http_substitutions_filter_module)
8+
$(TARBALLS)/ngx_http_substitutions_filter_module-$(NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_GITHASH).tar.gz:
9+
$(call download_pkg,$(NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_URL),ngx_http_substitutions_filter_module)
1010

11-
.sum-ngx_http_substitutions_filter_module: ngx_http_substitutions_filter_module-$(SUBSTITUTIONS_FILTER_NGINX_MODULE_GITHASH).tar.gz
11+
.sum-ngx_http_substitutions_filter_module: ngx_http_substitutions_filter_module-$(NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_GITHASH).tar.gz
1212

13-
ngx_http_substitutions_filter_module: ngx_http_substitutions_filter_module-$(SUBSTITUTIONS_FILTER_NGINX_MODULE_GITHASH).tar.gz .sum-ngx_http_substitutions_filter_module
13+
ngx_http_substitutions_filter_module: ngx_http_substitutions_filter_module-$(NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_GITHASH).tar.gz .sum-ngx_http_substitutions_filter_module
1414
$(UNPACK)
1515
$(MOVE)
1616

‎contrib/src/ngx_http_substitutions_filter_module/version‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
SUBSTITUTIONS_FILTER_NGINX_MODULE_VERSION := 0.6.4
2-
SUBSTITUTIONS_FILTER_NGINX_MODULE_GITHASH := c6f825fa592acc29275c2eb4d1ab1eccab9de19e
1+
NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_VERSION := 0.6.4
2+
NGX_HTTP_SUBSTITUTIONS_FILTER_MODULE_GITHASH := c6f825fa592acc29275c2eb4d1ab1eccab9de19e

‎contrib/src/opentelemetry-cpp/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OPENTELEMETRY_CPP_VERSION=1.23.0
1+
OPENTELEMETRY_CPP_VERSION := 1.23.0

0 commit comments

Comments
 (0)