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

[platform]: remove sku from build parameter #350

Merged
merged 2 commits into from
Mar 2, 2017
Merged

[platform]: remove sku from build parameter #350

merged 2 commits into from
Mar 2, 2017

Conversation

lguohan
Copy link
Collaborator

@lguohan lguohan commented Mar 1, 2017

different sku will be contained in a single one sonic image.
no longer need to specify sku at the build time

@lguohan
[platform]: remove sku from build parameter
fdb885e 
different sku will be contained in a single one sonic image.
no longer need to specify sku at the build time
marian-pritsak
marian-pritsak reviewed Mar 1, 2017
View reviewed changes
files/build_templates/sonic_debian_extension.j2 Outdated
export debian_version=`cat $FILESYSTEM_ROOT/etc/debian_version`
export sonic_hwsku=
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why leave this line?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will fix

@stcheng
Copy link
Contributor

stcheng commented Mar 1, 2017

do we want to have minigraph files here? the minigraph files are depending on different kinds of topologies.

@lguohan
Copy link
Collaborator Author

lguohan commented Mar 1, 2017

that is the sample minigraph, the image can also download one, or the user can update one.

@lguohan
Copy link
Collaborator Author

lguohan commented Mar 1, 2017 •
edited
Loading

the minigraph can also be generated, platform vendor do not need to check-in. I think we'll need to address this in future CR.

