Skip to content

Fix RPC package build failure due to shell syntax issue #1268

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
saiarcot895 merged 2 commits into from
Jul 31, 2023
Merged

Fix RPC package build failure due to shell syntax issue #1268

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8f8953
Fix RPC package build failure due to shell syntax issue
saiarcot895 Jul 26, 2023
b78575f
Merge branch 'master' into fix-rpc-package-build
xumia Jul 31, 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
7 changes: 1 addition & 6 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# package maintainers to append LDFLAGS
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed

DOPACKAGES = $(shell dh_listpackages)

configure_opts = --disable-static
ifeq ($(ENABLE_ASAN), y)
configure_opts += --enable-asan
Expand Down Expand Up @@ -61,11 +59,8 @@ override_dh_auto_configure:

override_dh_install:
dh_install
# Note: escape $ with an extra $ symbol
ifneq ($(filter rpc,$(DEB_BUILD_PROFILES)),)
if [ -f debian/syncd-rpc/usr/bin/syncd_init_common.sh ] ; then
sed -i 's|ENABLE_SAITHRIFT=0|ENABLE_SAITHRIFT=1 # Add a comment to fix https://github.com/Azure/sonic-buildimage/issues/2694 |' debian/syncd-rpc/usr/bin/syncd_init_common.sh
fi
sed -i 's|ENABLE_SAITHRIFT=0|ENABLE_SAITHRIFT=1 # Add a comment to fix https://github.com/Azure/sonic-buildimage/issues/2694 |' debian/syncd-rpc/usr/bin/syncd_init_common.sh
endif

override_dh_installinit:
Expand Down