Skip to content

qcom-multimedia-image: add bbappend from meta-qcom-distro#1864

Closed
quaresmajose wants to merge 2 commits intoqualcomm-linux:masterfrom
quaresmajose:qcom-multimedia-image
Closed

qcom-multimedia-image: add bbappend from meta-qcom-distro#1864
quaresmajose wants to merge 2 commits intoqualcomm-linux:masterfrom
quaresmajose:qcom-multimedia-image

Conversation

@quaresmajose
Copy link
Copy Markdown
Contributor

Moved qcom-multimedia-image.bbappend from qualcomm-linux/meta-qcom-distro#203

When adding restricted content here in the BSP layer, it's necessary to adjust the image as well, so it should be here and not in the distribution layer.

Fixes #1762

lumag added 2 commits April 2, 2026 11:04
qcom-multimedia-image is expected to contain only the open-source
software (except for the components to be executed on the
non-main cores, e.g on Hexagon DSP).

Use INCOMPATIBLE_LICENSE to make sure that no closed-source software
can get into qcom-multimedia-image. The setting is performed in the
bbappend so that it doesn't affect other images which include
qcom-multimedia-image.bb (like the qcom-multimedia-proprietary-image).

Fixes qualcomm-linux#1762

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
(cherry picked from commit cc1db67)
qualcomm-linux/meta-qcom-distro@cc1db67
Signed-off-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com>
Listing libvulkan-adreno1 in the BAD_RECOMMENDATIONS makes dnf ignore it
and thus pull in meta-vulkan-drivers as a virtual-vulkan-icd provider.
Drop unnecessary assignment pulling in meta-vulkan-drivers again.

Fixes qualcomm-linux#1762

Fixes: cc1db67c0174 ("qcom-multimedia-image: conflict with proprietary software")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
(cherry picked from commit 7add89e)
qualcomm-linux/meta-qcom-distro@7add89e
Signed-off-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com>
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 2, 2026

Test run workflow

Test jobs for commit cf5d97c

Test dragonboard-820c qcs615-adp-air qcs6490 qcs8300 qcs9100 qcs9100-rb8 qrb2210-rb1
boot pass pass pass pass pass pass pass

All jobs summary

Job ID Device State Health
169676 qrb2210-rb1 Finished Incomplete
169680 qrb2210-rb1 Finished Complete
169683 qcs615-adp-air Finished Complete
169678 qcs9100 Finished Complete
169691 qcs6490 Finished Complete
169673 qcs6490 Finished Complete
169694 qcs9100 Finished Complete
169690 dragonboard-820c Finished Complete
169682 dragonboard-820c Finished Incomplete
169696 qcs8300 Finished Complete
169679 qcs6490 Finished Complete
169685 qcs8300 Finished Complete
169688 qcs8300 Finished Complete
169695 qcs6490 Finished Complete
169684 qrb2210-rb1 Finished Complete
169687 qrb2210-rb1 Finished Complete
169689 qcs615-adp-air Finished Complete
169693 dragonboard-820c Finished Complete
169681 dragonboard-820c Finished Incomplete
169692 qcs8300 Finished Complete
169670 qcs9100-rb8 Finished Complete
169686 qcs9100 Finished Complete
169677 qcs615-adp-air Finished Complete
169674 qcs9100-rb8 Finished Complete
169697 qcs9100-rb8 Finished Complete
169675 qcs9100 Finished Complete
169671 qcs9100-rb8 Finished Complete

@test-reporting-app
Copy link
Copy Markdown

Test Results

 27 files   - 1   27 suites   - 1   1h 1m 58s ⏱️ - 1m 48s
 15 tests +2    8 ✅  -  1  0 💤 ±0   7 ❌ +3 
216 runs   - 5  203 ✅  - 14  0 💤 ±0  13 ❌ +9 

For more details on these failures, see this check.

Results for commit cf5d97c. ± Comparison against base commit 5b44f6c.

This pull request removes 1 and adds 3 tests. Note that renamed tests count towards both.
lava ‑ minimal-boot
lava ‑ deploy-flasher
lava ‑ deploy-flasher-retry
lava ‑ fastboot-boot

@ricardosalveti
Copy link
Copy Markdown
Contributor

Moved qcom-multimedia-image.bbappend from qualcomm-linux/meta-qcom-distro#203

When adding restricted content here in the BSP layer, it's necessary to adjust the image as well, so it should be here and not in the distribution layer.

I understand it helps having it here, but I don't think this should be managed by the BSP layer, as the inclusion or not into whatever image should be a distro decision in the end.

@quaresmajose
Copy link
Copy Markdown
Contributor Author

Is on the bsp layer we know which components should be in INCOMPATIBLE_LICENSE_EXCEPTIONS, they are all part of that layer. They are included or excluded from the images by packesgroups defined here in the BSP layer as well.

It doesn't make sense for someone to have to add a package blindly in the distro layer INCOMPATIBLE_LICENSE_EXCEPTIONS list in order to successfully execute the CI on the BSP layer.

Copy link
Copy Markdown
Contributor

@lumag lumag left a comment

Choose a reason for hiding this comment

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

No. All of this is purely a distro configuration and distro decisions.

@lumag
Copy link
Copy Markdown
Contributor

lumag commented Apr 2, 2026

INCOMPATIBLE_LICENSE_EXCEPTIONS list in order to successfully execute the CI on the BSP layer.

You are quoting the deficiency of our current CI. It is going to be changed after the 2.0 release.

@vivpuar
Copy link
Copy Markdown
Contributor

vivpuar commented Apr 4, 2026

No. All of this is purely a distro configuration and distro decisions.

Are we going to keep the bbappend in meta-qcom-distro?
PR#1762 will need the entry to be added in bbappend

@lumag
Copy link
Copy Markdown
Contributor

lumag commented Apr 4, 2026

No. All of this is purely a distro configuration and distro decisions.

Are we going to keep the bbappend in meta-qcom-distro? PR#1762 will need the entry to be added in bbappend

Yes. Please submit a PR for meta-qcom-distro.

@quaresmajose
Copy link
Copy Markdown
Contributor Author

Fixed with qualcomm-linux/meta-qcom-distro#257

@quaresmajose quaresmajose deleted the qcom-multimedia-image branch April 6, 2026 13:47
@quaresmajose
Copy link
Copy Markdown
Contributor Author

I don't understand why we didn't do here the same thing we did in qualcomm-linux/meta-qcom-3rdparty#24.

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.

4 participants