1144405 - Copy emulator-x86 binary into emulator-kk-x86 package

Status: RESOLVED FIXED

(Firefox OS Graveyard :: GonkIntegration, defect)

Description

[Hsin-Yi Tsai (she/her) [:hsinyi]]

This is very similar to bug 1137651

When we worked on adding emulator-kk-x86 on task cluster, we get |/emu-kk-x86/b2g-distro/out/host/linux-x86/bin/emulator-x86: No such file or directory
|

We need to have |emulator-x86| in out/emulator.tar.gz

Comment 1

[Hsin-Yi Tsai (she/her) [:hsinyi]]

Anther error I hit was |emulator: ERROR: Invalid or missing kernel image file: ../b2g-distro/prebuilts/qemu-kernel/x86/kernel-qemu|

Seems we need to copy kernel-qemu into archive, too.

Comment 2

[Hsin-Yi Tsai (she/her) [:hsinyi]]

Also, need to archive bios.bin and vgabios-cirrus.bin under |b2g-distro/out/host/linux-x86/bin/|

Comment 3

[Hsin-Yi Tsai (she/her) [:hsinyi]]

Third, add |B2G/prebuilts/qemu-kernel/x86/| into the archive |b2g-distro/prequilts/qemu-kernel/|

This was my attempt for comment 0 without handling comment 1 ~ comment 3.

Comment 4

[Hsin-Yi Tsai (she/her) [:hsinyi]]

(In reply to Hsin-Yi Tsai [:hsinyi] from comment #3)
> Third, add |B2G/prebuilts/qemu-kernel/x86/| into the archive
> |b2g-distro/prequilts/qemu-kernel/|
> 
> This was my attempt for comment 0 without handling comment 1 ~ comment 3.

https://treeherder.allizom.org/#/jobs?repo=try&revision=60a3eba68142

Comment 5

[Hsin-Yi Tsai (she/her) [:hsinyi]]

Hi Seinlin, would you mind taking care of this? Thank you.

Comment 6

[Kai-Zhen Li [:seinlin][:kli]]

OK，I can take this, but I now am working on another bug and I will switch this this bug after that.

Comment 7

[Kai-Zhen Li [:seinlin][:kli]]

Attachment: Copy the missing binary files into archive

Thomas, would you mind review this patch? Thanks!

Comment 8

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Comment on attachment 8583628 [details] [review]
Copy the missing binary files into archive

Thanks you so much for taking care of this bug.

I'd suggest to invert the condition. That way we'd test for older versions of Android and automatically use the most-recent branch on any new version that comes out.

Comment 9

[Kai-Zhen Li [:seinlin][:kli]]

I inverted the condition check and merged into mater:
https://github.com/mozilla-b2g/gonk-misc/commit/2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3

Comment 10

[Kai-Zhen Li [:seinlin][:kli]]

Comment on attachment 8583628 [details] [review]
Copy the missing binary files into archive

This is change in gonk-misc (not gecko/gaia), nominate to land in v2.1 and v2.2.

[Approval Request Comment]
Bug caused by (feature/regressing bug #): none
User impact if declined: can't run emulator-x86
Testing completed: verify on master
Risk to taking this patch (and alternatives if risky): no risk, it adds missing files into archive.
String or UUID changes made by this patch: none

Comment 11

[Ryan VanderMeulen [:RyanVM]]

v2.2: https://github.com/mozilla-b2g/gonk-misc/commit/7d72c6016c45fb49773e7abf45c46e986580d09d
v2.1: https://github.com/mozilla-b2g/gonk-misc/commit/b0b6c145681d253b2d4a69102550cc27fdc04163