Skip to content

[Ethtool]: Fixing Build Failure on ARM Platform #7226

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

Merged
lguohan merged 6 commits into from
Apr 8, 2021
Merged

[Ethtool]: Fixing Build Failure on ARM Platform #7226

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7fd9b3
[Ethtool]: Build Failure on ARMhf handled
Apr 2, 2021
9816715
Made the change Ptf Specifc
Apr 2, 2021
317519b
Minor Fixes
Apr 2, 2021
bc9905f
Edited rules file instead of configure.ac
vivekrnv Apr 5, 2021
74e409b
Disable tests instead of config option
vivekrnv Apr 7, 2021
f8d045d
Used DEB_BUILD_OPTIONS
vivekrnv Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rules/ethtool.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
ETHTOOL_VERSION_BASE = 5.9
export ETHTOOL_VERSION_BASE

ETHTOOL = ethtool_$(ETHTOOL_VERSION_BASE)-1_amd64.deb
ETHTOOL = ethtool_$(ETHTOOL_VERSION_BASE)-1_$(CONFIGURED_ARCH).deb
$(ETHTOOL)_SRC_PATH = $(SRC_PATH)/ethtool
SONIC_MAKE_DEBS += $(ETHTOOL)

ETHTOOL_DBG = ethtool-dbgsym_$(ETHTOOL_VERSION_BASE)-1_amd64.deb
ETHTOOL_DBG = ethtool-dbgsym_$(ETHTOOL_VERSION_BASE)-1_$(CONFIGURED_ARCH).deb
$(eval $(call add_extra_package,$(ETHTOOL),$(ETHTOOL_DBG)))

export ETHTOOL ETHTOOL_DBG
4 changes: 4 additions & 0 deletions src/ethtool/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
git clone https://salsa.debian.org/kernel-team/ethtool/
pushd ethtool
git checkout tags/debian/1%$(ETHTOOL_VERSION_BASE)-1
ifneq (,(filter $(CONFIGURED_ARCH),arm64 armhf))
# Disabling Tests
sed -i -e 's/\(override_dh_auto_configure:\)/override_dh_auto_test:\n\techo \"Skipping Tests\"\n\n\1/g' debian/rules
Copy link
Copy Markdown
Collaborator

@lguohan lguohan Apr 7, 2021

Choose a reason for hiding this comment

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

NO NEED TO IT HERE.

you can refer this example.

rules/sairedis.mk:$(LIBSAIREDIS)_DEB_BUILD_OPTIONS = nocheck

it will disable check

Copy link
Copy Markdown
Contributor Author

@vivekrnv vivekrnv Apr 8, 2021

Choose a reason for hiding this comment

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

Thanks for the example, @lguohan

endif
# Build package
dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
popd
Expand Down