Skip to content

Commit cf063bd

Browse files
authored
[redis]: build redis-tools-dbgsym instead of redis-server-dbgsym (sonic-net#3125)
redis-server-dbgsym is not available since redis server 4
1 parent 82fb3a0 commit cf063bd

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

rules/docker-database.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(DOCKER_DATABASE)_PATH = $(DOCKERS_PATH)/$(DOCKER_DATABASE_STEM)
88

99
$(DOCKER_DATABASE)_DEPENDS += $(REDIS_TOOLS) $(REDIS_SERVER)
1010
$(DOCKER_DATABASE)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
11-
$(DOCKER_DATABASE)_DBG_DEPENDS += $(REDIS_SERVER_DBG)
11+
$(DOCKER_DATABASE)_DBG_DEPENDS += $(REDIS_TOOLS_DBG)
1212

1313
$(DOCKER_DATABASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
1414

rules/redis.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ $(REDIS_TOOLS)_DEPENDS += $(LIBHIREDIS_DEV)
88
$(REDIS_TOOLS)_RDEPENDS += $(LIBHIREDIS)
99
SONIC_MAKE_DEBS += $(REDIS_TOOLS)
1010

11+
REDIS_TOOLS_DBG = redis-tools-dbgsym_$(REDIS_VERSION)_amd64.deb
12+
$(eval $(call add_derived_package,$(REDIS_TOOLS),$(REDIS_TOOLS_DBG)))
13+
1114
REDIS_SERVER = redis-server_$(REDIS_VERSION)_amd64.deb
1215
$(eval $(call add_derived_package,$(REDIS_TOOLS),$(REDIS_SERVER)))
1316

14-
REDIS_SERVER_DBG = redis-server-dbgsym_$(REDIS_VERSION)_amd64.deb
15-
$(eval $(call add_derived_package,$(REDIS_SERVER),$(REDIS_SERVER_DBG)))
16-
1717
REDIS_SENTINEL = redis-sentinel_$(REDIS_VERSION)_amd64.deb
1818
$(REDIS_SENTINEL)_DEPENDS += $(REDIS_SERVER)
1919
$(REDIS_SENTINEL)_RDEPENDS += $(REDIS_SERVER)

src/redis/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ REDIS_VERSION_FULL = $(REDIS_VERSION)-3~bpo9+2
88
MAIN_TARGET = redis-server_$(REDIS_VERSION_FULL)_amd64.deb
99
DERIVED_TARGETS = redis-tools_$(REDIS_VERSION_FULL)_amd64.deb \
1010
redis-sentinel_$(REDIS_VERSION_FULL)_amd64.deb \
11-
redis-server-dbgsym_$(REDIS_VERSION_FULL)_amd64.deb
11+
redis-tools-dbgsym_$(REDIS_VERSION_FULL)_amd64.deb
1212

1313
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
1414
rm -rf redis_build

0 commit comments

Comments
 (0)