Skip to content

Apply the SAI patch to fix the header file not found issue #13699

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

Draft
xumia wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Apply the SAI patch to fix the header file not found issue #13699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79675c5
Apply the SAI patch to fix the header file not found issue
xumia Feb 7, 2023
43ec892
Fix the patch garbage issue
xumia Feb 7, 2023
ac46614
Fix the patch garbage issue
xumia Feb 7, 2023
3305c15
Fix the patch format issue
xumia Feb 7, 2023
d51d16d
Fix the patch not applied issue
xumia Feb 8, 2023
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
5 changes: 5 additions & 0 deletions platform/barefoot/libsaithrift-dev.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@ $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
SAISERVER_DBG = saiserver$(SAITHRIFT_VER)-dbg_$(SAI_VER)_amd64.deb
$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER)
$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG)))

# A workaround to fix the SAI header files not checkout issue
# Once the SAI upgraded to the version that contains the patch, then the following change can be removed
PATCH_DEPEND = $(shell cd $(SRC_PATH)/sonic-sairedis; QUILT_PATCHES=../sonic-sairedis.patch quilt push -a > /dev/null)
$(eval $(echo $(PATCH_DEPEND)))
5 changes: 5 additions & 0 deletions platform/broadcom/libsaithrift-dev.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,8 @@ $(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
SAISERVER_DBG = saiserver$(SAITHRIFT_VER)-dbg_$(SAI_VER)_amd64.deb
$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER)
$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG)))

# A workaround to fix the SAI header files not checkout issue
# Once the SAI upgraded to the version that contains the patch, then the following change can be removed
PATCH_DEPEND = $(shell cd $(SRC_PATH)/sonic-sairedis; QUILT_PATCHES=../sonic-sairedis.patch quilt push -a > /dev/null)
$(eval $(echo $(PATCH_DEPEND)))
25 changes: 25 additions & 0 deletions src/sonic-sairedis.patch/0001-improve-enum-values-integration-check-1727.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Index: sonic-sairedis/SAI/meta/checkenumlock.sh
===================================================================
--- sonic-sairedis.orig/SAI/meta/checkenumlock.sh
+++ sonic-sairedis/SAI/meta/checkenumlock.sh
@@ -30,6 +30,7 @@ rm -rf temp
mkdir temp

git --work-tree=temp/ checkout origin/master inc
+git --work-tree=temp/ checkout origin/master experimental

echo "Checking for possible enum values shift (current branch vs origin/master) ..."

Index: sonic-sairedis/SAI/meta/checkheaders.pl
===================================================================
--- sonic-sairedis.orig/SAI/meta/checkheaders.pl
+++ sonic-sairedis/SAI/meta/checkheaders.pl
@@ -149,7 +149,7 @@ sub GetValues

my ($fhb, $bin) = tempfile( SUFFIX => '.bin', UNLINK => 1 );

- system("gcc $src -I. -I ../experimental -I '$dir' -o $bin") == 0 or die "gcc failed! $!";
+ system("gcc $src -I. -I '$dir'/../experimental -I '$dir' -o $bin") == 0 or die "gcc failed! $!";

close $fhs;
close $fhb;
1 change: 1 addition & 0 deletions src/sonic-sairedis.patch/series
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0001-improve-enum-values-integration-check-1727.patch