Skip to content

[Mellanox]Upload the SDK makefile modification#3555

Merged
lguohan merged 2 commits intosonic-net:masterfrom
stephenxs:supply-sdk-dependency-update
Oct 7, 2019
Merged

[Mellanox]Upload the SDK makefile modification#3555
lguohan merged 2 commits intosonic-net:masterfrom
stephenxs:supply-sdk-dependency-update

Conversation

@stephenxs
Copy link
Copy Markdown
Collaborator

- What I did
Adjust the SDK makefiles so that it reflects the dependencies among libraries in SDK 4.3.2104.
This is a supplement of PR [Mellanox]Update SDK(4.3.2104), SAI-Implementation(1.15) and firmware 2162. It doesn't impact the sonic-mellanox.bin image but makes the future SDK-integration easier.

- How I did it

- How to verify it

- Description for the changelog

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

This doesn't impact the sonic-mellanox image but make the future SDK-integration easier.
@stepanblyschak stepanblyschak self-requested a review October 3, 2019 08:05
@stephenxs
Copy link
Copy Markdown
Collaborator Author

retest this, please

$(SX_COMPLIB_DEV) $(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) \
$(SX_GEN_UTILS_DEV) $(SX_SCEW_DEV) $(SX_SCEW_DEV_STATIC) \
$(SXD_LIBS_DEV) $(SXD_LIBS_DEV_STATIC) $(WJH_LIBS_DEV)

Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft Oct 3, 2019

Choose a reason for hiding this comment

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

remove extra empty line #Closed

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

remove extra empty line

will remove.

MLNX_SDK_DEBS += $(APPLIBS_DEV) $(IPROUTE2_MLNX_DEV) $(SX_COMPLIB_DEV) \
$(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) $(SX_GEN_UTILS_DEV) \
$(SX_SCEW_DEV) $(SX_SCEW_DEV_STATIC) $(SXD_LIBS_DEV)\
$(SXD_LIBS_DEV_STATIC) $(WJH_LIBS_DEV) $(SX_ACL_HELPER_DEV)
Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft Oct 3, 2019

Choose a reason for hiding this comment

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

$(SX_ACL_HELPER_DEV [](start = 56, length = 19)

If you can add your new item at a new line and keep old lines, that would be better. #Closed

Copy link
Copy Markdown
Collaborator Author

@stephenxs stephenxs Oct 4, 2019

Choose a reason for hiding this comment

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

I just found that the length of the old lines is uneven and intended to beautify them. It may make it a little difficult to compare changes but only once and I think it is acceptable. Do you mean that?

# get sources
rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)

wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft Oct 3, 2019

Choose a reason for hiding this comment

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

wget -c [](start = 1, length = 7)

maybe curl is easier than wget to get stdout. #Closed

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Hi, since wget works well here, let's keep it as it is.


popd

mv $(DERIVED_TARGETS) $* $(DEST)/
Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft Oct 3, 2019

Choose a reason for hiding this comment

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

$* [](start = 23, length = 2)

Could you explain $*? #Closed

Copy link
Copy Markdown
Collaborator Author

@stephenxs stephenxs Oct 4, 2019

Choose a reason for hiding this comment

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

Hi, it stands for the default deb package. The sx-acl-helper_1.mlnx.4.3.2104_amd64.deb, in this case. #Closed

Copy link
Copy Markdown
Collaborator

@qiluo-msft qiluo-msft left a comment

Choose a reason for hiding this comment

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

commented

@stephenxs
Copy link
Copy Markdown
Collaborator Author

retest vs, please

@stephenxs
Copy link
Copy Markdown
Collaborator Author

retest this, please

@lguohan lguohan merged commit d316bcb into sonic-net:master Oct 7, 2019
@stephenxs stephenxs deleted the supply-sdk-dependency-update branch October 7, 2019 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants