when parallel build is enabled, both docker-fpm-frr and docker-syncd-brcm
is built at the same time, docker-fpm-frr requires swss which requires to
install libsaivs-dev. docker-syncd-brcm requires syncd package which requires
to install libsaibcm-dev.
since libsaivs-dev and libsaibcm-dev install the sai header in the same
location, these two packages cannot be installed at the same time. Therefore,
we need to serialize the build between these two packages. Simply uninstall
the conflict package is not enough to solve this issue. The correct solution
is to have one package wait for another package to be uninstalled.
For example, if syncd is built first, then it will install libsaibcm-dev.
Meanwhile, if the swss build job starts and tries to install libsaivs-dev,
it will first try to query if libsaibcm-dev is installed or not. if it is
installed, then it will wait until libsaibcm-dev is uninstalled. After syncd
job is finished, it will uninstall libsaibcm-dev and swss build job will be
unblocked.
To solve this issue, _UNINSTALLS is introduced to uninstall a package that
is no longer needed and to allow blocked job to continue.
Signed-off-by: Guohan Lu <lguohan@gmail.com>
backport c4b5b002c3
make swss build depends only on libsairedis instead of syncd. This allows to build swss without depending
on vendor sai library.
Currently, libsairedis build also buils syncd which requires vendor SAI lib. This makes difficult to build
swss docker in buster while still keeping syncd docker in stretch, as swss requires libsairedis which also
build syncd and requires vendor to provide SAI for buster. As swss docker does not really contain syncd
binary, so it is not necessary to build syncd for swss docker.
[submodule]: update sonic-sairedis
* 9a66890 2020-06-28 | [build]: add option to build without syncd (HEAD -> 201811, origin/201811) [Guohan Lu]
Signed-off-by: Guohan Lu <lguohan@gmail.com>
Fixed errors in the following files to resolve build failures
- docker-ptf-nephos.mk\docker-syncd-nephos.mk\libsaithrift-dev.mk\rules.mk
- Upgrade sai.mk for support sai_1.4.1 and upgrade sdk version to 3.0.0
* Upgrade SAI to v1.2.4
* Add a new supported device accton as7116
* Add maintainer info for deb
* Add mk file for accton 7116
* fix some bug for sai 1.2.4
* fix git commit error for sdk and sai
* change sai and sdk deb name
* add config file for qos support
* initial commit
* Delete qos.json
* Delete buffers.json.j2
* Delete qos.json
* Delete buffers.json.j2
* Delete buffers.json.j2
* Delete qos.json
* add support for sai 1.3.0
* add qos and buffer file for device and add sensor driver for 7116
* change buffer template
* fix fan led bug
* add support for linux-4.9
* update device driver and update sdk and sai for support kernel 4.9
* Upgrade SAI to v1.2.4
* Add a new supported device accton as7116
* Add maintainer info for deb
* Add mk file for accton 7116
* fix some bug for sai 1.2.4
* fix git commit error for sdk and sai
* change sai and sdk deb name
* add config file for qos support
* initial commit
* Delete qos.json
* Delete buffers.json.j2
* Delete qos.json
* Delete buffers.json.j2
* Delete buffers.json.j2
* Delete qos.json
* add support for sai 1.3.0
- What I did
Upgrading SAI version from v1.0 to v1.2.3
- How I did it
Updating platform/nephos/sai.mk
- How to verify it
Checking the image can build successfully in the branch master
- Description for the changelog
Upgrade SAI to v1.2.3
- A picture of a cute animal (not mandatory but encouraged)
Signed-off-by: Sam Yang <yang.kaiyu@gmail.com>
- What I did
Updating FEC value and SAI download link
- How I did it
Updating related switch configuration files in device/ingrasys
Updating sai.mk files in platform/nephos
- How to verify it
Checking system and network feature is worked as well
- Description for the changelog
Updating FEC value and SAI download link for Ingrasys S9130-32X/S9230-64X
- A picture of a cute animal (not mandatory but encouraged)
Signed-off-by: Sam Yang <yang.kaiyu@gmail.com>
- What I did
Updating switch configuration files and download link
- How I did it
Updating related switch configuration files in device/ingrasys
Updating related mk files in platform/nephos
- How to verify it
Check system and network feature is worked as well
- Description for the changelog
Update switch configuration files and download link for Ingrasys S9130-32X/S9230-64X
- A picture of a cute animal (not mandatory but encouraged)
Signed-off-by: Sam Yang <yang.kaiyu@gmail.com>
* Add switch ASIC vendor and platforms for Nephos
- What I did
Add switch ASIC vendor: Nephos
Add Nephos platforms: Ingrasys S9130-32X, Ingrasys S9230-64X
- How I did it
Add platform/nephos files
Add platform/nephos/sonic-platform-modules-ingrasys submodule
Add device/ingrasys/x86_64-ingrasys_s9130_32x-r0 files
Add device/ingrasys/x86_64-ingrasys_s9230_64x-r0 files
Add SONiC to support Nephos platform
- How to verify it
To build SONiC installer image and docker images, run the following commands:
make configure PLATFORM=nephos
make target/sonic-nephos.bin
Check system and network feature is worked as well
- Description for the changelog
Add switch ASIC vendor and platforms for Nephos
- A picture of a cute animal (not mandatory but encouraged)
Signed-off-by: Sam Yang <yang.kaiyu@gmail.com>
* Advance sonic-sairedis submodule to include #271 (Add Nephos ASIC)
