Commit Graph

14 Commits

Author SHA1 Message Date
lguohan
e1ac3cfc6a
[build]: wait for conflicts package to be uninstalled (#5039)
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>
2020-07-27 10:46:20 -07:00
lguohan
58632e6e83 [docker-orchagent]: make build depends only on sairedis package (#4880)
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

* ccbb3bc 2020-06-28 | add option to build without syncd (HEAD, origin/master, origin/HEAD) [Guohan Lu]
* 4247481 2020-06-28 | install saidiscovery into syncd package [Guohan Lu]
* 61b8e8e 2020-06-26 | Revert "sonic-sairedis: Add support to sonic-sairedis for gearbox phys (#624)" (#630) [Danny Allen]
* 85e543c 2020-06-26 | add a README to tests directory to describe how to run 'make check' (#629) [Syd Logan]
* 2772f15 2020-06-26 | sonic-sairedis: Add support to sonic-sairedis for gearbox phys (#624) [Syd Logan]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-07-12 18:08:51 +00:00
simonJi2018
f558f170bb [nephos] upgrade Nephos SAI to version 06a67d (#3793)
[Nephos SAI] upgrade Nephos SAI to version 06a67d
2019-11-22 20:44:32 -08:00
simonJi2018
f3c92e7779 [nephos] support SAI 1.5.0 and fix docker syncd related makefile error (#3684)
- support SAI 1.5.0
- fix docker syncd related makefile error
2019-10-31 09:13:35 -07:00
simonJi2018
83e74d6dbb [nephos]: upgrade sai.mk to cbb99f for support 1.4.1 (#2901) 2019-05-15 07:50:13 -07:00
simonJi2018
259d51a94f [nephos]: upgrade compile sdk.deb from online to dpkg and fix compile error (#2800)
* upgrade compile sdk.deb from online to dpkg and upgrade docker syncd and orchagent to stretch

* Delete docker-orchagent-nephos.mk

Delete docker-orchagent-nephos.mk

* Update docker-syncd-nephos.mk

* Update Dockerfile.j2
2019-04-29 18:25:40 -07:00
simonJi2018
b17a6522b9 [nephos]: support Debian 9 for nephos platform (#2347)
* 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
2018-12-05 00:30:38 -08:00
simonJi2018
927c41f26c [nephos]: add support sai 1.3.0 (#1868)
* 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
2018-07-23 10:44:26 -07:00
simonJi2018
65b3774487 [nehpos] fix libsainps and nps-sdk bug for support sai 1.2.4 (#1639) 2018-04-25 22:20:14 -07:00
simonJi2018
9b14addbf1 [platform]: Upgrade Nephos SAI to v1.2.4 (#1530) 2018-03-26 13:32:54 -07:00
kaiyu22
2beb78f069 [Nephos] Upgrade SAI to v1.2.3 (#1494)
- 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>
2018-03-14 09:41:23 -07:00
kaiyu22
628ad3da03 [Platform] Update FEC value and SAI download link for Ingrasys S9130-32X/S9230-64X (#1365)
- 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>
2018-02-03 17:46:00 +08:00
kaiyu22
ac0de13705 [Platform] Update switch configuration files and download link for Ingrasys S9130-32X/S9230-64X (#1295)
- 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>
2018-01-11 15:18:50 -08:00
kaiyu22
63de341dd6 [Platform] Add Ingrasys S9130-32X and S9230-64X with Nephos Switch ASIC (#1245)
* 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)
2017-12-22 10:04:29 -08:00