1294725 - Fairphone 2 needs special caf repo

Status: RESOLVED FIXED

(Firefox OS Graveyard :: General, defect)

Description

[Novski]

User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:48.0) Gecko/20100101 Firefox/48.0
Build ID: 20160726073904

Steps to reproduce:

I failed to build on new mozilla-b2g repo so i set framework/native to caf repo and applied 2 patches.

in fairphone.xml:
<remove-project name="platform_frameworks_native"/>
<project name="platform/frameworks/native" path="frameworks/native" remote="caf"/>
./repo sync --force-sync frameworks/native

And the addition:
cd frameworks/native && git checkout -b caf_atomic_cpp caf/LA.BF.1.1.1_rb1.18 && curl -L https://github.com/mozilla-b2g/platform_frameworks_native/pull/1.patch | git am && cd ~/B2G
./repo sync

Comment 1

[Jovan Gerodetti]

Please create a pull request.

Comment 2

[Novski]

ah. you were to fast i was just writing that...

Comment 3

[Novski]

https://github.com/novski/b2g-manifest/pull/1/commits/bc72c594a0f73063ef63ab314ef66061dbddd568

Comment 4

[Jovan Gerodetti]

what about those two patches? Can we get them somehow automatically applied?

Comment 5

[:gerard-majax]

(In reply to Novski from comment #0)
> User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:48.0)
> Gecko/20100101 Firefox/48.0
> Build ID: 20160726073904
> 
> Steps to reproduce:
> 
> I failed to build on new mozilla-b2g repo so i set framework/native to caf
> repo and applied 2 patches.
> 
> in fairphone.xml:
> <remove-project name="platform_frameworks_native"/>
> <project name="platform/frameworks/native" path="frameworks/native"
> remote="caf"/>
> ./repo sync --force-sync frameworks/native
> 
> And the addition:
> cd frameworks/native && git checkout -b caf_atomic_cpp
> caf/LA.BF.1.1.1_rb1.18 && curl -L
> https://github.com/mozilla-b2g/platform_frameworks_native/pull/1.patch | git
> am && cd ~/B2G
> ./repo sync

Pushed the branch from caf/LA.BF.1.1.1_rb1.18 as https://github.com/mozilla-b2g/platform_frameworks_native/tree/b2g-fp2, you can do the PR for frameworks/native against it :)

And then don't forget to update the b2g-manifest PR with the proper |revision="b2g-fp2"| field :)

Comment 6

[Novski]

Is this how it will work? Im realy unsure how to manage those lines...
https://github.com/novski/b2g-manifest/pull/1/files#diff-2b14f18cb2ef5626e4cb27dbaf59f6c2

Comment 7

[:gerard-majax]

I don't understand why you are adding the same repo twice. But the "name" field is wrong, since you are pulling from mozilla-b2g, it should be "platform_frameworks_native" and not "platform/frameworks/native"

Comment 8

[Novski]

Hi Gerard
I don't understand why im adding the same repo twice...

Am i not adding the caf and then this (see below) additions whitch you located in a b2g-fp2 repo?
cd frameworks/native && git checkout -b caf_atomic_cpp
caf/LA.BF.1.1.1_rb1.18 && curl -L
https://github.com/mozilla-b2g/platform_frameworks_native/pull/1.patch | git
am && cd ~/B2G
./repo sync


I corrected the name="platform_frameworks_native"

Comment 9

[:gerard-majax]

(In reply to Novski from comment #8)
> Hi Gerard
> I don't understand why im adding the same repo twice...
> 
> Am i not adding the caf and then this (see below) additions whitch you
> located in a b2g-fp2 repo?
> cd frameworks/native && git checkout -b caf_atomic_cpp
> caf/LA.BF.1.1.1_rb1.18 && curl -L
> https://github.com/mozilla-b2g/platform_frameworks_native/pull/1.patch | git
> am && cd ~/B2G
> ./repo sync
> 
> 
> I corrected the name="platform_frameworks_native"

But you still have two lines referencing the same "path". So it will not work. You don't need line 25 at all.

Comment 10

[Novski]

Ok i corrected that. 

But allow me a question. If the caf repo gets an update how do we know now? 
And how do we get that to our buils if we know there is an update available?

Comment 11

[:gerard-majax]

That would be your job to track updates on this repo and rebase accordingly.

Comment 12

[Novski]

ok. And can you tell me where to track and how to rebase?

Comment 13

[:gerard-majax]

(In reply to Novski from comment #12)
> ok. And can you tell me where to track and how to rebase?

Track upstream by git fetch ? And git rebase ... https://git-scm.com/book/en/v2/Git-Branching-Rebasing

Comment 14

[:gerard-majax]

Do not forget to:
 - squash your PR branch into one commit
 - make sure it is "Bug XXX - Description r=gerard-majax"
 - tested

And then please attach the link to the PR (https://github.com/novski/b2g-manifest/pull/1) as a text attachment here on github, and flag me for review. Also tell me if it's good to merge if I give r+ :)

Comment 15

[Novski]

https://github.com/novski/b2g-manifest/pull/2

Comment 16

[:gerard-majax]

That PR looks good, except you need to do it against mozilla-b2g/b2g-manifest:
 - push your branch b2g-fp2-patch-1 to your github account
 - browse https://github.com/novski/b2g-manifest and you should have a link to create the PR
 - select the mozilla-b2g repo as the target of the PR

Then copy the link and paste it as a text attachment on this bug, and set review to me :)

Comment 17

[:gerard-majax]

Click the "new pull request" button when you browse to your clone, that should send you to a link like this: https://github.com/mozilla-b2g/b2g-installer/compare/master...novski:master

On that page, select the proper branch you want to merge (b2g-fp2-patch-1 should be it) and click Create :)

Comment 18

[:gerard-majax]

b2g-manifest, not b2g-installer :/

Comment 19

[:gerard-majax]

(In reply to Alexandre LISSY :gerard-majax from comment #17)
> Click the "new pull request" button when you browse to your clone, that
> should send you to a link like this:
> https://github.com/mozilla-b2g/b2g-installer/compare/master...novski:master
> 
> On that page, select the proper branch you want to merge (b2g-fp2-patch-1
> should be it) and click Create :)

Also, please note that if you just pushed a branch to your fork of b2g-manifest, if you browse to https://github.com/mozilla-b2g/b2g-manifest/ you should have a yellow band with a button on the right that says "Compare & pull request". If you don't see it, just click "New pull request" *from the page of your fork*, and select mozilla/b2g-manifest master in the "base fork" on the left, and your fork and the branch you want to merge in the "head fork" on the right

Comment 20

[Novski]

well i wasn't sure whats the Base and Head because it was named so instead of Source and Target.
Then i somehow closed it but was able to reopen it. And there it is now.
https://github.com/mozilla-b2g/b2g-manifest/pull/452
Buh... :-)

