-
Notifications
You must be signed in to change notification settings - Fork 362
camx: revision update for Lemans, Talos,Kodiak, Hamoa,Shikra #3133
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
Open
Ganesh Khose (gkhose-qipl)
wants to merge
5
commits into
qualcomm-linux:master
Choose a base branch
from
gkhose-qipl:camx_downstream
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
bb0985b
camxcommon-headers: upgrade v1.0.38 -> v1.0.45.
gkhose-qipl bdbec6d
camxlib: drop legacy libcamera packaging entries
gkhose-qipl 0cdc546
camx: upgrade lemans/hamoa/talos to v1.0.45
gkhose-qipl ed347ed
camxlib-kodiak: upgrade v1.0.35 -> v1.0.41
gkhose-qipl 93a6e77
camxlib-shikra:Add Qualcomm Camera X (CamX) module for Shikra
gkhose-qipl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
12 changes: 6 additions & 6 deletions
12
...s-multimedia/camx/camxlib-hamoa_1.0.41.bb → ...s-multimedia/camx/camxlib-hamoa_1.0.45.bb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,28 +8,23 @@ LICENSE = "LicenseRef-LICENSE.qcom-2" | |
| LIC_FILES_CHKSUM = "file://usr/share/doc/${BPN}/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0 \ | ||
| file://usr/share/doc/${BPN}/NOTICE;md5=04facc2e07e3d41171a931477be0c690" | ||
|
|
||
| PBT_BUILD_DATE = "260825" | ||
| PBT_BUILD_DATE = "260910" | ||
| PBT_BRANCH = "master" | ||
| SRC_URI = " \ | ||
| https://qartifactory-edge.qualcomm.com/artifactory/qsc_releases/software/chip/component/camx.qclinux.0.0/${PBT_BUILD_DATE}/prebuilt_yocto_${PBT_BRANCH}/${BPN}_${PV}_armv8-2a.tar.gz;name=camxlib \ | ||
| https://qartifactory-edge.qualcomm.com/artifactory/qsc_releases/software/chip/component/camx.qclinux.0.0/${PBT_BUILD_DATE}/prebuilt_yocto_${PBT_BRANCH}/camx-kodiak_${PV}_armv8-2a.tar.gz;name=camx \ | ||
| https://qartifactory-edge.qualcomm.com/artifactory/qsc_releases/software/chip/component/camx.qclinux.0.0/${PBT_BUILD_DATE}/prebuilt_yocto_${PBT_BRANCH}/chicdk-kodiak_${PV}_armv8-2a.tar.gz;name=chicdk \ | ||
| https://qartifactory-edge.qualcomm.com/artifactory/qsc_releases/software/chip/component/camx.qclinux.0.0/${PBT_BUILD_DATE}/prebuilt_yocto_${PBT_BRANCH}/camxtest-kodiak_${PV}_armv8-2a.tar.gz;name=camxtest \ | ||
| " | ||
| SRC_URI[camxlib.sha256sum] = "694c66493b5459bde8734ba416673ec93e5abdbabef5cbd9f86a60a52e09eb1b" | ||
| SRC_URI[camx.sha256sum] = "7ab9838704139cbb52bc9c9c0277edaa2eabadf6dfd6719cf8aa93a4e7d9f29b" | ||
| SRC_URI[chicdk.sha256sum] = "b0800ae386afa8f3ddac704d5e67a6f71d9a270acb3e2bc793a5b56a6d829417" | ||
| SRC_URI[camxtest.sha256sum] = "26653dcaa7974c6b44fa5f3dc8560cd8d7f8b33c8ceae337ed0e43fb49d3e2a1" | ||
| SRC_URI[camxlib.sha256sum] = "b47924c3dcdb7335ef113375c7bb54523478544986013f43af8af4291b93ab6f" | ||
| SRC_URI[camx.sha256sum] = "74d41e6bea69f5fa1bcadd56e4fd671173dc82e23ad7b32577262c795304af0b" | ||
| SRC_URI[chicdk.sha256sum] = "bba4027c1cd04a769b098ccffe0c3bec942cb3a8ec914c39d757eb047afb0ff4" | ||
| SRC_URI[camxtest.sha256sum] = "d72999d60fff15a240237cd4c0d0ea5cccc69977656d44b9e9844ec91725f122" | ||
|
|
||
| S = "${UNPACKDIR}" | ||
|
|
||
| DEPENDS += "glib-2.0 fastrpc protobuf libxml2 qmi-framework sensinghub qcom-sensors-binaries" | ||
|
|
||
| DEPENDS += " \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/egl virtual/libgles2', '', d)} \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'opencl', 'virtual/libopencl1', '', d)} \ | ||
| " | ||
|
|
||
| # This package is currently only used and tested on ARMv8 (aarch64) machines. | ||
| # Therefore, builds for other architectures are not necessary and are explicitly excluded. | ||
| COMPATIBLE_MACHINE = "^$" | ||
|
|
@@ -74,6 +69,9 @@ do_install:append() { | |
| rm -f ${D}${libdir}/camx/kodiak/hw/*${SOLIBSDEV} | ||
| rm -f ${D}${libdir}/camx/kodiak/camera/*${SOLIBSDEV} | ||
|
|
||
| # Remove legacy libcamera* libs from the staged image | ||
|
gkhose-qipl marked this conversation as resolved.
|
||
| rm -f ${D}${libdir}/libcamera* | ||
|
gkhose-qipl marked this conversation as resolved.
gkhose-qipl marked this conversation as resolved.
gkhose-qipl marked this conversation as resolved.
|
||
|
|
||
| install -m 0644 ${S}/usr/share/doc/${BPN}/NOTICE ${D}${datadir}/doc/${BPN} | ||
| install -m 0644 ${S}/usr/share/doc/${BPN}/LICENSE.QCOM-2.txt ${D}${datadir}/doc/${BPN} | ||
|
|
||
|
|
@@ -93,7 +91,11 @@ do_install:append() { | |
| PACKAGE_BEFORE_PN += "camx-kodiak chicdk-kodiak ${PN}-skel" | ||
| RDEPENDS:${PN} += "chicdk-kodiak ${PN}-skel" | ||
| RDEPENDS:${PN}-dev += "camxcommon-headers-dev" | ||
| RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'opencl', 'virtual-opencl-icd', '', d)} sensinghub qcom-sensors-binaries" | ||
| RRECOMMENDS:${PN} += "sensinghub qcom-sensors-binaries" | ||
| RRECOMMENDS:${PN} += " \ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add sensinghub qcom-sensors-binaries here, no need to have 2 entries for RRECOMMENDS. |
||
| ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libegl1 libglesv2-2', '', d)} \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'opencl', '${PREFERRED_PROVIDER_virtual/libopencl1}', '', d)} \ | ||
| " | ||
|
|
||
| FILES:camx-kodiak = "\ | ||
| ${libdir}/libcamx_hardware_kodiak*${SOLIBS} \ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-shikra_1.0.46.bb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| PLATFORM = "shikra" | ||
| PBT_BUILD_DATE = "260911" | ||
|
|
||
| require common.inc | ||
|
|
||
| SRC_URI[camxlib.sha256sum] = "e090945d93a9de0fb64470480a87cb63c8773caab9bbf17212b31605f7d6417b" | ||
| SRC_URI[camx.sha256sum] = "ef372d5cb3a3f5303d13799e3f866c3f882127fc7bf4d9d80e1d2e131410f7b1" | ||
| SRC_URI[chicdk.sha256sum] = "f1ad3e91ce9902bd1135bb36f626741dcae20d5cf0fbafd8e6c6cec2678afa33" | ||
| SRC_URI[camxcommon.sha256sum] = "9ce4b129b55c2d81b478e7666dc95377339ab3ffa83a47b2ff2bad9d861d2f97" | ||
| SRC_URI[camxtest.sha256sum] = "5cbb58e6d3a2cd7565c68a6a660272ba80951570b881c57d1d276ada1d016f33" | ||
|
|
||
| DEPENDS += "sensinghub" | ||
| RRECOMMENDS:${PN} += " \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libegl1 libglesv2-2', '', d)} \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'opencl', '${PREFERRED_PROVIDER_virtual/libopencl1}', '', d)} \ | ||
| " |
20 changes: 0 additions & 20 deletions
20
dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-talos_1.0.38.bb
This file was deleted.
Oops, something went wrong.
22 changes: 22 additions & 0 deletions
22
dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-talos_1.0.45.bb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| PLATFORM = "talos" | ||
| PBT_BUILD_DATE = "260910" | ||
|
|
||
| require common.inc | ||
|
|
||
| SRC_URI[camxlib.sha256sum] = "3f6b90a805a2c16d155cd8e19779d93a1a579e38793ef17841a37623acf0bd2d" | ||
| SRC_URI[camx.sha256sum] = "9a9b87a3117ac0ad6d38062e4d3f2772c8675399bb882216dc0fe25860b58777" | ||
| SRC_URI[chicdk.sha256sum] = "8c8f13e72bcece296a751b07d8a119a804a9b3769432672d95084b33bec3c384" | ||
| SRC_URI[camxcommon.sha256sum] = "adfdcba5f52d42b70223a9bb9d32b9ed497d35210657c5c52701b75a47f23288" | ||
| SRC_URI[camxtest.sha256sum] = "e038ed09189db4ee7bb593a586c26965cd7edb30493bf1d2c364377bcd165105" | ||
|
|
||
| RRECOMMENDS:${PN} += " \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libegl1 libglesv2-2', '', d)} \ | ||
| ${@bb.utils.contains('DISTRO_FEATURES', 'opencl', '${PREFERRED_PROVIDER_virtual/libopencl1}', '', d)} \ | ||
| " | ||
|
|
||
| do_install:append() { | ||
| if ${@bb.utils.contains('DISTRO_FEATURES', 'opengl opencl', 'false', 'true', d)}; then | ||
| rm -f ${D}${libdir}/camx/${PLATFORM}/camera/components/libiwarp* | ||
| rm -f ${D}${libdir}/camx/${PLATFORM}/camera/components/libhidrx* | ||
| fi | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
dynamic-layers/selinux/recipes-security/refpolicy/refpolicy-targeted_git.bbappend
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.