Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DellEMC: Remove repeated files #11

Closed
wants to merge 36 commits into from
Closed

DellEMC: Remove repeated files #11

wants to merge 36 commits into from

Conversation

aravindmani-1
Copy link

Why I did it

ipmihelper files are repeated for few DellEMC platforms

How I did it

Removed the files in sonic_platform since as part of debian rules,ipmihelper will be copied to necessary directory.

How to verify it

Build the debian and verify whether the file is present in sonic_platform directory.

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

saiarcot895 and others added 30 commits October 28, 2021 21:05
@saiarcot895
Add infra to support building Bullseye base image with Buster containers
2bf56d1 
All docker containers will be built as Buster containers, from a Buster
slave. The base image and remaining packages that are installed onto the
host system will be built for Bullseye, from a Bullseye slave.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Update src/sonic-linux-kernel to point to the 5.10 kernel
47630e5 
Some patches have been enabled at this point, others need more rework.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Update saibcm-modules to compile with 5.10 kernel
842abfb 
Update the build rules in saibcm-modules to use the 5.10 kernel instead
of searching for the 4.19 kernel. In addition, some code changes were
done to get it to compile. The main categories of such changes are as
follows:

* For /proc files, `struct file_operations` has been replaced with
`struct proc_ops`.
* Y2038 changes to use the new APIs, since `do_gettimeofday()` is no
longer available.
* Minor changes in how external kernel module symbols are read by
modpost.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Update initramfs-tools from 0.133 to 0.140
6efc99c 
Also update the patch to add support for booting from squashfs to fix a
shellcheck warning.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Update the base Debian system installation script to get Bullseye
2d981da 
Python 2 is no longer available, so remove those packages, and remove
the pip2 commands. For picocom and systemd, just install from the
regular repo, since there's no backports yet.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
openssh: Upgrade from 7.9 to 8.4, to match version in Bullseye
956ee5d 
Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Python 2 removal/cleanup
d61b1a7 
Remove Python 2 package installation from the base image. For container
builds, reference Python 2 packages only if we're not building for
Bullseye.

For libyang, don't build Python 2 bindings at all, since they don't seem
to be used.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Update monit build for Bullseye
899a435 
Signed-off-by: Saikrishna Arcot <[email protected]>
@lguohan @saiarcot895
[slave.mk]: include dhcp-relay docker in buster build targets
6dc9c47 
dhcp relay docker is now application extension and is now
included in $(SONIC_PACKAGES_LOCAL)

Signed-off-by: Guohan Lu <[email protected]>
@saiarcot895
Update snmpd to 5.9, as part of the Bullseye upgrade
cc2a2d8 
Debian actually did a binNMU for snmpd, so to match the package version
we're building with the version in the offiical repos, that version
needs to be manually specified in the changelog.

Buster still needs 5.7.3, because there's a ABI change between 5.7.3 and
5.9 for libsnmp, so for Buster, make sure that 5.7.3 is built, and for
Bullseye, make sure that 5.9 is built.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
sonic-frr: Add patch to skip installing png files
cd59421 
In the build in Bullseye, there are no png files available in the
specified installation source directory. For now, don't bother
installing those files.

This may end up being reverted later if there are indeed png files that
need to be installed for documentation.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Temporary disable building kdump-tools for the base image
72b12ca 
Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Add Bullseye slave docker files to list of common cache files
1d450d4 
Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Get packages for the base image from the main repos instead of our mi…
d7e6787 
…rror

