Skip to content

Adding changes to copy openssl and curl libraries to build/bin #211

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
kanjoe24 wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Adding changes to copy openssl and curl libraries to build/bin #211

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
66c4f1a
Add gh #210 : Adding changes to copy openssl and curl libraries to bu…
kanjoe24 Jun 11, 2025
2ac8b34
Add gh #210 : Adding changes to copy openssl and curl libraries to bu…
kanjoe24 Jun 11, 2025
998663c
Merge branch 'feature/ut-core-reduce-size-helper' of github.com:rdkce…
kanjoe24 Jun 11, 2025
58433af
Add gh #210 : Adding few checks to ensure copy happens only when dirs…
kanjoe24 Jun 12, 2025
31da6ec
Add gh #210 : Adding few checks to ensure copy happens only when dirs…
kanjoe24 Jun 12, 2025
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
8 changes: 7 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,13 @@ framework: checkvariantchange createdirs download_and_build
@${ECHOE} ${GREEN}Framework downloaded and built${NC}
@make test VARIANT=${VARIANT}
@cp -r $(UT_CONTROL)/build/$(TARGET)/lib/libut_control.* $(LIB_DIR) $(BIN_DIR)
@${ECHOE} ${GREEN}ut-control LIB Copied to [${BIN_DIR}]${NC}
@if [ -d "$(UT_CONTROL)/build/$(TARGET)/curl" ]; then \
Copy link
Contributor

@Ulrond Ulrond Jun 12, 2025

Choose a reason for hiding this comment

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

ok that's not clear..

why has ut-core any knowledge curl is being used? that library is something that's provided by ut-control has nothitng todo with ut-core?

cp -r $(UT_CONTROL)/build/$(TARGET)/curl/lib/libcurl.so* $(LIB_DIR) $(BIN_DIR); \
fi
@if [ -d "$(UT_CONTROL)/build/$(TARGET)/openssl" ]; then \
Copy link
Contributor

@Ulrond Ulrond Jun 12, 2025

Choose a reason for hiding this comment

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

makes no-sense, ut-core has no reason to know about openssl surely?

cp -r $(UT_CONTROL)/build/$(TARGET)/openssl/lib/lib*.so* $(LIB_DIR) $(BIN_DIR); \
fi
@${ECHOE} ${GREEN}ut-control and related LIBs Copied to [${BIN_DIR}]${NC}
@if [ -d "$(TOP_DIR)/../include" ] && [ -d "$(BUILD_DIR)/src" ]; then \
${UT_CORE_DIR}/compare-functions-in-headers-testsuite.sh $(TOP_DIR)/../include $(BIN_DIR)/${TARGET_EXEC} ${TARGET}; \
fi
Expand Down
3 changes: 2 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ else
check_ut_control_revision
# Check out the version required based on control_revision
pushd ${UT_CONTROL_LIB_DIR} > /dev/null
git checkout ${UT_CONTROL_PROJECT_VERSION} # MARKER: Version=${UT_CONTROL_PROJECT_VERSION}
#git checkout ${UT_CONTROL_PROJECT_VERSION} # MARKER: Version=${UT_CONTROL_PROJECT_VERSION}
git checkout feature/gh79-ut-control-reduce-size # MARKER: Version=${UT_CONTROL_PROJECT_VERSION}
Copy link
Contributor

@Ulrond Ulrond Jun 12, 2025

Choose a reason for hiding this comment

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

you need to revert this one.

# Note: The above line can be modified by release test scripts to checkout a specific version or branch
Copy link
Contributor Author

@kanjoe24 kanjoe24 Jun 11, 2025

Choose a reason for hiding this comment

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

This change needs to be reverted before final approval.

popd > /dev/null
configure_ut_control
Expand Down