Skip to content
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.

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

multilib correction - #3554 follow up #3582

Merged
merged 3 commits into from
Dec 2, 2021

Conversation

jvuillaumier
Copy link


Changes proposed in this PR:

Tentative patchset for multilib fix, aggregating:

  1. original change from @panfir submitted in meson.build: Fix subplugin install #3554
  2. complementary change from @myungjoo to fix Debian/Tizen packages, submitted in meson.build: Fix sideeffects of subplugin install fix panfir/nnstreamer#1
  3. a couple of additional fixup that may help

See also: #3554

Self evaluation:

  1. Build test: [ ]Passed [ ]Failed [*]Skipped
  2. Run test: [*]Passed [ ]Failed []Skipped
    SSAT test suite passed

panfir and others added 2 commits November 30, 2021 09:51
Use 'libdir' for library path to cover a multilib envoironment.

These checks are usually done before release, for example in the scenario
where images are created for a 64-bit target (imx8 * boards) but which also
supports running 32-bit applications.

This is the error in a linux/yocto build:

| ERROR: nnstreamer-2.0.0-r0 do_package: QA Issue: nnstreamer: Files/directories were installed but not shipped in any package:
|   /usr/lib/nnstreamer/customfilters/libnnstreamer_customfilter_passthrough_variable.so
|   /usr/lib/nnstreamer/customfilters/libdummyLSTM.so
|   /usr/lib/nnstreamer/customfilters/libnnstreamer_customfilter_scaler.so
|   /usr/lib/nnstreamer/customfilters/libnnstreamer_customfilter_average.so
|   /usr/lib/nnstreamer/customfilters/libnnstreamer_customfilter_scaler_allocator.so
|   /usr/lib/nnstreamer/customfilters/libnnscustom_drop_buffer.so
|   /usr/lib/nnstreamer/customfilters/libnnscustom_framecounter.so
|   /usr/lib/nnstreamer/customfilters/libdummyRNN.so
|   /usr/lib/nnstreamer/customfilters/libnnstreamer_customfilter_passthrough.so
|   /usr/lib/nnstreamer/converters/libnnstreamer_converter_protobuf.so
|   /usr/lib/nnstreamer/converters/libnnstreamer_converter_python3.so
|   /usr/lib/nnstreamer/decoders/libnnstreamer_decoder_bounding_boxes.so
|   /usr/lib/nnstreamer/decoders/libnnstreamer_decoder_direct_video.so
|   /usr/lib/nnstreamer/decoders/libnnstreamer_decoder_pose_estimation.so
|   /usr/lib/nnstreamer/decoders/libnnstreamer_decoder_image_labeling.so
|   /usr/lib/nnstreamer/decoders/libnnstreamer_decoder_image_segment.so
|   /usr/lib/nnstreamer/decoders/libnnstreamer_decoder_python3.so
|   /usr/lib/nnstreamer/decoders/libnnstreamer_decoder_protobuf.so
|   /usr/lib/nnstreamer/filters/libnnstreamer_filter_cpp.so
|   /usr/lib/nnstreamer/filters/libnnstreamer_filter_armnn.so
|   /usr/lib/nnstreamer/filters/libnnstreamer_filter_python3.so
|   /usr/lib/nnstreamer/filters/libnnstreamer_filter_tensorflow2-lite.so
|   /usr/lib/nnstreamer/extra/nnstreamer_python3.so
| Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
| nnstreamer: 23 installed and not shipped files. [installed-vs-shipped]

Signed-off-by: Cristinel Panfir <cristinel.panfir@nxp.com>

Cherry-picked from nnstreamer#3554

Signed-off-by: Julien Vuillaumier <julien.vuillaumier@nxp.com>
The PR nnstreamer#3554 breaks conventional non-multilib builds of x64/aarch64
systems (Tizen/Ubuntu). This fixes this side-effect.

Todo: fix Yocto build afterwards.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

Cherry-picked from panfir#1

Signed-off-by: Julien Vuillaumier <julien.vuillaumier@nxp.com>
@taos-ci
Copy link
Collaborator

taos-ci commented Nov 30, 2021

📝 TAOS-CI Version: 1.5.20200925. Thank you for submitting PR #3582. Please a submit 1commit/1PR (one commit per one PR) policy to get comments quickly from reviewers. Your PR must pass all verificiation processes of cibot before starting a review process from reviewers. If you are new member to join this project, please read manuals in documentation folder and wiki page. In order to monitor a progress status of your PR in more detail, visit http://nnstreamer.mooo.com/.

meson.build:
moved nnstreamer_prefix definition upward, before its first usage.

packaging/nnstreamer.spec:
corrected subplugindir definition to rely on actual %{_prefix} variable
and use the expected %{_prefix}/lib/nnstreamer path.

Signed-off-by: Julien Vuillaumier <julien.vuillaumier@nxp.com>
Copy link
Collaborator

@taos-ci taos-ci left a comment

Choose a reason for hiding this comment

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

@jvuillaumier, 💯 All CI checkers are successfully verified. Thanks.

Copy link
Member

@myungjoo myungjoo left a comment

Choose a reason for hiding this comment

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

LGTM.

@myungjoo myungjoo merged commit 10a4785 into nnstreamer:main Dec 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants