Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe(s) *gst-examples* to *1.28.0* 
has Failed (devtool error).

Detailed error information:

Running 'devtool upgrade' for recipe gst-examples failed.
NOTE: Reconnecting to bitbake server...
Loading cache...done.
Loaded 0 entries from dependency cache.
Parsing recipes...done.
Parsing of 951 .bb files complete (0 cached, 951 parsed). 1957 targets, 47 
skipped, 0 masked, 0 errors.
NOTE: Resolving any missing task queue dependencies

Build Configuration:
BB_VERSION           = "2.16.0"
BUILD_SYS            = "x86_64-linux"
NATIVELSBSTRING      = "universal"
TARGET_SYS           = "x86_64-poky-linux"
MACHINE              = "qemux86-64"
DISTRO               = "poky"
DISTRO_VERSION       = 
"5.3.99+snapshot-80d131b21371622b211634995d274e572d09b66c"
TUNE_FEATURES        = "m64 x86-64-v3"
TARGET_FPU           = ""
meta                 = 
"tmp-auh-upgrades:80d131b21371622b211634995d274e572d09b66c"
meta-yocto-bsp       
meta-poky            = "master:de4abc0a175af12eacc761a2e1e60ca7fdfeaa1b"
workspace            = "<unknown>:<unknown>"

Initialising tasks...NOTE: The /proc/pressure files can't be read. Continuing 
build without monitoring pressure
Sstate summary: Wanted 10 Local 10 Mirrors 0 Missed 0 Current 20 (100% match, 
100% complete)
done.
NOTE: Executing Tasks
NOTE: Tasks Summary: Attempted 103 tasks of which 100 didn't need to be rerun 
and all succeeded.
NOTE: Writing buildhistory
NOTE: Writing buildhistory took: 2 seconds
INFO: Extracting current version source...
INFO: Extracting upgraded version source...
INFO: Rebasing devtool onto 9058212f43074ef7df229e73cea135c4ea96e0d6
WARNING: Command 'git rebase 9058212f43074ef7df229e73cea135c4ea96e0d6' failed:
Auto-merging girs/GES-1.0.gir
Auto-merging girs/Gst-1.0.gir
Auto-merging girs/GstPbutils-1.0.gir
Auto-merging meson.build
CONFLICT (content): Merge conflict in meson.build
Auto-merging subprojects/gst-devtools/meson.build
CONFLICT (content): Merge conflict in subprojects/gst-devtools/meson.build
Auto-merging subprojects/gst-docs/meson.build
CONFLICT (content): Merge conflict in subprojects/gst-docs/meson.build
Auto-merging subprojects/gst-editing-services/meson.build
CONFLICT (content): Merge conflict in 
subprojects/gst-editing-services/meson.build
Auto-merging subprojects/gst-examples/meson.build
CONFLICT (content): Merge conflict in subprojects/gst-examples/meson.build
Auto-merging subprojects/gst-integration-testsuites/meson.build
CONFLICT (content): Merge conflict in 
subprojects/gst-integration-testsuites/meson.build
Auto-merging subprojects/gst-libav/meson.build
CONFLICT (content): Merge conflict in subprojects/gst-libav/meson.build
Auto-merging subprojects/gst-plugins-bad/meson.build
CONFLICT (content): Merge conflict in subprojects/gst-plugins-bad/meson.build
Auto-merging subprojects/gst-plugins-base/meson.build
CONFLICT (content): Merge conflict in subprojects/gst-plugins-base/meson.build
Auto-merging subprojects/gst-plugins-good/meson.build
CONFLICT (content): Merge conflict in subprojects/gst-plugins-good/meson.build
Auto-merging subprojects/gst-plugins-rs.wrap
CONFLICT (content): Merge conflict in subprojects/gst-plugins-rs.wrap
Auto-merging subprojects/gst-plugins-ugly/meson.build
CONFLICT (content): Merge conflict in subprojects/gst-plugins-ugly/meson.build
Auto-merging subprojects/gst-python/meson.build
CONFLICT (content): Merge conflict in subprojects/gst-python/meson.build
Auto-merging subprojects/gst-rtsp-server/meson.build
CONFLICT (content): Merge conflict in subprojects/gst-rtsp-server/meson.build
Auto-merging 
subprojects/gstreamer-sharp/ges/generated/gst-editing-services-api.xml
CONFLICT (content): Merge conflict in 
subprojects/gstreamer-sharp/ges/generated/gst-editing-services-api.xml
Auto-merging subprojects/gstreamer-sharp/meson.build
CONFLICT (content): Merge conflict in subprojects/gstreamer-sharp/meson.build
Auto-merging 
subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs
CONFLICT (content): Merge conflict in 
subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs
Auto-merging subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs
CONFLICT (content): Merge conflict in 
subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs
Auto-merging 
subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml
CONFLICT (content): Merge conflict in 
subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml
CONFLICT (modify/delete): subprojects/gstreamer-vaapi/meson.build deleted in 
HEAD and modified in 50a1f31c47 (Back to development after 1.26.0).  Version 
50a1f31c47 (Back to development after 1.26.0) of 
subprojects/gstreamer-vaapi/meson.build left in tree.
Auto-merging subprojects/gstreamer/meson.build
CONFLICT (content): Merge conflict in subprojects/gstreamer/meson.build

You will need to resolve conflicts in order to complete the upgrade.
INFO: Upgraded source extracted to 
/srv/pokybuild/yocto-worker/auh/build/build/workspace/sources/gst-examples
INFO: New recipe is 
/srv/pokybuild/yocto-worker/auh/build/build/workspace/recipes/gst-examples/gst-examples_1.28.0.bb



Please review the attached files for further information and build/update 
failures.
Any problem please file a bug at 
https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler

Regards,
The Upgrade Helper
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#230316): 
https://lists.openembedded.org/g/openembedded-core/message/230316
Mute This Topic: https://lists.openembedded.org/mt/117576309/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to