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

[build]: Fix make clean for redis-tools (#4903)

Browse Source 
Fixed #4898
This commit is contained in:
Qi Luo 2020-07-08 06:48:08 -07:00
parent 6f11833ffa
commit 7707185aaf
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rules/redis.mk
View File

@ -1,4 +1,7 @@
# redis package # redis package
# TODO: docker-sonic-p4 depends on redis-tools in Jessie.
# Remove this file and src/redis after that resolved.
ifneq ($(BLDENV),buster)
REDIS_VERSION = 5.0.3-3~bpo9+2 REDIS_VERSION = 5.0.3-3~bpo9+2
@ -6,11 +9,7 @@ REDIS_TOOLS = redis-tools_$(REDIS_VERSION)_$(CONFIGURED_ARCH).deb
$(REDIS_TOOLS)_SRC_PATH = $(SRC_PATH)/redis $(REDIS_TOOLS)_SRC_PATH = $(SRC_PATH)/redis
$(REDIS_TOOLS)_DEPENDS += $(LIBHIREDIS_DEV) $(REDIS_TOOLS)_DEPENDS += $(LIBHIREDIS_DEV)
$(REDIS_TOOLS)_RDEPENDS += $(LIBHIREDIS) $(REDIS_TOOLS)_RDEPENDS += $(LIBHIREDIS)
# TODO: docker-sonic-p4 depends on redis-tools in Jessie.
# Remove this file and src/redis after that resolved.
ifneq ($(BLDENV),buster)
SONIC_MAKE_DEBS += $(REDIS_TOOLS) SONIC_MAKE_DEBS += $(REDIS_TOOLS)
endif
REDIS_TOOLS_DBG = redis-tools-dbgsym_$(REDIS_VERSION)_$(CONFIGURED_ARCH).deb REDIS_TOOLS_DBG = redis-tools-dbgsym_$(REDIS_VERSION)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(REDIS_TOOLS),$(REDIS_TOOLS_DBG))) $(eval $(call add_derived_package,$(REDIS_TOOLS),$(REDIS_TOOLS_DBG)))
@ -28,3 +27,4 @@ $(eval $(call add_derived_package,$(REDIS_TOOLS),$(REDIS_SENTINEL)))
# #
DBG_SRC_ARCHIVE += redis DBG_SRC_ARCHIVE += redis
endif