Skip to content

Commit 3ee5af1

Browse files
committed
fix: resolve ros-gst-bridge configure error in Mar 2 nightly build
Update the commit id align with Mar 5 meta-qcom nightly build. Fix the ros-gst-bridge do_configure task error. Signed-off-by: Teng Fan <tengf@qti.qualcomm.com>
1 parent 61d0a12 commit 3ee5af1

9 files changed

+238
-62
lines changed

ci/base.yml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
header:
44
version: 14
55

6-
distro: poky-altcfg
6+
distro: nodistro
77

88
defaults:
99
repos:
1010
branch: master
1111

1212
repos:
1313
meta-qcom:
14-
url: "https://github.com/qualcomm-linux/meta-qcom.git"
15-
branch: master
1614

1715
oe-core:
1816
url: https://github.com/openembedded/openembedded-core
@@ -24,27 +22,43 @@ repos:
2422
layers:
2523
.: disabled
2624

27-
meta-yocto:
28-
url: https://git.yoctoproject.org/meta-yocto
29-
layers:
30-
meta-poky:
31-
3225
local_conf_header:
3326
base: |
3427
CONF_VERSION = "2"
3528
INHERIT += "buildstats-summary"
3629
INHERIT += "buildhistory"
3730
INHERIT += "rm_work"
31+
INHERIT += "image-buildinfo"
32+
diskmon: |
33+
BB_DISKMON_DIRS ??= "\
34+
STOPTASKS,${TMPDIR},1G,100K \
35+
STOPTASKS,${DL_DIR},1G,100K \
36+
STOPTASKS,${SSTATE_DIR},1G,100K \
37+
STOPTASKS,/tmp,100M,100K \
38+
HALT,${TMPDIR},100M,1K \
39+
HALT,${DL_DIR},100M,1K \
40+
HALT,${SSTATE_DIR},100M,1K \
41+
HALT,/tmp,10M,1K"
42+
clo-mirrors: |
43+
MIRRORS:append = " \
44+
git://github.com git://git.codelinaro.org/clo/yocto-mirrors/github/ \
45+
git://.*/ git://git.codelinaro.org/clo/yocto-mirrors/ \
46+
https://.*/.*/ https://artifacts.codelinaro.org/codelinaro-le/ \
47+
"
3848
cmdline: |
3949
KERNEL_CMDLINE_EXTRA:append = " qcom_scm.download_mode=1"
4050
qcomflash: |
4151
IMAGE_CLASSES += "image_types_qcom"
4252
IMAGE_FSTYPES += "qcomflash"
4353
extra: |
44-
DISTRO_FEATURES:append = " efi pni-names"
54+
DISTRO_FEATURES:append = " efi pam pni-names"
4555
EXTRA_IMAGE_FEATURES = "allow-empty-password empty-root-password allow-root-login"
4656
IMAGE_ROOTFS_EXTRA_SPACE = "307200"
4757
WATCHDOG_RUNTIME_SEC:pn-systemd = "30"
58+
uninative: |
59+
INHERIT:remove = "uninative"
60+
sstate: |
61+
BB_SIGNATURE_HANDLER = "OEBasicHash"
4862
4963
machine: unset
5064

ci/kas-build.yml

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
header:
2+
version: 14
3+
local_conf_header:
4+
mirror: |-
5+
BB_HASHSERVE_UPSTREAM = "wss://hashserv.yoctoproject.org/ws"
6+
SSTATE_MIRRORS = "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH"
7+
base: |
8+
CONF_VERSION = "2"
9+
INHERIT += "buildstats-summary"
10+
INHERIT += "buildhistory"
11+
INHERIT += "rm_work"
12+
INHERIT += "image-buildinfo"
13+
diskmon: |
14+
BB_DISKMON_DIRS ??= "\
15+
STOPTASKS,${TMPDIR},1G,100K \
16+
STOPTASKS,${DL_DIR},1G,100K \
17+
STOPTASKS,${SSTATE_DIR},1G,100K \
18+
STOPTASKS,/tmp,100M,100K \
19+
HALT,${TMPDIR},100M,1K \
20+
HALT,${DL_DIR},100M,1K \
21+
HALT,${SSTATE_DIR},100M,1K \
22+
HALT,/tmp,10M,1K"
23+
clo-mirrors: |
24+
MIRRORS:append = " \
25+
git://github.com git://git.codelinaro.org/clo/yocto-mirrors/github/ \
26+
git://.*/ git://git.codelinaro.org/clo/yocto-mirrors/ \
27+
https://.*/.*/ https://artifacts.codelinaro.org/codelinaro-le/ \
28+
"
29+
cmdline: |
30+
KERNEL_CMDLINE_EXTRA:append = " qcom_scm.download_mode=1"
31+
qcomflash: |
32+
IMAGE_CLASSES += "image_types_qcom"
33+
IMAGE_FSTYPES += "qcomflash"
34+
extra: |
35+
DISTRO_FEATURES:append = " efi pam pni-names"
36+
EXTRA_IMAGE_FEATURES = "allow-empty-password empty-root-password allow-root-login"
37+
IMAGE_ROOTFS_EXTRA_SPACE = "307200"
38+
WATCHDOG_RUNTIME_SEC:pn-systemd = "30"
39+
uninative: |
40+
INHERIT:remove = "uninative"
41+
sstate: |
42+
BB_SIGNATURE_HANDLER = "OEBasicHash"
43+
virtualization: SKIP_META_VIRT_SANITY_CHECK = "1"
44+
resource_limitation: |
45+
# Disable the libcamera recipe to avoid conflicts with the meta-qcom-distro libcamera recipe
46+
BBMASK .= "|^${TOPDIR}/meta-ros/meta-ros-common/recipes-multimedia/libcamera/.*"
47+
PREFERRED_VERSION_libcamera = "1:0.6.0"
48+
49+
# Capture the count of cpu cores available from the host.
50+
CPU_COUNT = "${@oe.utils.cpu_count(at_least=2)}"
51+
52+
# Number of parallel threads make can run based on cpu cores with a max cap at 20.
53+
THREAD_COUNT = "${@oe.utils.cpu_count(at_least=2, at_most=12)}"
54+
55+
# Determines how many tasks bitbake should run in parallel.
56+
BB_NUMBER_THREADS ?= "${CPU_COUNT}"
57+
58+
# Determines how many tasks bitbake should run in parallel during parsing.
59+
BB_NUMBER_PARSE_THREADS ?= "${CPU_COUNT}"
60+
61+
# Specifies a maximum CPU pressure threshold for bitbake scheduler to start new tasks.
62+
BB_PRESSURE_MAX_CPU = "900000"
63+
64+
# Specifies a maximum IO pressure threshold for bitbake scheduler to start new tasks.
65+
BB_PRESSURE_MAX_IO = "900000"
66+
67+
# Specifies a maximum Memory pressure threshold for bitbake scheduler to start new tasks.
68+
BB_PRESSURE_MAX_MEMORY = "900000"
69+
70+
# Determines how many processes make should run in parallel when running compile tasks.
71+
PARALLEL_MAKE ?= "-j ${THREAD_COUNT} -l ${THREAD_COUNT}"
72+
distro: qcom-robotics-distro-sota
73+
defaults:
74+
repos:
75+
branch: master
76+
repos:
77+
meta-qcom:
78+
url: https://github.com/qualcomm-linux/meta-qcom.git
79+
branch: master
80+
commit: 1a7b6b0363fa75232d46ffb9fd706b9539872e10
81+
oe-core:
82+
url: https://github.com/openembedded/openembedded-core
83+
layers:
84+
meta:
85+
patches:
86+
fix-BSD-license-missing:
87+
repo: meta-qcom-robotics-sdk
88+
path: patches/Initial-commit-of-license.patch
89+
commit: be8cdcf13a658e9e81ff2f7b71d1c8c37a920ce7
90+
bitbake:
91+
url: https://github.com/openembedded/bitbake
92+
layers:
93+
.: disabled
94+
commit: bc8be83aef0a6de85cd33a6f132f281d518594f7
95+
meta-qcom-distro:
96+
url: https://github.com/qualcomm-linux/meta-qcom-distro
97+
branch: main
98+
commit: 1fcd08e4830ac0d1d3936ee2c15ff0d0af1790ee
99+
meta-openembedded:
100+
url: https://github.com/openembedded/meta-openembedded
101+
layers:
102+
meta-filesystems:
103+
meta-gnome:
104+
meta-multimedia:
105+
meta-networking:
106+
meta-oe:
107+
meta-python:
108+
meta-xfce:
109+
commit: 6ba45c1f94e1c2015df940ec9efcd4568346df56
110+
meta-virtualization:
111+
url: https://git.yoctoproject.org/git/meta-virtualization
112+
branch: master
113+
commit: 506d5af230f0b41809dfe754e84d5611b75c6585
114+
meta-audioreach:
115+
url: https://github.com/AudioReach/meta-audioreach
116+
branch: master
117+
commit: 1079902cfa001b6f9c447f8a9bec84cdd2be10b0
118+
meta-selinux:
119+
branch: master
120+
url: https://git.yoctoproject.org/meta-selinux
121+
commit: 27758bca5ad8f74f387de5cc7c88e73ef2aed951
122+
meta-updater:
123+
branch: master
124+
url: https://github.com/uptane/meta-updater
125+
commit: 9fb4d7e2c087511d3dff233ebd342f35facf4cde
126+
meta-security:
127+
url: https://git.yoctoproject.org/meta-security
128+
branch: master
129+
layers:
130+
.:
131+
meta-tpm:
132+
commit: 9e6d962250aab6e5319215f15b0201ef233c46cd
133+
meta-qcom-robotics-sdk:
134+
135+
meta-yocto:
136+
url: https://git.yoctoproject.org/meta-yocto
137+
layers:
138+
meta-poky:
139+
commit: 4c156ef673f8ff7c967b2b34dd1d366e1b74d41c
140+
meta-ros:
141+
url: https://github.com/ros/meta-ros.git
142+
branch: master
143+
layers:
144+
meta-ros-common:
145+
meta-ros2:
146+
meta-ros2-jazzy:
147+
patches:
148+
qcom-fixes1:
149+
repo: meta-qcom-robotics-sdk
150+
path: patches/0001-jazzy-remove-outdated-bbappend-and-patches-of-stomp.patch
151+
qcom-fixes2:
152+
repo: meta-qcom-robotics-sdk
153+
path: patches/0002-jazzy-update-libdir-of-ompl.patch
154+
qcom-fixes3:
155+
repo: meta-qcom-robotics-sdk
156+
path: patches/0003-jazzy-move-some-nav2-and-moveit-packages-out-of-blac.patch
157+
commit: fceba46917fe9473e64534d972d3cf853aa7674d
158+
machine: iq-9075-evk
159+
target: qcom-robotics-proprietary-image

