980899 - Master and 1.3 hamachi fail to build; unable to patch dom/bluetooth/bluedroid/gonk/BluetoothServiceBluedroid.cpp

Status: RESOLVED FIXED

(Firefox OS Graveyard :: GonkIntegration, defect)

Description

[Kartikaya Gupta (email:[e-mail])]

Trying to build the latest master hamachi, I get a build failure when the build is patching gecko:

Applying: Update callbacks to match bluetooth.h
error: dom/bluetooth/bluedroid/gonk/BluetoothServiceBluedroid.cpp: does not exist in index
Patch failed at 0001 Update callbacks to match bluetooth.h
The copy of the patch that failed is found in:
   /Users/kats/zspace/B2G-master/gecko/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

ERROR: Patching of gecko/ failed.

ERROR: B2G PATCHES FAILED TO APPLY

> Build failed! <


This same issue was reported by Sotaro on the dev-b2g newsgroup [1] and Shawn replied that as a workaround "you can delete the patch locally". I would like to apply this workaround except I don't know where to delete the patch from - can somebody please enlighten me?

Also, we should fix this build failure properly. If the patch isn't needed at all then we should remove it; otherwise the patch needs to be updated to reflect the new path to the file it's patching.

[1] https://groups.google.com/forum/#!topic/mozilla.dev.b2g/k_nGuW6dcUI

Comment 1

[Shawn Huang [:shawnjohnjr][:shuang] (as a happy gecko contributor)]

Patch path is at device/qcom/b2g_common, as the discussion thread mentioned. device/qcom/b2g_common maintained by caf, i inform owner here.

Comment 2

[Shawn Huang [:shawnjohnjr][:shuang] (as a happy gecko contributor)]

Hi Greg,
We saw build-break happened because of this patch. Can you help?
Patch:
https://www.codeaurora.org/cgit/quic/lf/b2g/build/tree/patch/all/gecko/Update-callbacks-to-match-bluetooth.h.patch

The patch failed because recently change (file path changed) in bug 972732.
dom/bluetooth/bluedroid/gonk/BluetoothServiceBluedroid.cpp move to dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp

Comment 3

[Greg Grisco]

Hi Shawn, I already updated the patch.  I think we just have to wait for next push to CAF.

Comment 4

[Shawn Huang [:shawnjohnjr][:shuang] (as a happy gecko contributor)]

When will we see the patch be updated?

Comment 5

[Marco Chen [:mchen]]

Hi Michael,

As I know that we didn't allow patch system in our build tree no matter they came from ours or partners. Right?

Hi Greg,

May I know the reason CAF applied patch into gecko?
All patches should be got rid of from gecko and looks for the solution then contribute back to upstream.

Thanks.

Comment 6

[Greg Grisco]

There were some proprietary changes in bluetooth.h that were made to support android.  These changes break gecko though.  We are working to fix this in bluetooth.h but in the meantime thought it best to have this patch.

Comment 7

[Michael Wu [:mwu]]

(In reply to Marco Chen [:mchen] from comment #5)
> Hi Michael,
> 
> As I know that we didn't allow patch system in our build tree no matter they
> came from ours or partners. Right?
> 

We don't allow it, but it's not enforced through technical measures.

Greg, would it possible for us to get an env variable we can set to disable the patching mechanism?

Comment 8

[David Burns :automatedtester]

What is the workaround for this issue, mwu did mention something on IRC but my scroll back didnt keep it.

Comment 9

[David Burns :automatedtester]

as a workaround I deleted $B2G/devices/qcom/b2g_common/patches/ and was able to get this building again, I dont require bluetooth so happy to do this

Comment 10

[Greg Grisco]

AU_LINUX_GECKO_B2G_KK_3.5.01.04.00.113.041 should have this fix now, could you please try it?

Comment 11

[Hubert Figuiere [:hub]]

It is device/qcom/b2g_common/patch  (not patches) I had to delete.

This break the build. The change should be backed out ASAP.

Comment 12

[Kartikaya Gupta (email:[e-mail])]

This problem is even worse now, because it changes your gecko checkout to the b2g_autogen_ephemeral_branch from whatever you set it to, when you build gecko. I just wasted a whole build+run cycle because of this.

Comment 13

[Kartikaya Gupta (email:[e-mail])]

Attachment: Possible method of disabling vendorsetup

Can we do this?

Comment 14

[Michael Wu [:mwu]]

(In reply to Kartikaya Gupta (email:[e-mail]) from comment #13)
> Created attachment 8395994 [details]
> Possible method of disabling vendorsetup
> 
> Can we do this?

I rather not. Instead, I think we may be able to disable running vendorsetup scripts altogether.

Comment 15

[Kartikaya Gupta (email:[e-mail])]

Should I write a patch to remove the vendorsetup code from envsetup.sh? This thing is still causing broken-by-default builds for hamachi.

Comment 16

[Michael Wu [:mwu]]

Sure, sounds good. I think we can do that for ICS (master branch on platform_build) without any problems.

Comment 17

[Kartikaya Gupta (email:[e-mail])]

Attachment: Stop applying vendor patches

Comment 18

[Ryan VanderMeulen [:RyanVM]]

Master: https://github.com/mozilla-b2g/platform_build/commit/84923f1940625c47ff4c1fdf01b10fde3b7d909e