@lguohan lguohan merged commit 0ed9b3c into sonic-net:master Mar 2, 2017
@lguohan lguohan deleted the nosku branch November 6, 2017 04:34
Kalimuthu-Velappan pushed a commit to Kalimuthu-Velappan/sonic-buildimage that referenced this pull request Sep 12, 2019
@kevinwangsk @qiluo-msft
Some improvement for Mellanox sniffer CLI (sonic-net#350)
2cb4586 
* Hide Mellanox sniffer CLI on other platforms
* Set enable/disable to be the argument of sniffer command rather than the sub-command
@daall daall mentioned this pull request Oct 15, 2020
Merged
daall added a commit that referenced this pull request Oct 16, 2020
@daall
[swss] Update swss and swss-common submodule pointers (#5630)
cdb82b9 
[swss]
[acl] Replace IP_PROTOCOL with NEXT_HEADER for IPv6 ACL tables (#1458)
[acl] Refactor port OID retrieval into aclorch (#1462)
Fix issue #5157 by identifying the dependency among objects and avoiding releasing an object still being referenced (#1440)
[mock tests] Update MockDBConnector to match new swsscommon interface (#1465)

[swss-common]
netlink: Setting nl_socket buffer size to 3M from 2M (#391)
Added support in Swig file to cast Selectable object to Subscriber Table object (#394)
[warm reboot] Warm Reboot Support for EVPN VXLAN (#350)
Implement DBInterface/SonicV2Connector in C++ (#387)
Fix memory leak if a RedisCommand object were to be reused (#392)

Signed-off-by: Danny Allen <daall@microsoft.com>
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
@daall @santhosh-kt
[swss] Update swss and swss-common submodule pointers (sonic-net#5630)
9822fbf 
[swss]
[acl] Replace IP_PROTOCOL with NEXT_HEADER for IPv6 ACL tables (sonic-net#1458)
[acl] Refactor port OID retrieval into aclorch (sonic-net#1462)
Fix issue sonic-net#5157 by identifying the dependency among objects and avoiding releasing an object still being referenced (sonic-net#1440)
[mock tests] Update MockDBConnector to match new swsscommon interface (sonic-net#1465)

[swss-common]
netlink: Setting nl_socket buffer size to 3M from 2M (sonic-net#391)
Added support in Swig file to cast Selectable object to Subscriber Table object (sonic-net#394)
[warm reboot] Warm Reboot Support for EVPN VXLAN (sonic-net#350)
Implement DBInterface/SonicV2Connector in C++ (sonic-net#387)
Fix memory leak if a RedisCommand object were to be reused (sonic-net#392)

Signed-off-by: Danny Allen <daall@microsoft.com>
snider-nokia pushed a commit to snider-nokia/sonic-buildimage that referenced this pull request Apr 6, 2023
@Junchao-Mellanox
Fix issue: should always check return value of a function if the func…
81636a5 
…tion may return None (sonic-net#350)

Fix unit test failure
yxieca pushed a commit that referenced this pull request Apr 18, 2023
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
2b3b85b 
… automatically (#14694)

src/sonic-platform-common

* 24009de - (HEAD -> 202205, origin/202205) Fix issue: should always check return value of a function if the function may return None (#350) (#356) (3 hours ago) [Junchao-Mellanox]
mssonicbld added a commit that referenced this pull request Nov 1, 2023
@mssonicbld
[submodule] Update submodule sonic-linux-kernel to the latest HEAD au…
d8f9f23 
…tomatically (#17056)

#### Why I did it
src/sonic-linux-kernel
```
* a75a3df - (HEAD -> master, origin/master, origin/HEAD) arm64: Kconfig inclusions to fix PCI hang and MTD detection (#350) (3 hours ago) [Pavan Naregundi]
```
#### How I did it
#### How to verify it
#### Description for the changelog
lixiaoyuner pushed a commit to lixiaoyuner/sonic-buildimage that referenced this pull request Feb 6, 2024
@yaqiangz
Merged PR 9025464: Merge branch 'master' of https://github.com/Azure/…
acd8855 
…sonic-buildimage into internal

1. Resolve conflicts (introduced by this public PR: [sonic-net#16947](sonic-net#16947)) in `dockers/docker-dhcp-relay/Dockerfile.j2`:
```
<<<<<<< HEAD
RUN apt-get install -y dnsmasq gcc python3-dev

RUN pip3 install psutil

RUN apt-get purge -y gcc python3-dev
=======
{% if docker_dhcp_relay_whls.strip() %}
# Copy locally-built Python wheel dependencies
{{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }}

# Install locally-built Python wheel dependencies
{{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }}
{% endif %}
>>>>>>> 274d320
```

Accepted both changes, after resolved:
```
RUN apt-get install -y dnsmasq gcc python3-dev

RUN pip3 install psutil

RUN apt-get purge -y gcc python3-dev

{% if docker_dhcp_relay_whls.strip() %}
# Copy locally-built Python wheel dependencies
{{ copy_files("python-wheels/", docker_dhcp_relay_whls.split(' '), "/python-wheels/") }}

# Install locally-built Python wheel dependencies
{{ install_python_wheels(docker_dhcp_relay_whls.split(' ')) }}
{% endif %}
```

2. Because dnsmasq (used for ipv4 dhcp_server previously) exist in internal repo but not exist in public master repo, which would cause new added test case added by [sonic-net#16947](sonic-net#16947) in sonic-config-engine would fail. Also, we expect that dnsmasq is not running if "dhcp_server" feature is enabled.
So I **add support for new added test case** and **modify template to avoid run dnsmasq when dhcp_server feature is enabled** in below commit:
![image (2).png](https://dev.azure.com/msazure/b32aa71e-8ed2-41b2-9d77-5bc261222004/_apis/git/repositories/8721f84d-7905-4f85-b5f1-0e19e8eac66b/pullRequests/9025464/attachments/image%20%282%29.png)

Related work items: sonic-net#350, sonic-net#803, sonic-net#2858, sonic-net#16945, sonic-net#16996, sonic-net#17047, sonic-net#17053, sonic-net#17056, sonic-net#17057, sonic-net#17068
vivekrnv pushed a commit to vivekrnv/sonic-buildimage that referenced this pull request Jun 7, 2024
@Yakiv-Huryk @vivekrnv
[mellanox] fix DPU fpga update (sonic-net#350)
64b97e9 
* update cpldupdate command line
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marian-pritsak marian-pritsak marian-pritsak left review comments

@jleveque jleveque jleveque approved these changes

@stcheng stcheng stcheng approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lguohan @stcheng @jleveque @marian-pritsak