ci/qcom-distro.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ repos:
3737
branch: master
3838
url: https://github.com/uptane/meta-updater
3939

40+
meta-security:
41+
url: https://git.yoctoproject.org/meta-security
42+
branch: master
43+
layers:
44+
.:
45+
meta-tpm:
46+
4047
local_conf_header:
4148
virtualization:
4249
SKIP_META_VIRT_SANITY_CHECK = "1"

ci/qcom-robotics-distro.yml

Lines changed: 22 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ repos:
99
meta-qcom-robotics-sdk:
1010

1111
meta-qcom:
12-
url: https://github.com/qualcomm-linux/meta-qcom.git
13-
branch: master
14-
commit: 5c1e91fcbb9bb2149c89e395acc8e19869d43a8a
12+
url: https://github.com/qualcomm-linux/meta-qcom
13+
commit: 3b2c2c8b815e135a01db7b6a77e3a0c57048bca8
1514
oe-core:
1615
url: https://github.com/openembedded/openembedded-core
1716
layers:
@@ -20,21 +19,16 @@ repos:
2019
fix-BSD-license-missing:
2120
repo: meta-qcom-robotics-sdk
2221
path: patches/Initial-commit-of-license.patch
23-
commit: 4c31a7b410fc9c14815c6853431c7bd56c0e173c
22+
commit: d3e757f21403554e7064c5fa2b353080d14d2ce7
2423
bitbake:
2524
url: https://github.com/openembedded/bitbake
2625
layers:
2726
.: disabled
28-
commit: cdd79c1768ac396a9c6577e38098da4331507f24
29-
meta-yocto:
30-
url: https://git.yoctoproject.org/meta-yocto
31-
layers:
32-
meta-poky:
33-
commit: de4abc0a175af12eacc761a2e1e60ca7fdfeaa1b
27+
commit: 48efc36b4e03f736e7521d269ced3417522784e9
3428
meta-qcom-distro:
3529
url: https://github.com/qualcomm-linux/meta-qcom-distro
3630
branch: main
37-
commit: 9754815d7eeb95e68db943dbae342496a586f53f
31+
commit: 98e83ead3caa95184d2a37e02b4b6928caa754a4
3832
meta-openembedded:
3933
url: https://github.com/openembedded/meta-openembedded
4034
layers:
@@ -45,23 +39,30 @@ repos:
4539
meta-oe:
4640
meta-python:
4741
meta-xfce:
48-
commit: dfd6cf901aa530eb924ed62ad2498f8abf43fed2
42+
commit: 7bc5268662f1428bdbca08e14d223aa6b62e87f3
4943
meta-virtualization:
5044
url: https://git.yoctoproject.org/git/meta-virtualization
5145
branch: master
52-
commit: 28d26fd95397bf575e65fcca0cbb302b1e9bc7ff
46+
commit: a1e1a021b49f5257d8908aa9b8c2ee9c083e674c
5347
meta-audioreach:
5448
url: https://github.com/AudioReach/meta-audioreach
5549
branch: master
56-
commit: f864c62336a771b05b6d1e03a1092ddd286f4038
50+
commit: 7cd6eeb2c6bfda35a622df9a37eb5bbf0371253e
5751
meta-selinux:
5852
branch: master
5953
url: https://git.yoctoproject.org/meta-selinux
60-
commit: d670531ad7e6cd0dac08010fbd9b604501391245
54+
commit: 27758bca5ad8f74f387de5cc7c88e73ef2aed951
6155
meta-updater:
6256
branch: master
6357
url: https://github.com/uptane/meta-updater
64-
commit: 1e9ec9b9c10bd16c018bf5440ed6ffc56789dab0
58+
commit: 9fb4d7e2c087511d3dff233ebd342f35facf4cde
59+
meta-security:
60+
url: https://git.yoctoproject.org/meta-security
61+
branch: master
62+
layers:
63+
.:
64+
meta-tpm:
65+
commit: 9e6d962250aab6e5319215f15b0201ef233c46cd
6566

