[redis]: build redis-tools-dbgsym instead of redis-server-dbgsym (son…

…ic-net#3125) redis-server-dbgsym is not available since redis server 4
SONIC-DEV · Jul 5, 2019 · cf063bd · cf063bd
1 parent 82fb3a0
commit cf063bd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/rules/docker-database.mk b/rules/docker-database.mk
@@ -8,7 +8,7 @@ $(DOCKER_DATABASE)_PATH = $(DOCKERS_PATH)/$(DOCKER_DATABASE_STEM)
 
 $(DOCKER_DATABASE)_DEPENDS += $(REDIS_TOOLS) $(REDIS_SERVER)
 $(DOCKER_DATABASE)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
-$(DOCKER_DATABASE)_DBG_DEPENDS += $(REDIS_SERVER_DBG)
+$(DOCKER_DATABASE)_DBG_DEPENDS += $(REDIS_TOOLS_DBG)
 
 $(DOCKER_DATABASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
 

diff --git a/rules/redis.mk b/rules/redis.mk
@@ -8,12 +8,12 @@ $(REDIS_TOOLS)_DEPENDS += $(LIBHIREDIS_DEV)
 $(REDIS_TOOLS)_RDEPENDS += $(LIBHIREDIS)
 SONIC_MAKE_DEBS += $(REDIS_TOOLS)
 
+REDIS_TOOLS_DBG = redis-tools-dbgsym_$(REDIS_VERSION)_amd64.deb
+$(eval $(call add_derived_package,$(REDIS_TOOLS),$(REDIS_TOOLS_DBG)))
+
 REDIS_SERVER = redis-server_$(REDIS_VERSION)_amd64.deb
 $(eval $(call add_derived_package,$(REDIS_TOOLS),$(REDIS_SERVER)))
 
-REDIS_SERVER_DBG = redis-server-dbgsym_$(REDIS_VERSION)_amd64.deb
-$(eval $(call add_derived_package,$(REDIS_SERVER),$(REDIS_SERVER_DBG)))
-
 REDIS_SENTINEL = redis-sentinel_$(REDIS_VERSION)_amd64.deb
 $(REDIS_SENTINEL)_DEPENDS += $(REDIS_SERVER)
 $(REDIS_SENTINEL)_RDEPENDS += $(REDIS_SERVER)

diff --git a/src/redis/Makefile b/src/redis/Makefile
@@ -8,7 +8,7 @@ REDIS_VERSION_FULL = $(REDIS_VERSION)-3~bpo9+2
 MAIN_TARGET = redis-server_$(REDIS_VERSION_FULL)_amd64.deb
 DERIVED_TARGETS = redis-tools_$(REDIS_VERSION_FULL)_amd64.deb \
 		  redis-sentinel_$(REDIS_VERSION_FULL)_amd64.deb \
-		  redis-server-dbgsym_$(REDIS_VERSION_FULL)_amd64.deb
+		  redis-tools-dbgsym_$(REDIS_VERSION_FULL)_amd64.deb
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	rm -rf  redis_build