Closed
Bug 910662
Opened 11 years ago
Closed 11 years ago
B2G Leo device image builds broken with "error: patch failed: include/hardware/hwcomposer.h:169" during application of B2G patches to android source
Categories
(Firefox OS Graveyard :: GonkIntegration, defect)
Tracking
(Not tracked)
RESOLVED
FIXED
People
(Reporter: emorley, Assigned: mwu)
References
Details
(Keywords: smoketest)
Yey more unhelpful B2G breakage!
b2g_mozilla-central_leo_dep on 2013-08-29 02:47:47 PDT for push 0e1efad50b9f
slave: bld-linux64-ec2-339
https://tbpl.mozilla.org/php/getParsedLog.php?id=27164591&tree=Mozilla-Central
{
03:05:38 INFO - Running command: ['mock_mozilla', '-r', u'mozilla-centos6-i386', '-q', '--cwd', '/builds/slave/b2g_m-cen_leo_dep-000000000000/build', '--unpriv', '--shell', u'/usr/bin/env VARIANT=user GAIA_OPTIMIZE=1 "LESSOPEN=|/usr/bin/lesspipe.sh %s" LOGNAME=cltbld USER=cltbld PATH=/usr/local/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/cltbld/bin:/builds/slave/b2g_m-cen_leo_dep-000000000000/build/compare-locales/scripts SYMBOL_SERVER_USER=b2gbld "WGET_OPTS=-c -q" CCACHE_UMASK=002 LANG=en_US.UTF-8 CCACHE_HASHDIR= TERM=linux SHELL=/bin/bash MOZ_BUILD_DATE=20130829024729 SHLVL=1 G_BROKEN_FILENAMES=1 HISTSIZE=1000 SYMBOL_SERVER_PATH=/mnt/netapp/breakpad/symbols_b2g/ LOCALES_FILE=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gaia/locales/languages_dev.json SYMBOL_SERVER_HOST=symbolpush.mozilla.org PYTHONPATH=:/builds/slave/b2g_m-cen_leo_dep-000000000000/build/compare-locales/lib L10NBASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gecko-l10n MOZILLA_OFFICIAL=1 "MOZ_CHROME_MULTILOCALE=es-ES pl pt-BR" CCACHE_DIR=/builds/ccache CCACHE_COMPRESS=1 _=/tools/buildbot/bin/python CCACHE_BASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build B2GUPDATER=1 HOSTNAME=bld-linux64-ec2-339.build.releng.usw2.mozilla.com SYMBOL_SERVER_SSH_KEY=/home/mock_mozilla/.ssh/b2gbld_dsa LOCALE_BASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gaia-l10n HISTCONTROL=ignoredups POST_SYMBOL_UPLOAD_CMD=/usr/local/bin/post-symbol-upload.py PWD=/builds/slave/b2g_m-cen_leo_dep-000000000000 PROPERTIES_FILE=/builds/slave/b2g_m-cen_leo_dep-000000000000/buildprops.json MAIL=/var/spool/mail/cltbld B2G_UPDATE_CHANNEL=leo/1.2.0/default ./build.sh'] in /builds/slave/b2g_m-cen_leo_dep-000000000000/build
03:05:38 INFO - Copy/paste: mock_mozilla -r mozilla-centos6-i386 -q --cwd /builds/slave/b2g_m-cen_leo_dep-000000000000/build --unpriv --shell "/usr/bin/env VARIANT=user GAIA_OPTIMIZE=1 \"LESSOPEN=|/usr/bin/lesspipe.sh %s\" LOGNAME=cltbld USER=cltbld PATH=/usr/local/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/cltbld/bin:/builds/slave/b2g_m-cen_leo_dep-000000000000/build/compare-locales/scripts SYMBOL_SERVER_USER=b2gbld \"WGET_OPTS=-c -q\" CCACHE_UMASK=002 LANG=en_US.UTF-8 CCACHE_HASHDIR= TERM=linux SHELL=/bin/bash MOZ_BUILD_DATE=20130829024729 SHLVL=1 G_BROKEN_FILENAMES=1 HISTSIZE=1000 SYMBOL_SERVER_PATH=/mnt/netapp/breakpad/symbols_b2g/ LOCALES_FILE=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gaia/locales/languages_dev.json SYMBOL_SERVER_HOST=symbolpush.mozilla.org PYTHONPATH=:/builds/slave/b2g_m-cen_leo_dep-000000000000/build/compare-locales/lib L10NBASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gecko-l10n MOZILLA_OFFICIAL=1 \"MOZ_CHROME_MULTILOCALE=es-ES pl pt-BR\" CCACHE_DIR=/builds/ccache CCACHE_COMPRESS=1 _=/tools/buildbot/bin/python CCACHE_BASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build B2GUPDATER=1 HOSTNAME=bld-linux64-ec2-339.build.releng.usw2.mozilla.com SYMBOL_SERVER_SSH_KEY=/home/mock_mozilla/.ssh/b2gbld_dsa LOCALE_BASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gaia-l10n HISTCONTROL=ignoredups POST_SYMBOL_UPLOAD_CMD=/usr/local/bin/post-symbol-upload.py PWD=/builds/slave/b2g_m-cen_leo_dep-000000000000 PROPERTIES_FILE=/builds/slave/b2g_m-cen_leo_dep-000000000000/buildprops.json MAIL=/var/spool/mail/cltbld B2G_UPDATE_CHANNEL=leo/1.2.0/default ./build.sh"
03:05:42 INFO - ============================================
03:05:42 INFO - PLATFORM_VERSION_CODENAME=AOSP
03:05:42 INFO - PLATFORM_VERSION=4.0.4.0.4.0.4
03:05:42 INFO - TARGET_PRODUCT=full_leo
03:05:42 INFO - TARGET_BUILD_VARIANT=user
03:05:42 INFO - TARGET_BUILD_TYPE=release
03:05:42 INFO - TARGET_BUILD_APPS=
03:05:42 INFO - TARGET_ARCH=arm
03:05:42 INFO - TARGET_ARCH_VARIANT=armv7-a-neon
03:05:42 INFO - HOST_ARCH=x86
03:05:42 INFO - HOST_OS=linux
03:05:42 INFO - HOST_OS_EXTRA=Linux-2.6.32-220.el6.x86_64-i686-with-centos-6.2-Final
03:05:42 INFO - HOST_BUILD_TYPE=release
03:05:42 INFO - BUILD_ID=OPENMASTER
03:05:42 INFO - OUT_DIR=out
03:05:42 INFO - ============================================
03:05:42 INFO - >> Android tree IDs: b2g/ics_strawberry b2g/ics_strawberry-leo ics ics-leo all all-leo
03:05:42 INFO - >> Analyzing workspace for change...Change detected. Applying B2G patches.
03:05:43 INFO - error: no project has branch b2g_autogen_ephemeral_branch
03:05:43 INFO - [entering external/bluetooth/bluez]
03:05:44 INFO - patches/all-leo/external/bluetooth/bluez/0001-Remove-OPP-L2cap-SDP-record.patch
03:05:44 INFO - [entering frameworks/base]
03:05:45 INFO - patches/all-leo/frameworks/base/0001-Bug-871018-handle-OMX_StatePause-state-in-OMXNodeIns.patch
03:05:45 INFO - patches/all-leo/frameworks/base/0001-Don-t-let-OMXCodec-undequeue-any-buffers.patch
03:05:45 INFO - patches/all-leo/frameworks/base/OMXCodec-stop-now-waits-for-all-buffers-to-return.patch
03:05:45 INFO - patches/all-leo/frameworks/base/surfaceflinger_remove_layer_alpha.patch
03:05:45 INFO - [entering hardware/libhardware]
03:05:46 INFO - patches/all-leo/hardware/libhardware/hwc_header_remove_layer_alpha.patch
03:05:46 INFO - error: patch failed: include/hardware/hwcomposer.h:169
03:05:46 INFO - error: include/hardware/hwcomposer.h: patch does not apply
03:05:46 INFO - ERROR: Patching of hardware/libhardware/ failed.
03:05:46 INFO -
03:05:46 INFO - > Build failed! <
03:05:46 INFO - Build with |./build.sh -j1| for better messages
03:05:46 INFO - If all else fails, use |rm -rf objdir-gecko| to clobber gecko and |rm -rf out| to clobber everything else.
03:05:46 ERROR - Return code: 1
03:05:46 INFO - Running command: ['mock_mozilla', '-r', u'mozilla-centos6-i386', '-q', '--cwd', '/builds/slave/b2g_m-cen_leo_dep-000000000000/build', '--unpriv', '--shell', u'/usr/bin/env VARIANT=user GAIA_OPTIMIZE=1 "LESSOPEN=|/usr/bin/lesspipe.sh %s" LOGNAME=cltbld USER=cltbld PATH=/usr/local/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/cltbld/bin:/builds/slave/b2g_m-cen_leo_dep-000000000000/build/compare-locales/scripts SYMBOL_SERVER_USER=b2gbld "WGET_OPTS=-c -q" CCACHE_UMASK=002 LANG=en_US.UTF-8 CCACHE_HASHDIR= TERM=linux SHELL=/bin/bash MOZ_BUILD_DATE=20130829024729 SHLVL=1 G_BROKEN_FILENAMES=1 HISTSIZE=1000 SYMBOL_SERVER_PATH=/mnt/netapp/breakpad/symbols_b2g/ LOCALES_FILE=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gaia/locales/languages_dev.json SYMBOL_SERVER_HOST=symbolpush.mozilla.org PYTHONPATH=:/builds/slave/b2g_m-cen_leo_dep-000000000000/build/compare-locales/lib L10NBASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gecko-l10n MOZILLA_OFFICIAL=1 "MOZ_CHROME_MULTILOCALE=es-ES pl pt-BR" CCACHE_DIR=/builds/ccache CCACHE_COMPRESS=1 _=/tools/buildbot/bin/python CCACHE_BASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build B2GUPDATER=1 HOSTNAME=bld-linux64-ec2-339.build.releng.usw2.mozilla.com SYMBOL_SERVER_SSH_KEY=/home/mock_mozilla/.ssh/b2gbld_dsa LOCALE_BASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gaia-l10n HISTCONTROL=ignoredups POST_SYMBOL_UPLOAD_CMD=/usr/local/bin/post-symbol-upload.py PWD=/builds/slave/b2g_m-cen_leo_dep-000000000000 PROPERTIES_FILE=/builds/slave/b2g_m-cen_leo_dep-000000000000/buildprops.json MAIL=/var/spool/mail/cltbld B2G_UPDATE_CHANNEL=leo/1.2.0/default ccache -s'] in /builds/slave/b2g_m-cen_leo_dep-000000000000/build
03:05:46 INFO - Copy/paste: mock_mozilla -r mozilla-centos6-i386 -q --cwd /builds/slave/b2g_m-cen_leo_dep-000000000000/build --unpriv --shell "/usr/bin/env VARIANT=user GAIA_OPTIMIZE=1 \"LESSOPEN=|/usr/bin/lesspipe.sh %s\" LOGNAME=cltbld USER=cltbld PATH=/usr/local/bin:/usr/lib64/ccache:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/cltbld/bin:/builds/slave/b2g_m-cen_leo_dep-000000000000/build/compare-locales/scripts SYMBOL_SERVER_USER=b2gbld \"WGET_OPTS=-c -q\" CCACHE_UMASK=002 LANG=en_US.UTF-8 CCACHE_HASHDIR= TERM=linux SHELL=/bin/bash MOZ_BUILD_DATE=20130829024729 SHLVL=1 G_BROKEN_FILENAMES=1 HISTSIZE=1000 SYMBOL_SERVER_PATH=/mnt/netapp/breakpad/symbols_b2g/ LOCALES_FILE=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gaia/locales/languages_dev.json SYMBOL_SERVER_HOST=symbolpush.mozilla.org PYTHONPATH=:/builds/slave/b2g_m-cen_leo_dep-000000000000/build/compare-locales/lib L10NBASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gecko-l10n MOZILLA_OFFICIAL=1 \"MOZ_CHROME_MULTILOCALE=es-ES pl pt-BR\" CCACHE_DIR=/builds/ccache CCACHE_COMPRESS=1 _=/tools/buildbot/bin/python CCACHE_BASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build B2GUPDATER=1 HOSTNAME=bld-linux64-ec2-339.build.releng.usw2.mozilla.com SYMBOL_SERVER_SSH_KEY=/home/mock_mozilla/.ssh/b2gbld_dsa LOCALE_BASEDIR=/builds/slave/b2g_m-cen_leo_dep-000000000000/build/gaia-l10n HISTCONTROL=ignoredups POST_SYMBOL_UPLOAD_CMD=/usr/local/bin/post-symbol-upload.py PWD=/builds/slave/b2g_m-cen_leo_dep-000000000000 PROPERTIES_FILE=/builds/slave/b2g_m-cen_leo_dep-000000000000/buildprops.json MAIL=/var/spool/mail/cltbld B2G_UPDATE_CHANNEL=leo/1.2.0/default ccache -s"
03:05:46 INFO - cache directory /builds/ccache
03:05:46 INFO - cache hit (direct) 0
03:05:46 INFO - cache hit (preprocessed) 0
03:05:46 INFO - cache miss 0
03:05:46 INFO - files in cache 231933
03:05:46 INFO - cache size 9.1 Gbytes
03:05:46 INFO - max cache size 10.0 Gbytes
03:05:46 INFO - Return code: 0
03:05:46 FATAL - failed to build
03:05:46 FATAL - Running post_fatal callback...
03:05:46 FATAL - Exiting 2
program finished with exit code 2
elapsedTime=1075.774711
========= Finished 'scripts/scripts/b2g_build.py --target ...' failed (results: 2, elapsed: 17 mins, 56 secs) (at 2013-08-29 03:05:46.862420) =========
}
Note that the "error: no project has branch b2g_autogen_ephemeral_branch" error is present in a green run too, eg:
https://tbpl.mozilla.org/php/getParsedLog.php?id=27152574&full=1&branch=mozilla-central
{
20:21:36 INFO - >> Android tree IDs: b2g/ics_strawberry b2g/ics_strawberry-leo ics ics-leo all all-leo
20:21:36 INFO - >> Analyzing workspace for change...Change detected. Applying B2G patches.
20:21:36 INFO - error: no project has branch b2g_autogen_ephemeral_branch
20:21:36 INFO - [entering external/bluetooth/bluez]
20:21:37 INFO - patches/all-leo/external/bluetooth/bluez/0001-Remove-OPP-L2cap-SDP-record.patch
20:21:37 INFO - [entering frameworks/base]
20:21:47 INFO - patches/all-leo/frameworks/base/0001-Bug-871018-handle-OMX_StatePause-state-in-OMXNodeIns.patch
20:21:48 INFO - patches/all-leo/frameworks/base/0001-Don-t-let-OMXCodec-undequeue-any-buffers.patch
20:21:48 INFO - patches/all-leo/frameworks/base/OMXCodec-stop-now-waits-for-all-buffers-to-return.patch
20:21:48 INFO - patches/all-leo/frameworks/base/surfaceflinger_remove_layer_alpha.patch
20:21:48 INFO - [entering hardware/libhardware]
20:21:49 INFO - patches/all-leo/hardware/libhardware/hwc_header_remove_layer_alpha.patch
20:21:49 INFO - [entering hardware/msm7k]
20:21:49 INFO - patches/all-leo/hardware/msm7k/OMX_Deinit-symbol-fix.patch
20:21:49 INFO - [entering hardware/qcom/display]
20:21:50 INFO - patches/all-leo/hardware/qcom/display/display-add-fillcolor.patch
20:21:50 INFO - patches/all-leo/hardware/qcom/display/gpu-free-when-alloc-fails.patch
20:21:50 INFO - patches/all-leo/hardware/qcom/display/hwc_impl_remove_layer_alpha.patch
20:21:50 INFO - patches/all-leo/hardware/qcom/display/no-rgb565-dither.patch
20:21:50 INFO - patches/all-leo/hardware/qcom/display/preserve-framebuffer-contents-on-initialization.patch
20:21:50 INFO - patches/all-leo/hardware/qcom/display/remap-copybit-formats.patch
20:21:50 INFO - [entering hardware/qcom/media]
20:21:50 INFO - patches/all-leo/hardware/qcom/media/OMX_Deinit-symbol-fix.patch
20:21:50 INFO - [entering kernel]
20:22:08 INFO - patches/all-leo/kernel/kernel-add-fillcolor.patch
20:22:12 INFO - [entering system/core]
20:22:12 INFO - patches/all-leo/system/core/Revert-msm7627a-Change-adj-level-and-min_free_kbytes.patch
20:22:12 INFO - patches/all-leo/system/core/system-core.patch
20:22:12 INFO - [entering system/vold]
20:22:13 INFO - patches/all-leo/system/vold/Remove-g-rx-from-sdcard.patch
20:22:13 INFO - B2G patches applied.
}
Reporter | ||
Comment 1•11 years ago
|
||
--- good.manifest 2013-08-29 11:31:48 +0100
+++ bad.manifest 2013-08-29 11:31:38 +0100
@@ -14 +14 @@
- <project name="gaia.git" path="gaia" remote="mozillaorg" revision="eabc797948d3d46952f894463daeaff8db49c7a2"/>
+ <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2103069858e9d34d127760319fd66b42ef6f7237"/>
@@ -81,3 +81,3 @@
- <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="93226241c35eea5ae139c8370a6d8ad837c8106e"/>
- <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="f197f55362dea6b9fc338a4f6d89bc009900f41f"/>
- <project name="platform/hardware/ril" path="hardware/ril" revision="7dc9ff3e8de3fbf36fa89bf2909959a0070fc75d"/>
+ <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="34c1545405fad9fd42d1e7f8aa0b997e8d139604"/>
+ <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="7126cc3c0562c3896985992219bb721e62be5235"/>
+ <project name="platform/hardware/ril" path="hardware/ril" revision="e87ab9c733e68add3382e7a5fd39345dd0e1ded0"/>
@@ -88 +88 @@
- <project name="platform/system/core" path="system/core" revision="e4e910457913d521e1773e059a94891bde2cfeeb"/>
+ <project name="platform/system/core" path="system/core" revision="4dd2e5b530c6bfcf49fb8663ca85a5b5813cd7a5"/>
@@ -92 +92 @@
- <project name="platform/system/vold" path="system/vold" revision="3f87f19bf8bdf3a7cb3c01ef2b2c5810633e78ef"/>
+ <project name="platform/system/vold" path="system/vold" revision="e0a370cb5189a627f0331b8d13ea744f6208e402"/>
@@ -97,4 +97,4 @@
- <project name="kernel/msm" path="kernel" revision="b786b805b5d3f8ece3485a3f8ab8db4c3bd49f39"/>
- <project name="platform/hardware/qcom/camera" path="hardware/qcom/camera" revision="c4e3e6cf938f1bdde78bc39f38350f72b6fc3a21"/>
- <project name="platform/hardware/qcom/display" path="hardware/qcom/display" revision="32905dde6a66296c7e5843e9664c5c6444deb38c"/>
- <project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="b2ac43193f3d3a44171bdb50ea3c2aeb558511d3"/>
+ <project name="kernel/msm" path="kernel" revision="0573d033f69d77ecafe1856e6eee57e2dcee9a03"/>
+ <project name="platform/hardware/qcom/camera" path="hardware/qcom/camera" revision="cc61f23313f4e385eea0577a7531e1e6b3dbdbdb"/>
+ <project name="platform/hardware/qcom/display" path="hardware/qcom/display" revision="1be398e89121c5e543dc177a6f9d7ca738d3aa04"/>
+ <project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="d178e27a9e73bf84eb3c5fe6facf6e16ab83a154"/>
@@ -102 +102 @@
- <project name="platform/hardware/msm7k" path="hardware/msm7k" revision="669815aaca47afee95b4a95908dc87bff267a815"/>
+ <project name="platform/hardware/msm7k" path="hardware/msm7k" revision="226ef57b55e7ddd305acbc68899c2b41b2544223"/>
Reporter | ||
Updated•11 years ago
|
Depends on: b2g-sheriffing
Reporter | ||
Comment 2•11 years ago
|
||
From b2g-inbound...
Good: (well broken but for something later in the build)
https://tbpl.mozilla.org/php/getParsedLog.php?id=27164148&tree=B2g-Inbound
Bad:
https://tbpl.mozilla.org/php/getParsedLog.php?id=27163885&tree=B2g-Inbound
Diff:
--- good-2.manifest 2013-08-29 12:34:57 +0100
+++ bad-2.manifest 2013-08-29 12:33:39 +0100
@@ -81,3 +81,3 @@
- <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="93226241c35eea5ae139c8370a6d8ad837c8106e"/>
- <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="f197f55362dea6b9fc338a4f6d89bc009900f41f"/>
- <project name="platform/hardware/ril" path="hardware/ril" revision="7dc9ff3e8de3fbf36fa89bf2909959a0070fc75d"/>
+ <project name="platform/hardware/libhardware" path="hardware/libhardware" revision="34c1545405fad9fd42d1e7f8aa0b997e8d139604"/>
+ <project name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="7126cc3c0562c3896985992219bb721e62be5235"/>
+ <project name="platform/hardware/ril" path="hardware/ril" revision="e87ab9c733e68add3382e7a5fd39345dd0e1ded0"/>
@@ -88 +88 @@
- <project name="platform/system/core" path="system/core" revision="e4e910457913d521e1773e059a94891bde2cfeeb"/>
+ <project name="platform/system/core" path="system/core" revision="4dd2e5b530c6bfcf49fb8663ca85a5b5813cd7a5"/>
@@ -92 +92 @@
- <project name="platform/system/vold" path="system/vold" revision="3f87f19bf8bdf3a7cb3c01ef2b2c5810633e78ef"/>
+ <project name="platform/system/vold" path="system/vold" revision="e0a370cb5189a627f0331b8d13ea744f6208e402"/>
@@ -98 +98 @@
- <project name="platform/hardware/qcom/camera" path="hardware/qcom/camera" revision="c4e3e6cf938f1bdde78bc39f38350f72b6fc3a21"/>
+ <project name="platform/hardware/qcom/camera" path="hardware/qcom/camera" revision="cc61f23313f4e385eea0577a7531e1e6b3dbdbdb"/>
@@ -100 +100 @@
- <project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="b2ac43193f3d3a44171bdb50ea3c2aeb558511d3"/>
+ <project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="d178e27a9e73bf84eb3c5fe6facf6e16ab83a154"/>
@@ -102 +102 @@
- <project name="platform/hardware/msm7k" path="hardware/msm7k" revision="669815aaca47afee95b4a95908dc87bff267a815"/>
+ <project name="platform/hardware/msm7k" path="hardware/msm7k" revision="226ef57b55e7ddd305acbc68899c2b41b2544223"/>
Reporter | ||
Comment 3•11 years ago
|
||
Jonathan, where are the repos listed in comment 2 found? I can't find them under the mozilla-b2g account :-(
Flags: needinfo?(jgriffin)
Reporter | ||
Comment 4•11 years ago
|
||
Note I'm copying the manifest xml from the log, I can't find the actual file, since it's not in the build/log directory linked from TBPL.
Reporter | ||
Comment 5•11 years ago
|
||
(In reply to Ed Morley [:edmorley UTC+1] from comment #3)
> Jonathan, where are the repos listed in comment 2 found? I can't find them
> under the mozilla-b2g account :-(
Ok found them on https://git.mozilla.org/ but the main web view says "changed in last 9 hours" etc but when looking a the shortlog, in many there have been no changes in the last few years. I'm utterly confused?!
Reporter | ||
Comment 6•11 years ago
|
||
(In reply to Ed Morley [:edmorley UTC+1] from comment #4)
> Note I'm copying the manifest xml from the log, I can't find the actual
> file, since it's not in the build/log directory linked from TBPL.
Filed bug 910676 for getting sources.xml somewhere accessible.
Reporter | ||
Comment 7•11 years ago
|
||
(In reply to Ed Morley [:edmorley UTC+1] from comment #5)
> Ok found them on https://git.mozilla.org/ but the main web view says
> "changed in last 9 hours" etc but when looking a the shortlog, in many there
> have been no changes in the last few years. I'm utterly confused?!
Huh the git web view doesn't show the changes in the main view because they were on another head... I was presuming it would have shown them inline like hgweb, but obviously not.
eg:
https://git.mozilla.org/?p=external/caf/platform/hardware/libhardware.git;a=summary
https://git.mozilla.org/?p=external/caf/platform/hardware/libhardware.git;a=shortlog;h=refs/heads/b2g/ics_strawberry
Reporter | ||
Comment 8•11 years ago
|
||
Ok, seems like this commit is to blame:
https://git.mozilla.org/?p=external/caf/platform/hardware/libhardware.git;a=commitdiff;h=34c1545405fad9fd42d1e7f8aa0b997e8d139604
But no bug number and committed by a bot... *facepalm*
Reporter | ||
Comment 9•11 years ago
|
||
Ok at this point I can't do any more:
1) I don't know what github repo the commit in comment 8 came from, or even if I have access to it to revert it.
2) I don't know why the bot makes those commits, who owns the bot, who made the original commit or what bug number the change was reviewed/discussed.
This leaves three options:
1) Close all trees (or at least mozilla-central and b2g-inbound, since they are the only ones that run the Leo builds).
2) Hide the Leo jobs for now.
3) Star all the failures with this bug on every push to mozilla-central and b2g-inbound and basically ignore the builds anyway.
None of the options are pretty, but I'm leaning towards #2.
Reporter | ||
Comment 10•11 years ago
|
||
(In reply to Ed Morley [:edmorley UTC+1] from comment #9)
> 1) I don't know what github repo the commit in comment 8 came from
Filed bug 910689.
> 2) I don't know why the bot makes those commits, who owns the bot, who made
> the original commit or what bug number the change was reviewed/discussed.
Filed bug 910685.
Reporter | ||
Comment 11•11 years ago
|
||
This is also now broken on b2g18:
https://tbpl.mozilla.org/php/getParsedLog.php?id=27167346&tree=Mozilla-B2g18
Comment 12•11 years ago
|
||
ochameau is this something that you, as a build peer, that you can help?
Flags: needinfo?(poirot.alex)
Reporter | ||
Updated•11 years ago
|
Reporter | ||
Comment 13•11 years ago
|
||
B2G Leo device image builds have been hidden on mozilla-central, b2g-inbound & mozilla-b2g18 (we don't run them on any other trunk trees for some reason) due to comment 9.
In the meantime see them at:
https://tbpl.mozilla.org/?showall=1&jobname=_leo
Once this bug is resolved fixed, bug 910725 will take care of unhiding.
Flags: needinfo?(mwu)
Comment 14•11 years ago
|
||
(In reply to David Burns :automatedtester from comment #12)
> ochameau is this something that you, as a build peer, that you can help?
This issue is related to gonk/android issue, that is out of my scope which is _gaia_ build system. I think :mwu will be able to help or find someone to do so.
Flags: needinfo?(poirot.alex)
Comment 15•11 years ago
|
||
All of the "caf" repos are hosted at git://codeaurora.org/; I doubt you have the ability to back anything out of those. :m4 is a good contact for those repos if you need help with them.
Flags: needinfo?(jgriffin)
Comment 16•11 years ago
|
||
FYI, the best way to tell where various repos originally come from is to look at the files in https://github.com/mozilla-b2g/b2g-manifest.
I agree, though, that this is pretty awkward for sheriffing.
Assignee | ||
Comment 17•11 years ago
|
||
What's going here is that the patch that failed to apply landed upstream, so we have to remove our patch. Unfortunately, we don't have a separate branch for 1.1 patches, so removing the patch here will affect both master and 1.1.
Flags: needinfo?(mwu)
Assignee | ||
Comment 18•11 years ago
|
||
Offending patch removed:
https://github.com/mozilla-b2g/gonk-patches/commit/d7c987c29396e57bd7f00f9bd31fab48d895beef
Status: NEW → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Comment 19•11 years ago
|
||
Still busted.
https://tbpl.mozilla.org/php/getParsedLog.php?id=27189695&tree=Mozilla-B2g18
12:50:29 INFO - >> Android tree IDs: b2g/ics_strawberry b2g/ics_strawberry-leo ics ics-leo all all-leo
12:50:29 INFO - >> Analyzing workspace for change...Change detected. Applying B2G patches.
12:50:30 INFO - error: no project has branch b2g_autogen_ephemeral_branch
12:50:30 INFO - [entering external/bluetooth/bluez]
12:50:30 INFO - patches/all-leo/external/bluetooth/bluez/0001-Remove-OPP-L2cap-SDP-record.patch
12:50:30 INFO - [entering frameworks/base]
12:50:32 INFO - patches/all-leo/frameworks/base/0001-Bug-871018-handle-OMX_StatePause-state-in-OMXNodeIns.patch
12:50:33 INFO - patches/all-leo/frameworks/base/0001-Don-t-let-OMXCodec-undequeue-any-buffers.patch
12:50:33 INFO - patches/all-leo/frameworks/base/OMXCodec-stop-now-waits-for-all-buffers-to-return.patch
12:50:33 INFO - patches/all-leo/frameworks/base/surfaceflinger_remove_layer_alpha.patch
12:50:33 INFO - [entering hardware/msm7k]
12:50:33 INFO - patches/all-leo/hardware/msm7k/OMX_Deinit-symbol-fix.patch
12:50:33 INFO - error: patch failed: libstagefrighthw/QComOMXPlugin.cpp:37
12:50:33 INFO - error: libstagefrighthw/QComOMXPlugin.cpp: patch does not apply
12:50:33 INFO - ERROR: Patching of hardware/msm7k/ failed.
12:50:33 INFO -
12:50:33 INFO - > Build failed! <
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Assignee | ||
Comment 20•11 years ago
|
||
Turns out a bunch of patches got merged. I removed everything that got merged.
https://github.com/mozilla-b2g/gonk-patches/commit/1e772e18aa4c58b431911cd9926f9ab885402b09
Status: REOPENED → RESOLVED
Closed: 11 years ago → 11 years ago
Resolution: --- → FIXED
Comment 22•11 years ago
|
||
(In reply to Michael Wu [:mwu] from comment #18)
> Offending patch removed:
>
> https://github.com/mozilla-b2g/gonk-patches/commit/
> d7c987c29396e57bd7f00f9bd31fab48d895beef
Hi Michael:
The branch "b2g/ics_strawberry_v1" used by hamachi still needs this patch to remove alpha layer. Here're what we can do for now:
1) Add back the patch in gonk-patches
2) Modify hamachi.xml to use b2g/ics_strawberry
3) Apply patch to b2g/ics_strawberry_v1
Since I am not familiar with the policy of each branch/repo, please kindly advise me. Thanks.
You need to log in
before you can comment on or make changes to this bug.
Description
•