Skip to content

Remove architecture specific dependencies for L1 builds #420

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

Open
shibu-kv wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Remove architecture specific dependencies for L1 builds #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c17d819
Update build flags to support aarch64 platforms
shibu-kv Feb 6, 2026
7d55f5c
Update build flags to support aarch64 and x86 platforms
shibu-kv Feb 6, 2026
be194a8
Update build flags to support aarch64 and x86 platforms
shibu-kv Feb 11, 2026
dfb124c
Apply suggestions from code review
shibu-kv May 5, 2026
4d0759b
Merge branch 'develop' into feature/multi-arch-build
shibu-kv May 5, 2026
9878a74
Potential fix for pull request finding
shibu-kv May 5, 2026
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
31 changes: 29 additions & 2 deletions cov_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,32 @@ WORKDIR=`pwd`
export ROOT=/usr
export INSTALL_DIR=${ROOT}/local
mkdir -p $INSTALL_DIR

# Detect architecture for multi-platform Linux support (x86_64 and aarch64/arm64)
ARCH=$(uname -m)
case $ARCH in
x86_64)
ARCH_LIB_PATH="/usr/lib/x86_64-linux-gnu"
ARCH_LIB_PATH_ALT="/lib/x86_64-linux-gnu"
;;
aarch64|arm64)
ARCH_LIB_PATH="/usr/lib/aarch64-linux-gnu"
ARCH_LIB_PATH_ALT="/lib/aarch64-linux-gnu"
;;
*)
echo "Warning: Unsupported architecture $ARCH, defaulting to x86_64 paths"
ARCH_LIB_PATH="/usr/lib/x86_64-linux-gnu"
ARCH_LIB_PATH_ALT="/lib/x86_64-linux-gnu"
Comment on lines +18 to +20
;;
esac

# Set up library path for both architectures (aligned with L2-tests.yml)
if [ -n "${LD_LIBRARY_PATH:-}" ]; then
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ARCH_LIB_PATH}:${ARCH_LIB_PATH_ALT}:/usr/local/lib"
else
export LD_LIBRARY_PATH="${ARCH_LIB_PATH}:${ARCH_LIB_PATH_ALT}:/usr/local/lib"
fi

apt-get update && apt-get install -y libsoup-3.0

#Build rfc
Expand Down Expand Up @@ -79,7 +105,7 @@ make \
echo "Building IARMBus stubs"
cd $WORKDIR
cd ./src/unittest/stubs
g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I$WORKDIR/src/hostif/parodusClient/pal -I$WORKDIR/src/unittest/stubs -I$WORKDIR/src/hostif/parodusClient/waldb -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$WORKDIR/src/hostif/include -I$WORKDIR/src/hostif/profiles/DeviceInfo -I$WORKDIR/src/hostif/parodusClient/pal -fpermissive
g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I$WORKDIR/src/hostif/parodusClient/pal -I$WORKDIR/src/unittest/stubs -I$WORKDIR/src/hostif/parodusClient/waldb -I/usr/include/glib-2.0 -I$ARCH_LIB_PATH/glib-2.0/include -I$WORKDIR/src/hostif/include -I$WORKDIR/src/hostif/profiles/DeviceInfo -I$WORKDIR/src/hostif/parodusClient/pal -fpermissive
g++ -fPIC -shared -o libWPEFrameworkPowerController.so powerctrl_stubs.cpp -I$WORKDIR/src/unittest/stubs -fpermissive
cp libIARMBus.so /usr/local/lib
cp libIBus.h /usr/local/include
Expand All @@ -94,8 +120,9 @@ sed -i '/PKG_CHECK_MODULES(\[PROCPS\], \[libproc >= 3.2.8\])/s/^/#/' ./configure
autoreconf -i
./configure --enable-IPv6=yes


