forked from sonic-net/sonic-sairedis
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make changes to building and packaging sairedis (sonic-net#1116)
* Make changes to building and packaging sairedis This commit includes the following changes: 1. Use Debian build profiles instead of custom build targets to build different configurations of sairedis. Build profiles were designed for this purpose. This also makes the debian/rules file a bit cleaner. 2. Rely on the debug packages being automatically created, instead of us explicitly specifying it in debian/control. 3. Add actual support for excluding Python 2 binding build. 4. Make sure the compile flags used for building Python 2 and Python 3 are actually correct. Signed-off-by: Saikrishna Arcot <[email protected]> * Update pipeline file Signed-off-by: Saikrishna Arcot <[email protected]> * Fix argument for profile Signed-off-by: Saikrishna Arcot <[email protected]> * Exclude libsai package from the list of dependencies Signed-off-by: Saikrishna Arcot <[email protected]> * Allow multiple syslog artifacts during tests Signed-off-by: Saikrishna Arcot <[email protected]>
- Loading branch information
1 parent
b7c85ca
commit 7b39fc4
Showing
12 changed files
with
400 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 10 | ||
| 12 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,24 +2,33 @@ Source: sonic | |
| Maintainer: Kamil Cudnik <[email protected]> | ||
| Section: net | ||
| Priority: optional | ||
| Build-Depends: debhelper (>=9), autotools-dev, libzmq5-dev | ||
| Build-Depends: debhelper (>= 12), autotools-dev, libzmq5-dev | ||
| Standards-Version: 1.0.0 | ||
|
|
||
| Package: syncd | ||
| Architecture: any | ||
| Build-Profiles: <syncd !rpc !vs> | ||
| Depends: ${misc:Pre-Depends} | ||
| Recommends: ${shlibs:Depends} | ||
| Conflicts: syncd-rpc, syncd-vs | ||
| Description: This package contains sync daemon for SONiC project. | ||
| This sync daemon syncs the ASIC_DB in Redis database and the real ASIC via SAI. | ||
|
|
||
| Package: syncd-rpc | ||
| Architecture: any | ||
| Build-Profiles: <syncd rpc !vs> | ||
| Depends: ${misc:Pre-Depends} | ||
| Recommends: ${shlibs:Depends} | ||
| Conflicts: syncd, syncd-vs | ||
| Description: This package contains sync daemon with rpc for SONiC project. | ||
| This sync daemon syncs the ASIC_DB in Redis database and the real ASIC via SAI. | ||
| This daemon contains saithrift rpc library for remote control of an ASIC. | ||
|
|
||
| Package: syncd-vs | ||
| Architecture: any | ||
| Build-Profiles: <syncd !rpc vs> | ||
| Depends: ${misc:Pre-Depends} | ||
| Recommends: ${shlibs:Depends} | ||
| Conflicts: syncd-rpc, syncd | ||
| Description: This package contains sync daemon for SONiC project linked with virtual switch. | ||
| This sync daemon syncs the ASIC_DB in Redis database and the real ASIC via SAI. | ||
|
|
@@ -38,6 +47,7 @@ Description: This package contains development files for SAI-Redis. | |
|
|
||
| Package: libsaivs | ||
| Architecture: any | ||
| Depends: ${shlibs:Depends}, ${misc:Pre-Depends} | ||
| Section: libs | ||
| Description: This package contains SAI-VirtualSwitch implementation for SONiC project. | ||
|
|
||
|
|
@@ -49,6 +59,7 @@ Description: This package contains development files for SAI-VirtualSwitch. | |
|
|
||
| Package: libsaimetadata | ||
| Architecture: any | ||
| Depends: ${shlibs:Depends}, ${misc:Pre-Depends} | ||
| Section: libs | ||
| Description: This package contains SAI-Metadata implementation for SONiC project. | ||
|
|
||
|
|
@@ -58,63 +69,6 @@ Depends: libsaimetadata (= ${binary:Version}) | |
| Section: libdevel | ||
| Description: This package contains development files for SAI-Metadata. | ||
|
|
||
| Package: syncd-dbg | ||
| Architecture: any | ||
| Section: debug | ||
| Priority: extra | ||
| Conflicts: syncd-rpc-dbg, syncd-vs | ||
| Depends: | ||
| syncd (= ${binary:Version}), | ||
| ${misc:Depends} | ||
| Description: debugging symbols for syncd | ||
|
|
||
| Package: syncd-rpc-dbg | ||
| Architecture: any | ||
| Section: debug | ||
| Priority: extra | ||
| Conflicts: syncd-dbg, syncd-vs | ||
| Depends: | ||
| syncd-rpc (= ${binary:Version}), | ||
| ${misc:Depends} | ||
| Description: debugging symbols for syncd-rpc | ||
|
|
||
| Package: syncd-vs-dbg | ||
| Architecture: any | ||
| Section: debug | ||
| Priority: extra | ||
| Conflicts: syncd-dbg, syncd-rpc-dbg | ||
| Depends: | ||
| syncd-vs (= ${binary:Version}), | ||
| ${misc:Depends} | ||
| Description: debugging symbols for syncd-vs | ||
|
|
||
| Package: libsairedis-dbg | ||
| Architecture: any | ||
| Section: debug | ||
| Priority: extra | ||
| Depends: | ||
| libsairedis (= ${binary:Version}), | ||
| ${misc:Depends} | ||
| Description: debugging symbols for libsairedis | ||
|
|
||
| Package: libsaivs-dbg | ||
| Architecture: any | ||
| Section: debug | ||
| Priority: extra | ||
| Depends: | ||
| libsaivs (= ${binary:Version}), | ||
| ${misc:Depends} | ||
| Description: debugging symbols for libsaivs | ||
|
|
||
| Package: libsaimetadata-dbg | ||
| Architecture: any | ||
| Section: debug | ||
| Priority: extra | ||
| Depends: | ||
| libsaimetadata (= ${binary:Version}), | ||
| ${misc:Depends} | ||
| Description: debugging symbols for libsaimetadata | ||
|
|
||
| Package: python-pysairedis | ||
| Architecture: any | ||
| Build-Profiles: <!nopython2> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| meta/sai*.h usr/include/sai | ||
| meta/Sai*.h usr/include/sai | ||
| SAI/meta/sai*.h usr/include/sai | ||
| usr/lib/*/libsaimetadata.so | ||
| usr/lib/*/libsaimeta.so |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| lib/sairedis.h usr/include/sai | ||
| usr/lib/*/libsairedis.so |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.