matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[redis]: build redis-tools-dbgsym instead of redis-server-dbgsym (#3125)

Browse Source 
redis-server-dbgsym is not available since redis server 4
This commit is contained in:
lguohan 2019-07-05 11:00:01 -07:00 committed by GitHub
parent 82fb3a099d
commit cf063bd3af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rules/docker-database.mk
View File

@ -8,7 +8,7 @@ $(DOCKER_DATABASE)_PATH = $(DOCKERS_PATH)/$(DOCKER_DATABASE_STEM)
$(DOCKER_DATABASE)_DEPENDS += $(REDIS_TOOLS) $(REDIS_SERVER) $(DOCKER_DATABASE)_DEPENDS += $(REDIS_TOOLS) $(REDIS_SERVER)
$(DOCKER_DATABASE)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS) $(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) $(DOCKER_DATABASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)

6
rules/redis.mk
View File

@ -8,12 +8,12 @@ $(REDIS_TOOLS)_DEPENDS += $(LIBHIREDIS_DEV)
$(REDIS_TOOLS)_RDEPENDS += $(LIBHIREDIS) $(REDIS_TOOLS)_RDEPENDS += $(LIBHIREDIS)
SONIC_MAKE_DEBS += $(REDIS_TOOLS) 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 REDIS_SERVER = redis-server_$(REDIS_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(REDIS_TOOLS),$(REDIS_SERVER))) $(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 = redis-sentinel_$(REDIS_VERSION)_amd64.deb
$(REDIS_SENTINEL)_DEPENDS += $(REDIS_SERVER) $(REDIS_SENTINEL)_DEPENDS += $(REDIS_SERVER)
$(REDIS_SENTINEL)_RDEPENDS += $(REDIS_SERVER) $(REDIS_SENTINEL)_RDEPENDS += $(REDIS_SERVER)

2
src/redis/Makefile
View File

@ -8,7 +8,7 @@ REDIS_VERSION_FULL = $(REDIS_VERSION)-3~bpo9+2
MAIN_TARGET = redis-server_$(REDIS_VERSION_FULL)_amd64.deb MAIN_TARGET = redis-server_$(REDIS_VERSION_FULL)_amd64.deb
DERIVED_TARGETS = redis-tools_$(REDIS_VERSION_FULL)_amd64.deb \ DERIVED_TARGETS = redis-tools_$(REDIS_VERSION_FULL)_amd64.deb \
redis-sentinel_$(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)/% : $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
rm -rf redis_build rm -rf redis_build