Skip to content

Commit f0948f7

Browse files
Camera, sensors: switch to main protobuf version (#1580)
Upgrade sensors and camera binaries to the version which is linked against protobuf version from meta-oe. This is an alternative to #1571, keeping the protobuf-camx name for the sake of simplifying handling the of binary vs meta-oe handling in future. When the situation repeats there would be no need to switch between protobuf and protobuf-camx anymore.
2 parents e4162d9 + d007c53 commit f0948f7

12 files changed

+57
-311
lines changed

dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-kodiak_1.0.10.bb renamed to dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-kodiak_1.0.11.bb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ LICENSE = "LICENSE.qcom-2"
88
LIC_FILES_CHKSUM = "file://usr/share/doc/${BPN}/LICENSE.QCOM-2.txt;md5=165287851294f2fb8ac8cbc5e24b02b0 \
99
file://usr/share/doc/${BPN}/NOTICE;md5=04facc2e07e3d41171a931477be0c690"
1010

11-
PBT_BUILD_DATE = "260209.1"
11+
PBT_BUILD_DATE = "260211"
1212
SRC_URI = " \
1313
https://qartifactory-edge.qualcomm.com/artifactory/qsc_releases/software/chip/component/camx.qclinux.0.0/${PBT_BUILD_DATE}/prebuilt_yocto/${BPN}_${PV}_armv8-2a.tar.gz;name=camxlib \
1414
https://qartifactory-edge.qualcomm.com/artifactory/qsc_releases/software/chip/component/camx.qclinux.0.0/${PBT_BUILD_DATE}/prebuilt_yocto/camx-kodiak_${PV}_armv8-2a.tar.gz;name=camx \
1515
https://qartifactory-edge.qualcomm.com/artifactory/qsc_releases/software/chip/component/camx.qclinux.0.0/${PBT_BUILD_DATE}/prebuilt_yocto/chicdk-kodiak_${PV}_armv8-2a.tar.gz;name=chicdk \
1616
"
17-
SRC_URI[camxlib.sha256sum] = "1a1b5ad53075248f3ea39aa299dfa50cac60463bce471be7bc7c68b9be168dc0"
18-
SRC_URI[camx.sha256sum] = "07d5ca393708f693fabe5a0faf4263172f7f35ebc96b321c788e7a1c56e1a2e5"
19-
SRC_URI[chicdk.sha256sum] = "d16baa755077c3c9b305fb05c139a6f18713bff55f3a57bb4b7b31801e74e7fb"
17+
SRC_URI[camxlib.sha256sum] = "abe341eaee99e05ccfacf37238380660630a0b671348a559d6ea918b50ab8634"
18+
SRC_URI[camx.sha256sum] = "7311b3d3c05a8899c2289e00682fd16e23fdf4ca00205ed6bd4ea2f63f35c371"
19+
SRC_URI[chicdk.sha256sum] = "f76beb5658f0778db2199c9809ed18e9b4f46dd36e67d5839b7d36561298be1a"
2020

2121
S = "${UNPACKDIR}"
2222

dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-lemans_1.0.11.bb

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
PLATFORM = "lemans"
2+
PBT_BUILD_DATE = "260211"
3+
4+
require common.inc
5+
6+
SRC_URI[camxlib.sha256sum] = "5d5c907a7aecfaa2658ed79a3f3c426bcde5b24fed5e8294cef14d9570337e05"
7+
SRC_URI[camx.sha256sum] = "f871cca822e76e9b39bec65726038af0a45384c83404ffe6183cf41d68ed8c58"
8+
SRC_URI[chicdk.sha256sum] = "a7eb5b2161ccfc091fac513f40966a3ca13cb952eb206c08035607a7c1a2035f"
9+
SRC_URI[camxcommon.sha256sum] = "2a78ffe1a6d475d77640d0e70ed730e6a88ea19337cb8e31f6dc9c7e8083385a"
10+
11+
do_install:append() {
12+
install -d ${D}${sysconfdir}/camera/test/NHX/
13+
14+
cp -r ${S}/etc/camera/test/NHX/*.json ${D}${sysconfdir}/camera/test/NHX/
15+
}
16+
17+
RPROVIDES:${PN} = "camxlib-monaco"
18+
PACKAGE_BEFORE_PN += "camx-nhx"
19+
20+
FILES:camx-nhx = "\
21+
${bindir}/nhx.sh \
22+
${sysconfdir}/camera/test/NHX/ \
23+
"

dynamic-layers/openembedded-layer/recipes-multimedia/camx/camxlib-talos_1.0.1.bb

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
PLATFORM = "talos"
2+
PBT_BUILD_DATE = "260211"
3+
4+
require common.inc
5+
6+
SRC_URI[camxlib.sha256sum] = "772f3f7970db9d639a87d55fd9bac07cb9726866d5eef7b983dcfdd86ec14415"
7+
SRC_URI[camx.sha256sum] = "b860fde72e6a965cc1811afedb164fdb593338325fc80476026d11f9800ebfe9"
8+
SRC_URI[chicdk.sha256sum] = "dd38a3d1599cfe5ef2fa40b5eb00016b03fd9800c919edd7689857193a5d1d7e"
9+
SRC_URI[camxcommon.sha256sum] = "3cdc8717e8778d4f19231067a82e44dddc563f8e05bf058901f0b74784312fa7"
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
SUMMARY = "Protocol Buffers - structured data serialisation mechanism, backport for CamX"
2+
DESCRIPTION = "Protocol Buffers are a way of encoding structured data in an \
3+
efficient yet extensible format. Google uses Protocol Buffers for almost \
4+
all of its internal RPC protocols and file formats. This is the version backported \
5+
for the use inside Qualcomm layer"
6+
7+
BBCLASSEXTEND = "native nativesdk"
8+
9+
# By default just pull in normal protobuf
10+
DEPENDS = "protobuf"
11+
12+
LICENSE = "MIT"
13+
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
14+
15+
PACKAGES += "${PN}-compiler"
16+
ALLOW_EMPTY:${PN}-compiler = "1"
17+
RDEPENDS:${PN}-compiler = "protobuf-compiler"

dynamic-layers/openembedded-layer/recipes-support/protobuf-camx/protobuf-camx/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch

Lines changed: 0 additions & 62 deletions
This file was deleted.

dynamic-layers/openembedded-layer/recipes-support/protobuf-camx/protobuf-camx/0001-fix-protobuf-native-build-failure-with-gcc-10.patch

Lines changed: 0 additions & 46 deletions
This file was deleted.

dynamic-layers/openembedded-layer/recipes-support/protobuf-camx/protobuf-camx/run-ptest

Lines changed: 0 additions & 38 deletions
This file was deleted.

dynamic-layers/openembedded-layer/recipes-support/protobuf-camx/protobuf-camx_6.31.1.bb

Lines changed: 0 additions & 122 deletions
This file was deleted.

0 commit comments

Comments
 (0)