1051191 - Make Flame FOTA package use source-built update-binary

Status: RESOLVED FIXED

(Firefox OS Graveyard :: GonkIntegration, defect)

Description

[:gerard-majax]

Per bug 1047350, we now can use source-built update-binary than the old prebuilt one.

This would just need declaring TARGET_UPDATE_BINARY in the flame manifest. This can allow us to hack and have more cool things in the FOTA package.

> TARGET_UPDATE_BINARY := $(PRODUCT_OUT)/system/bin/updater

Should do the trick (at least from CLI it does).

Comment 1

[Gabriele Svelto [:gsvelto]]

I'm fully in favor of using the source-built update-binary. It's a no surprise approach since we can control which version of the sources we'll be using and it allows us to ensure that the update scripts we make are always compatible with it.

Comment 2

[Michael Wu [:mwu]]

Not sure what this NI is for. If we have the correct source, we should build it and use it, regardless of whether we intend to modify it or not.

Comment 3

[:gerard-majax]

Attachment: KK Device PR

Comment 4

[Michael Wu [:mwu]]

https://android.googlesource.com/platform/bootable/recovery/+/android-4.4.4_r2.0.1/updater/Android.mk suggests that the updater binary is only included in FOTA packages, so there's no need to add it to the packages list. Instead, we should try to make the $(B2G_FOTA_UPDATE_ZIP) target depend on the updater binary so it is built whenever we're trying to generate a FOTA update zip. This should also get rid of the TARGET_UPDATE_BINARY variable.

Comment 5

[:gerard-majax]

(In reply to Michael Wu [:mwu] from comment #4)
> https://android.googlesource.com/platform/bootable/recovery/+/android-4.4.
> 4_r2.0.1/updater/Android.mk suggests that the updater binary is only
> included in FOTA packages, so there's no need to add it to the packages
> list. Instead, we should try to make the $(B2G_FOTA_UPDATE_ZIP) target
> depend on the updater binary so it is built whenever we're trying to
> generate a FOTA update zip. This should also get rid of the
> TARGET_UPDATE_BINARY variable.

We can do this, indeed, but I don't think we can get rid of this variable: according to bug 1008239 comment 31. From this comment, I understand that we may rely on a prebuilt update-binary that is not in the sources.

Comment 6

[Andreas Pehrson [:pehrsons]]

(In reply to Alexandre LISSY :gerard-majax from comment #5)
> We can do this, indeed, but I don't think we can get rid of this variable:
> according to bug 1008239 comment 31. From this comment, I understand that we
> may rely on a prebuilt update-binary that is not in the sources.

IIRC, we have the sources for the dolphin update-binary (the one referred to in bug 1008239 comment 31) just like for other devices.

Comment 7

[Andreas Pehrson [:pehrsons]]

(In reply to Andreas Pehrson [:pehrsons] (Telenor) from comment #6)
> (In reply to Alexandre LISSY :gerard-majax from comment #5)
> > We can do this, indeed, but I don't think we can get rid of this variable:
> > according to bug 1008239 comment 31. From this comment, I understand that we
> > may rely on a prebuilt update-binary that is not in the sources.
> 
> IIRC, we have the sources for the dolphin update-binary (the one referred to
> in bug 1008239 comment 31) just like for other devices.

I've scanned through the dolphin code and it looks good to go to build from source. There will still be a reference to TARGET_UPDATE_BINARY in the device make files but it shouldn't hurt.

Comment 8

[:gerard-majax]

Attachment: PR for gonk-misc

Comment 9

[:gerard-majax]

Comment on attachment 8547522 [details] [review]
PR for gonk-misc

Addresses michael's comments. Works on Flame KK and on my Nexus S.

Comment 10

[Andreas Pehrson [:pehrsons]]

Works on dolphin after porting the patch to v1.4 (because that's the code I have checked out).

Comment 11

[Gabriele Svelto [:gsvelto]]

Comment on attachment 8547522 [details] [review]
PR for gonk-misc

LGTM, I've quickly tested this on my build and it works fine, I also like that you factored out the common definitions.

Comment 12

[:gerard-majax]

https://github.com/mozilla-b2g/gonk-misc/commit/049c281ad212bf528b2af8fc246b0dd0c9f97415