make AM_CXXFLAGS="-I$WORKDIR/src/unittest/stubs -I$WORKDIR/src/hostif/include -I/usr/include/cjson -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$WORKDIR/src/hostif/handlers/include -I$WORKDIR/src/hostif/parodusClient/waldb -I$WORKDIR/src/hostif/profiles/DeviceInfo -I/usr/include/cjson -I$WORKDIR/src/hostif/profiles/Time -I$WORKDIR/src/hostif/profiles/Device -I/usr/include/libsoup-3.0 -I/usr/include/yajl -I$WORKDIR/src/hostif/profiles/STBService -I$WORKDIR/src/unittest/stubs/ds -I/usr/devicesettings/ds -I/usr/local/include -I$WORKDIR/src/hostif/profiles/IP -I$WORKDIR/src/hostif/profiles/Ethernet -I/usr/local/include/rbus -I$WORKDIR/src/hostif/parodusClient/pal -I/usr/rdk-halif-device_settings/include -I/usr/local/include/libparodus -I/usr/local/include -I/usr/rdkvhal-devicesettings-raspberrypi4 -I/usr/local/include/ -I/usr/include/yajl -I/usr/tinyxml2 -I/usr/devicesettings/ds -I/$WORKDIR/src/hostif/httpserver/include -I/usr/remote_debugger/src/ -DIPV6_SUPPORT" \
AM_LDFLAGS="-L/usr/local/lib -lrbus -lsecure_wrapper -lcurl -lrfcapi -lrdkloggers -llibparodus -lglib-2.0 -lnanomsg -lIARMBus -lWPEFrameworkPowerController -lds -ldshalcli -ldshalsrv -lwrp-c -lwdmp-c -lprocps -ltrower-base64 -lcimplog -lsoup-3.0 -L/usr/lib/x86_64-linux-gnu -lyajl -L/usr/local/lib/x86_64-linux-gnu -ltinyxml2" CXXFLAGS="-fpermissive -DPARODUS_ENABLE -DUSE_REMOTE_DEBUGGER" \
AM_LDFLAGS="-L/usr/local/lib -lrbus -lsecure_wrapper -lcurl -lrfcapi -lrdkloggers -llibparodus -lglib-2.0 -lnanomsg -lIARMBus -lWPEFrameworkPowerController -lds -ldshalcli -ldshalsrv -lwrp-c -lwdmp-c -lprocps -ltrower-base64 -lcimplog -lsoup-3.0 -L$ARCH_LIB_PATH -lyajl -L/usr/local/lib -ltinyxml2" CXXFLAGS="-fpermissive -DPARODUS_ENABLE -DUSE_REMOTE_DEBUGGER" \
install

cd ./src/hostif/parodusClient/pal/mock-parodus/
Expand Down
4 changes: 3 additions & 1 deletion src/hostif/parodusClient/pal/mock-parodus/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ parodus_SOURCES = \
../../../handlers/src/hostIf_XrdkCentralT2_ReqHandler.cpp \
../../../handlers/src/hostIf_rbus_Dml_Provider.cpp

parodus_CPPFLAGS = -I../ -I../../../../unittest/stubs/ -I/usr/local/include/wrp-c/ -I../../waldb/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/local/include/wdmp-c/ -I/usr/local/include/rbus -I../../../include/ -I../../../../unittest/stubs/ -I../../../handlers/src/ -I/usr/local/include/cjson/ -I/usr/local/include/libparodus/ -I./ -I../../waldb/ -I../../../handlers/include/ -I../../../profiles/Time/ -I../../../profiles/DeviceInfo/ -I../../../profiles/Device -I../../../handlers/include/ -I../../../../unittest/stubs/ds -I../../../profiles/Ethernet/ -I../../../include/ -I../../../profiles/IP/ -I../../../profiles/STBService/ -I/usr/rdk-halif-device_settings/include/ -I/usr/rdkvhal-devicesettings-raspberrypi4/ -DUSE_REMOTE_DEBUGGER -I/usr/remote_debugger/src/
MOCK_PARODUS_GLIB_CFLAGS = $(if $(strip $(GLIB_CFLAGS)),$(GLIB_CFLAGS),$(shell pkg-config --cflags glib-2.0 2>/dev/null))

parodus_CPPFLAGS = -I../ -I../../../../unittest/stubs/ -I/usr/local/include/wrp-c/ -I../../waldb/ $(MOCK_PARODUS_GLIB_CFLAGS) -I/usr/local/include/wdmp-c/ -I/usr/local/include/rbus -I../../../include/ -I../../../../unittest/stubs/ -I../../../handlers/src/ -I/usr/local/include/cjson/ -I/usr/local/include/libparodus/ -I./ -I../../waldb/ -I../../../handlers/include/ -I../../../profiles/Time/ -I../../../profiles/DeviceInfo/ -I../../../profiles/Device -I../../../handlers/include/ -I../../../../unittest/stubs/ds -I../../../profiles/Ethernet/ -I../../../include/ -I../../../profiles/IP/ -I../../../profiles/STBService/ -I/usr/rdk-halif-device_settings/include/ -I/usr/rdkvhal-devicesettings-raspberrypi4/ -DUSE_REMOTE_DEBUGGER -I/usr/remote_debugger/src/

parodus_LDADD = -llibparodus -lrdkloggers -lwdmp-c -lwrp-c -lmsgpackc -lprocps -ltrower-base64 -lcimplog -lsoup-3.0 -lcjson -lpthread -lglib-2.0 -lnanomsg -lrbus -lIARMBus -lyajl -lds -ldshalcli -ldbus-1 -lsecure_wrapper -lcurl -L../../waldb/.libs/ -l:libwaldb.a -L../../../profiles/Time/.libs/ -l:libhostIfTime.a -ltinyxml2 -lIARMBus

1 change: 1 addition & 0 deletions src/hostif/parodusClient/pal/mock-parodus/mock_parodus_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
sed -i '/getCurrentTime/,/^ *}/d' ../../../src/hostIf_utils.cpp

autoreconf --install && \
./configure --prefix=/usr/local && make && make install
Loading