There appears to be some network issue in the pipeline builds when
downloading packages from our mirror. Change the source to be from the
main debian repos to try to get around this issue.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Upgrade to ntp 4.2.8p15 for Bullseye
477cf56 
Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Fix Python 3 syntax in SONiC container startup scripts
31c98bd 
The common startup script used for SONiC containers is calling an inline
python command that uses Python 2 syntax, and thus errors out when run
with Python 3. Make this work with Python 3.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Make changes needed to build a basic Broadcom image
a557170 
Vendor-specific SAI modules have been commented out. Bootup has not been
tested.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Mark the PTF docker container as a Buster container
505bdee 
Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Update repos for Bullseye slave container
971dfc2 
Update the repos for amd64, and add support for at least arm64.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Update SAI modules for Nokia and Juniper for Bullseye and 5.10 kernel
e4a2ffa 
Also, start working on getting Dell SAI module compilable on 5.10
kernel.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Update SAI module for Celestica for Bullseye and 5.10 kernel
ffbfebc 
Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Don't build and package the psample module
8309713 
The kernel already provides psample, and with module versioning being
done in modpost, having the SDK compile its own copy of psample breaks
loading dependent modules.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Update Accton platform module for Bullseye and 5.10 kernel
a23dc6b 
Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Add support for building Mellanox image
09e510a 
ISSU will likely be broken. As of right now, the issu-version file is
not being generated during build.

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
For syncd, specify that they're Buster-based containers in the templa…
001008e 
…te file instead of the individual container definitions

Signed-off-by: Saikrishna Arcot <[email protected]>
@saiarcot895
Update saibcm-modules and saibcm-modules-dnx due to kernel changes
0467e86 
Add an include in saibcm-modules and saibcm-modules-dnx that are now
needed due to Mellanox kernel patches.

Signed-off-by: Saikrishna Arcot <[email protected]>
@kirankella @saiarcot895
Ported iptables patch to 5.10 kernel (sonic-net#4)
4bea5bc 
Ported Iptables patch for supporting fullcone NAT option to 5.10 kernel.

Signed-off-by: Kiran Kella <[email protected]>
@LuiSzee @saiarcot895
Update Centec platform support for Bullseye and 5.10 kernel (sonic-net#7
5b5c228 
)

1. Fix build for armhf and arm64
2. upgrade centec tsingma bsp support to 5.10 kernel
3. modify centec platform driver for linux 5.10

Co-authored-by: Shi Lei <[email protected]>
@aravindmani-1 @saiarcot895
DellEMC bullseye merge (sonic-net#2)
ca227c7 
Upgrade DellEMC platforms to bullseye.
@jjangmua @saiarcot895
Update Dell z9332f platform modules for Bullseye and 5.10 kernel. (so…
87c6056 
…nic-net#5)

Also add out of tree pca9548 mux driver to use platform data to mapping i2c bus with front panel port.

Signed-off-by: Jakkapan Jangmuang <[email protected]>

Co-authored-by: Saikrishna Arcot <[email protected]>
saiarcot895 and others added 6 commits October 28, 2021 21:07
@saiarcot895
Update some more Dell platform modules for 5.10 and Bullseye changes
daa32fd 
Signed-off-by: Saikrishna Arcot <[email protected]>
@alexrallen @saiarcot895
Mellanox bullseye merge (sonic-net#1)
56594e8 
Allow mellanox platform to build and successfully switch packets in
Debian 11

Upgraded

* Mellanox SDK
* Mellanox Hardware Management
* Mellanox Firmware
* Mellanox Kernel Patches

Adjusted build system to support host system running bullseye and
dockers running buster.
@saiarcot895
src/sonic-swss: Update to fix VLAN removal on 5.10 kernel
2c68877 
There is an issue discovered by Alexander Allen where VLAN member
removal from a VLAN doesn't fully happen on a 5.10 kernel. The reason
for this is that there is a change in the output of the `bridge vlan
show` command between the 4.19 kernel and the 5.10 kernel. To add to
this, the output is different depending on whether iproute2 4.20 or
iproute2 5.10 is installed. These output changes cause only some of the
VLAN member removal code to run; specifically, the interface will not be
the member of a VLAN anymore, but it will still be part of the bridge.

Therefore, update the code that parses the output of `bridge vlan show` to
handle the new formats.

Signed-off-by: Saikrishna Arcot <[email protected]>
@aravindmani-1
Upgrade new DellEMC platforms to bullseye kernel (sonic-net#10)
efa601f 
* Upgrade new DellEMC platforms to Bullseye

* Update s5212f kernel module
@alexrallen
Mellanox bullseye merge (sonic-net#1)
1d32c05 
* Make neccesary changed to mellanox platform code to build on Debian 11

* Revert use of backported kernel to build mft and elect to only build kernel module under bullseye
@aravindmani-1
Remove repeated files
d3d3f3c
@aravindmani-1 aravindmani-1 marked this pull request as ready for review November 2, 2021 06:01
@aravindmani-1
Copy link
Author

@saiarcot895 can this commit ID d3d3f3c be merged?. I've removed repeated files (ipmihelper) in the above mentioned commit ID?.

@aravindmani-1
Copy link
Author

aravindmani-1 commented Nov 2, 2021 •
edited
Loading

n3248pxe, n3248te platforms doesn't need to have this file. For s5212f and S5224f, ipmihelper.py was present in platform directory but it will be overridden by common directory file as part of debian/rules. So,i've removed those files from platform directory.
https://github.com/Azure/sonic-buildimage/blob/05b62078493fa7e4ecb2600e0e8d31930096f547/platform/broadcom/sonic-platform-modules-dell/debian/rules#L43

@saiarcot895
Copy link
Owner

Manually merged in.

@saiarcot895 saiarcot895 closed this Nov 3, 2021
@aravindmani-1 aravindmani-1 deleted the ipmi_fix branch November 11, 2021 02:30
saiarcot895 pushed a commit that referenced this pull request Jan 25, 2022
@KostiantynYarovyiBf @VadymYashchenko
@dmytroxIntel @vboykox @bratashX @mykolaxgerasymenko
[BFN] Updated platform plugins (sonic-net#9540)
4037867 
* [BFN] Updated platform APIs impl

Signed-off-by: Andriy Kokhan <[email protected]>

* Extended BFN platform SFP APIs implementation

* Update sfp.py

* [BFN] Extended SFP platform plugin implementation

Signed-off-by: Andriy Kokhan <[email protected]>

* [BFN] Extended Fans platform plugin implementation

* [BFN] divided classes Fan and  FanDrawer into 2 files

* Signed-off-by: Vadym Yashchenko <[email protected]>

What I did
	Add get_model() function
	Add get_low_critical_threshold() function
	Change __get(...) function.
How I did it
	Differnece from previous implementation of __get(...) function is return real value or -9999.9 if value is not provided by thrift API

* Add get_presence() function and revised __get() function

Signed-off-by: Vadym Yashchenko <[email protected]>

* [BFN] Updated PSU platform APIs impl

Signed-off-by: Dmytro Lytvynenko <[email protected]>

* Added BFN PSU cache (#9)

Signed-off-by: Andriy Kokhan <[email protected]>

* [BFN]  Fans and Fantray platform APIs update (#7)

* [BFN] Updated SFP platform APIs (#10)

Signed-off-by: Volodymyr Boyko <[email protected]>

* [BFN] Updated platform API for thermal (#8)

* Signed-off-by: Vadym Yashchenko <[email protected]>

* Revert "[BFN]  Fans and Fantray platform APIs update (#7)" (#11)

This reverts commit c62a733.

* Add support health monitor system (#15)

Signed-off-by: Petro Bratash <[email protected]>

* Update chassis.py

* [BFN] Updated FANs and FAN Tray platform API (#14)

* Fix fix_alignment (#17)

Signed-off-by: Petro Bratash <[email protected]>

* [BFN] Improvement show environment (#16)

* Added PSU temperature skip into platform.json (#18)

Signed-off-by: Andriy Kokhan <[email protected]>

* Do not skip psud on Newport

Signed-off-by: Andriy Kokhan <[email protected]>

* [BFN] fix fan status from Not OK to Ok (#19)

* [BFN] Updated SFP platform plugin (#13)

Signed-off-by: Volodymyr Boyko <[email protected]>

* [DPB] Fix typo for Ethernet0 2x200G[100G,40G] breakout mode (#21)

Signed-off-by: Mykola Gerasymenko <[email protected]>

* [barefoot] Tmp fix vendor_rev (#22)

Signed-off-by: Volodymyr Boyko <[email protected]>

* Fixed python issues in sonic_platform/fan_drawer.py

Signed-off-by: Andriy Kokhan <[email protected]>

* Updated fan_drawer.py

* Fixing trailing white spaces in fan_drawer.py

* [BFN] Fix thrift for SFPs API

Signed-off-by: Volodymyr Boyko <[email protected]>

* In platform.json, replaced 'false' with '0' to workaround ast.literal_eval() issue

Signed-off-by: Andriy Kokhan <[email protected]>

* [Newport] Thermal manager  (sonic-net#23)

* Signed-off-by: Vadym Yashchenko <[email protected]>

* Revert "In platform.json, replaced 'false' with '0' to workaround ast.literal_eval() issue"

This reverts commit 1e73127.

* Removed 'controllable' options from platform.json to fix factory default config generation

Signed-off-by: Andriy Kokhan <[email protected]>

* Update thermal_manager.py

* Migrated SFP plugin to sonic_xcvr API (sonic-net#30)

Signed-off-by: Andriy Kokhan <[email protected]>

Co-authored-by: KostiantynYarovyiBf <[email protected]>
Co-authored-by: Vadym Yashchenko <[email protected]>
Co-authored-by: Dmytro Lytvynenko <[email protected]>
Co-authored-by: Volodymyr Boiko <[email protected]>
Co-authored-by: Petro Bratash <[email protected]>
Co-authored-by: Mykola Gerasymenko <[email protected]>
saiarcot895 pushed a commit that referenced this pull request Jan 25, 2022
@zjswhhh
[sonic-linkmgrd][master] submodule update sonic-net#9808
22e4b9b 
[sonic-linkmgrd][master] submodule update

Commits added:
0c23756 Jing Zhang      2022-01-19      Linkmgrd subscribing State DB route event  (#13)
12b9951 Longxiang Lyu   2021-12-13      Add TLV support to ICMP payload (#11)
3eedda3 Longxiang Lyu   2022-01-06      Add missing intermediate states (#16)
8da4982 Ying Xie        2022-01-04      [linkmgrd] update README, set coding style guidance (#15)
a897cf8 Longxiang Lyu   2021-12-13      Improve PR template (#16)
6fec701 Jing Zhang      2021-12-06      Add pull request template for linkmgrd repo (#9)


signed-off-by: Jing Zhang [email protected]
saiarcot895 pushed a commit that referenced this pull request Feb 16, 2022
@zjswhhh
[sonic-linkmgrd][202012] submodule update sonic-net#9807
b450cd1 
[sonic-linkmgrd][master] submodule update

Commits added:
0c23756 Jing Zhang      2022-01-19      Linkmgrd subscribing State DB route event  (#13)
12b9951 Longxiang Lyu   2021-12-13      Add TLV support to ICMP payload (#11)
3eedda3 Longxiang Lyu   2022-01-06      Add missing intermediate states (#16)
8da4982 Ying Xie        2022-01-04      [linkmgrd] update README, set coding style guidance (#15)
a897cf8 Longxiang Lyu   2021-12-13      Improve PR template (#16)
6fec701 Jing Zhang      2021-12-06      Add pull request template for linkmgrd repo (#9)


signed-off-by: Jing Zhang [email protected]
saiarcot895 pushed a commit that referenced this pull request Aug 28, 2023
@mssonicbld
[submodule] Update submodule dhcpmon to the latest HEAD automatically (…
fbe75ee 
…sonic-net#16227)

#### Why I did it
src/dhcpmon
```
* a3c5381 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #11 from jcaiMR/dev/jcai_fix_err_log (12 hours ago) [StormLiangMS]
* ab78a31 - Merge branch 'master' into dev/jcai_fix_err_log (4 days ago) [jcaiMR]
* 5314b72 - remove unnessary log message in case too many log output (5 days ago) [jcaiMR]
* 01f4fa7 - fix build issue (5 days ago) [jcaiMR]
* c2fbb34 - fix format issue (5 days ago) [jcaiMR]
* 79b6720 - fix a notification message format issue (6 days ago) [jcaiMR]
```
#### How I did it
#### How to verify it
#### Description for the changelog
saiarcot895 pushed a commit that referenced this pull request Oct 18, 2023
@jcaiMR
advance dhcpmon to a3c5381 (sonic-net#16376)
a30ccb5 
Why I did it
Advance dhcpmon to a3c5381 in 202305 branch.

a3c5381 - (HEAD, origin/master, origin/HEAD, master) Merge pull request src: Add libnl3 build.sh script #11 from jcaiMR/dev/jcai_fix_err_log (11 days ago) [StormLiangMS]
c5ef7e7 - Change common_libs dependencies from buster to bullseye (Updating docker-orchagent/syncd Dockerfile and start.sh #9)
824a144 - replace atoi with strtol (Rename hostname #6) (10 weeks ago) [Mai Bui]
32c0c3f - Fix libswsscommon package installation for non-amd64 (README.md leaves out docker-database #7) (10 weeks ago) [Saikrishna Arcot]
Work item tracking
Microsoft ADO (25048723):
How I did it
How to verify it
Run test_dhcp_relay.py, no failure
saiarcot895 pushed a commit that referenced this pull request Dec 20, 2023
@Pterosaur
[submodule]: Update submodule sonic-swss/sonic-dash-api/protobuf (son…
7d4f348 
…ic-net#17413)

### Why I did it
1. Protobuf 3.21 has been released in the Debian bookworm
2. Update submodule sonic-swss and sonic-dash-api because they include related updates.

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

1. In the protobuf.mk, If it isn't bullseye, ignore to compile the protobuf package
2. Move sonic-swss commits:
```
fd852084 (HEAD, origin/master, origin/HEAD) [dashrouteorch]: Rename dash route namespace (sonic-net#2966)
```
3. Move sonic-dash-api and move build chain to its submodule
```
d4448c7 (HEAD, origin/master, origin/HEAD, master) [azp]: Add multi-platform artifacts (#11)
8a5e5cc [debian]: Add debian package (#10)
d96163a [misc]: Add dash utils and its tests (#9)
```

#### How to verify it
Check Azp
saiarcot895 pushed a commit that referenced this pull request Jul 31, 2024
@Pterosaur
[202311][submodule]: Update submodule sonic-swss/sonic-dash-api/proto…
e28b48b 
…buf (sonic-net#17521)

* [submodule]: Update submodule sonic-swss/sonic-dash-api/protobuf (sonic-net#17413)

1. Protobuf 3.21 has been released in the Debian bookworm
2. Update submodule sonic-swss and sonic-dash-api because they include related updates.

- Microsoft ADO **(number only)**:

1. In the protobuf.mk, If it isn't bullseye, ignore to compile the protobuf package
2. Move sonic-swss commits:
```
fd852084 (HEAD, origin/master, origin/HEAD) [dashrouteorch]: Rename dash route namespace (sonic-net#2966)
```
3. Move sonic-dash-api and move build chain to its submodule
```
d4448c7 (HEAD, origin/master, origin/HEAD, master) [azp]: Add multi-platform artifacts (#11)
8a5e5cc [debian]: Add debian package (#10)
d96163a [misc]: Add dash utils and its tests (#9)
```

Signed-off-by: Ze Gan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@aravindmani-1 @saiarcot895 @lguohan @kirankella @LuiSzee @jjangmua @alexrallen