Skip to content

Commit

Permalink
Trying to build
Browse files Browse the repository at this point in the history
  • Loading branch information
renukamanavalan committed Jun 6, 2022
1 parent ba48440 commit 99fa2c3
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 18 deletions.
4 changes: 2 additions & 2 deletions rules/docker-eventd.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ DOCKER_EVENTD_STEM = docker-eventd
DOCKER_EVENTD = $(DOCKER_EVENTD_STEM).gz
DOCKER_EVENTD_DBG = $(DOCKER_EVENTD_STEM)-$(DBG_IMAGE_MARK).gz

$(DOCKER_EVENTD)_DEPENDS += $(EVENTD)
$(DOCKER_EVENTD)_DEPENDS += $(SONIC_EVENTD)

$(DOCKER_EVENTD)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
$(DOCKER_EVENTD)_DBG_DEPENDS += $(EVENTD_DBG) $(LIBSWSSCOMMON_DBG)
$(DOCKER_EVENTD)_DBG_DEPENDS += $(SONIC_EVENTD_DBG) $(LIBSWSSCOMMON_DBG)

$(DOCKER_EVENTD)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)

Expand Down
12 changes: 5 additions & 7 deletions rules/eventd.dep
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@

SPATH := $($(EVENTD)_SRC_PATH)
SPATH := $($(SONIC_EVENTD)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/eventd.mk rules/eventd.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
DEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))

$(EVENTD)_CACHE_MODE := GIT_CONTENT_SHA
$(EVENTD)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(EVENTD)_DEP_FILES := $(DEP_FILES)
$(EVENTD)_SMDEP_FILES := $(SMDEP_FILES)
$(EVENTD)_SMDEP_PATHS := $(SPATH)
$(SONIC_EVENTD)_CACHE_MODE := GIT_CONTENT_SHA
$(SONIC_EVENTD)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(SONIC_EVENTD)_DEP_FILES := $(DEP_FILES)

18 changes: 9 additions & 9 deletions rules/eventd.mk
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# eventd package

EVENTD = eventd.0.0_$(CONFIGURED_ARCH).deb
$(EVENTD)_SRC_PATH = $(SRC_PATH)/sonic-eventd
$(EVENTD)_DEPENDS += $(LIBSWSSCOMMON) $(LIBSWSSCOMMON_DEV)
SONIC_EVENTD_VERSION = 1.0.0-0
SONIC_EVENTD_PKG_NAME = eventd

$(EVENTD)_RDEPENDS += $(LIBSWSSCOMMON)
SONIC_DPKG_DEBS += $(EVENTD)
SONIC_EVENTD = sonic-$(SONIC_EVENTD_PKG_NAME)_$(SONIC_EVENTD_VERSION)_$(CONFIGURED_ARCH).deb
$(SONIC_EVENTD)_SRC_PATH = $(SRC_PATH)/sonic-eventd
$(SONIC_EVENTD)_DEPENDS += $(LIBSWSSCOMMON) $(LIBSWSSCOMMON_DEV)

EVENTD_DBG = eventd-dbg_1.0.0_$(CONFIGURED_ARCH).deb
$(EVENTD_DBG)_DEPENDS += $(EVENTD)
$(EVENTD_DBG)_RDEPENDS += $(EVENTD)
$(eval $(call add_derived_package,$(EVENTD),$(EVENTD_DBG)))
SONIC_DPKG_DEBS += $(SONIC_EVENTD)

SONIC_EVENTD_DBG = sonic-$(SONIC_EVENTD_PKG_NAME)-dbgsym_$(SONIC_EVENTD_VERSION)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(SONIC_EVENTD),$(SONIC_EVENTD_DBG)))

# The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list}
# are archived into debug one image to facilitate debugging.
Expand Down
5 changes: 5 additions & 0 deletions src/sonic-eventd/debian/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
sonic-eventd (1.0.0-0) UNRELEASED; urgency=medium

* Initial release.

-- Renuka Manavalan <remanava@microsoft.com>
1 change: 1 addition & 0 deletions src/sonic-eventd/debian/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12
14 changes: 14 additions & 0 deletions src/sonic-eventd/debian/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Source: sonic-eventd
Section: devel
Priority: optional
Maintainer: Kelly Yeh <kellyyeh@microsoft.com>
Build-Depends: debhelper (>= 12.0.0), libevent-dev, libboost-thread-dev, libboost-system-dev, libswsscommon-dev
Standards-Version: 3.9.3
Homepage: https://github.com/Azure/sonic-buildimage
XS-Go-Import-Path: github.com/Azure/sonic-buildimage

Package: sonic-eventd
Architecture: any
Built-Using: ${misc:Built-Using}
Depends: ${shlibs:Depends}
Description: SONiC event service
6 changes: 6 additions & 0 deletions src/sonic-eventd/debian/rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/make -f

export DEB_BUILD_MAINT_OPTIONS=hardening=+all

%:
dh $@ --parallel

0 comments on commit 99fa2c3

Please sign in to comment.