Skip to content

Commit 581e276

Browse files
authored
Move submodule sonic-host-services and add build target for sonic-host-services-rs (#24209)
Why I did it There is dependencies between submodule repo and sonic-buildimage repo, so we need to combine both tasks into this single PR. Move submodule sonic-host-services Add build target for sonic-host-services-rs
1 parent 2b76cd3 commit 581e276

File tree

5 files changed

+29
-1
lines changed

5 files changed

+29
-1
lines changed

files/build_templates/sonic_debian_extension.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,9 @@ install_deb_package {{deb}}
349349
{% endfor %}
350350
{% endif %}
351351

352+
# Install SONiC host services Rust deb package
353+
install_deb_package $debs_path/sonic-host-services-rs_*.deb
354+
352355
# Install sonic-db-cli
353356
install_deb_package $debs_path/sonic-db-cli_*.deb
354357

rules/sonic-host-services-rs.dep

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
SPATH := $($(SONIC_HOST_SERVICES_RS)_SRC_PATH)
2+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/sonic-host-services-rs.mk rules/sonic-host-services-rs.dep
3+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
4+
SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
5+
6+
$(SONIC_HOST_SERVICES_RS)_CACHE_MODE := GIT_CONTENT_SHA
7+
$(SONIC_HOST_SERVICES_RS)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
8+
$(SONIC_HOST_SERVICES_RS)_DEP_FILES := $(DEP_FILES)
9+
$(SONIC_HOST_SERVICES_RS)_SMDEP_FILES := $(SMDEP_FILES)
10+
$(SONIC_HOST_SERVICES_RS)_SMDEP_PATHS := $(SPATH)

rules/sonic-host-services-rs.mk

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
SONIC_HOST_SERVICES_RS_VERSION = 1.0.0
2+
SONIC_HOST_SERVICES_RS_NAME = sonic-host-services-rs
3+
4+
SONIC_HOST_SERVICES_RS = $(SONIC_HOST_SERVICES_RS_NAME)_$(SONIC_HOST_SERVICES_RS_VERSION)_$(CONFIGURED_ARCH).deb
5+
$(SONIC_HOST_SERVICES_RS)_SRC_PATH = $(SRC_PATH)/sonic-host-services
6+
$(SONIC_HOST_SERVICES_RS)_VERSION = $(SONIC_HOST_SERVICES_RS_VERSION)
7+
$(SONIC_HOST_SERVICES_RS)_NAME = $(SONIC_HOST_SERVICES_RS_NAME)
8+
$(SONIC_HOST_SERVICES_RS)_DEPENDS = $(LIBSWSSCOMMON_DEV)
9+
$(SONIC_HOST_SERVICES_RS)_RDEPENDS = $(LIBSWSSCOMMON)
10+
11+
SONIC_DPKG_DEBS += $(SONIC_HOST_SERVICES_RS)
12+
13+
SONIC_HOST_SERVICES_RS_DBG = $(SONIC_HOST_SERVICES_RS_NAME)-dbgsym_$(SONIC_HOST_SERVICES_RS_VERSION)_$(CONFIGURED_ARCH).deb
14+
$(eval $(call add_derived_package,$(SONIC_HOST_SERVICES_RS),$(SONIC_HOST_SERVICES_RS_DBG)))

slave.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,6 +1398,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
13981398
$(SONIC_RSYSLOG_PLUGIN) \
13991399
$(SONIC_UTILITIES_DATA) \
14001400
$(SONIC_CTRMGRD_RS) \
1401+
$(SONIC_HOST_SERVICES_RS) \
14011402
$(SONIC_HOST_SERVICES_DATA) \
14021403
$(BASH) \
14031404
$(BASH_TACPLUS) \

0 commit comments

Comments
 (0)