6667
meta-ros:
6768
url: https://github.com/ros/meta-ros.git
@@ -83,16 +84,7 @@ repos:
8384
commit: fceba46917fe9473e64534d972d3cf853aa7674d
8485

8586
local_conf_header:
86-
base: |
87-
CONF_VERSION = "2"
88-
INHERIT += "buildstats-summary"
89-
INHERIT += "buildhistory"
90-
INHERIT += "rm_work"
91-
92-
# Disable the libcamera recipe to avoid conflicts with the meta-qcom-distro libcamera recipe
93-
BBMASK .= "|^${TOPDIR}/meta-ros/meta-ros-common/recipes-multimedia/libcamera/.*"
94-
PREFERRED_VERSION_libcamera = "1:0.6.0"
95-
87+
resource_limitation: |
9688
# Capture the count of cpu cores available from the host.
9789
CPU_COUNT = "${@oe.utils.cpu_count(at_least=2)}"
9890
@@ -116,19 +108,10 @@ local_conf_header:
116108
117109
# Determines how many processes make should run in parallel when running compile tasks.
118110
PARALLEL_MAKE ?= "-j ${THREAD_COUNT} -l ${THREAD_COUNT}"
119-
120-
cmdline: |
121-
KERNEL_CMDLINE_EXTRA:append = " qcom_scm.download_mode=1"
122-
qcomflash: |
123-
IMAGE_CLASSES += "image_types_qcom"
124-
IMAGE_FSTYPES += "qcomflash"
125-
extra: |
126-
DISTRO_FEATURES:append = " efi pni-names"
127-
EXTRA_IMAGE_FEATURES = "allow-empty-password empty-root-password allow-root-login"
128-
IMAGE_ROOTFS_EXTRA_SPACE = "307200"
129-
WATCHDOG_RUNTIME_SEC:pn-systemd = "30"
130-
robotics_base: |
131-
PATCHRESOLVE = "noop"
111+
libcamera_mask: |
112+
# Disable the libcamera recipe to avoid conflicts with the meta-qcom-distro libcamera recipe
113+
BBMASK .= "|^${TOPDIR}/meta-ros/meta-ros-common/recipes-multimedia/libcamera/.*"
114+
PREFERRED_VERSION_libcamera = "1:0.6.0"
132115
133116
distro: qcom-robotics-ros2-jazzy
134117
target: qcom-robotics-image

recipes/ros-gst-bridge/ros-gst-bridge-audio-msgs_0.0.0.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ ROS_TEST_DEPENDS = " \
4040

4141
DEPENDS = "${ROS_BUILD_DEPENDS} ${ROS_BUILDTOOL_DEPENDS}"
4242

43-
EXTRA_OECMAKE += "-DSYSROOT_LIBDIR=${STAGING_LIBDIR}"
44-
EXTRA_OECMAKE += "-DGST_PLUGINS_QTI_OSS_INSTALL_LIBDIR=${libdir}"
43+
# EXTRA_OECMAKE += "-DSYSROOT_LIBDIR=${STAGING_LIBDIR}"
44+
# EXTRA_OECMAKE += "-DGST_PLUGINS_QTI_OSS_INSTALL_LIBDIR=${libdir}"
4545

4646
FILES:${PN} += "${libdir}"
4747

recipes/ros-gst-bridge/ros-gst-bridge-msgs_0.0.0.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ ROS_TEST_DEPENDS = " \
4040

4141
DEPENDS = "${ROS_BUILD_DEPENDS} ${ROS_BUILDTOOL_DEPENDS}"
4242

43-
EXTRA_OECMAKE += "-DSYSROOT_LIBDIR=${STAGING_LIBDIR}"
44-
EXTRA_OECMAKE += "-DGST_PLUGINS_QTI_OSS_INSTALL_LIBDIR=${libdir}"
43+
# EXTRA_OECMAKE += "-DSYSROOT_LIBDIR=${STAGING_LIBDIR}"
44+
# EXTRA_OECMAKE += "-DGST_PLUGINS_QTI_OSS_INSTALL_LIBDIR=${libdir}"
4545

4646
FILES:${PN} += "${libdir}"
4747

0 commit comments

Comments
 (0)