Comment 21

[:gerard-majax]

Sure, don't worry, you are learning how to make PR and attach them on bugzilla. For the next one, though, please do not forget to create a text attachment with the PR link, and set me as a reviewer. A needinfo can slip through more easily and then I forget to look at it :)

Comment 22

[:gerard-majax]

https://github.com/mozilla-b2g/b2g-manifest/commit/4edce96acdc16ac1432ffa4da50905ebd523b4ee

Comment 23

[:gerard-majax]

Thanks for the patch!

Comment 24

[Novski]

added remote="b2g"
https://github.com/mozilla-b2g/b2g-manifest/pull/453
Thanks for merging!

Comment 25

[Novski]

I now tested the fairphone2.xml upon my fork. It works now so a merge can be done...
Thanks for your patient!
Novski

Comment 26

[:gerard-majax]

That looks good, but you have two commits in your PR, please ensure you only have one. Just rebase on top of master.

And please attach your PR link to this bug and flag it review, otherwise I will miss it.

Comment 27

[Novski]

I have no idea about git but it seams to me a bit like a dark hole. 
please here you have a PR with only one commit i hope: 

https://github.com/mozilla-b2g/b2g-manifest/pull/455

also i have no idea what a review flag is.

Comment 28

[:gerard-majax]

(In reply to Novski from comment #27)
> I have no idea about git but it seams to me a bit like a dark hole. 
> please here you have a PR with only one commit i hope: 
> 
> https://github.com/mozilla-b2g/b2g-manifest/pull/455
> 
> also i have no idea what a review flag is.

Current PR is good now. For the link, please click "attach a file", then past the link as text attachment, scroll down and you will see a "review" label just in front of an input that works like needinfo :)

It's really important otherwise I cannot keep track of your requests efficiently :/

Comment 29

[Novski]

Attachment: https://github.com/mozilla-b2g/b2g-manifest/pull/455

I hope this is the right way to request for review? 
Thanks a lot.

Comment 30

[:gerard-majax]

Yes, exactly!

Comment 31

[:gerard-majax]

https://github.com/mozilla-b2g/b2g-manifest/commit/a2a75c601b0511207b81c03ee48bbf01e6f9d520

Comment 32

[:gerard-majax]

b2g-fp2 on frameworks/native never received a PR :/

Comment 33

[Novski]

Attachment: Atomic C++

Atomic C++ was missing see commit
e92af361af5155574c3f05b9544aef194b760aa0
for mor information

Comment 34

[Novski]

hmm im not sure if i made that right i will close it again and try to PR in to 
mozilla-b2g/platform_frameworks_native:b2g-fp2 not master as it is now.

Comment 35

[Novski]

Attachment: Atomic C++ on b2g-fp2 branch

Please excuse the retriggering. I think to make a PR against b2g-fp2 makes more sence as im fetching the branch not the master.

Comment 36

[Novski]

Attachment: Atomic C++ on b2g-fp2 branch cherry-picked by tbz

Ok. It now worked. This smal change took me about 7h work. Increadibul.
In the end its because deleting a repo on my mac only puts it to trash. But in real its still someware in the directory and Git showed weard behavour until i deleted the trashbin... wonderfull. So thank you for pushing me trough and bonne nuit! :-)

Comment 37

[:gerard-majax]

https://github.com/mozilla-b2g/platform_frameworks_native/commit/3632acf6595adc16ab4cefc96a63fb5baedd1ae6

Comment 38

[Novski]

Think we can close this one. Thank you!

Comment 39

[:gerard-majax]

it is closed already :)