| *** krnlyng <krnlyng!~liar@178.112.203.35.wireless.dyn.drei.com> has quit IRC (Ping timeout: 260 seconds) | 01:25 | |
| *** krnlyng <krnlyng!~liar@178.112.180.114.wireless.dyn.drei.com> has joined #sfdroid | 01:38 | |
| *** ChanServ sets mode: +o krnlyng | 01:38 | |
| entil | afaik not mismatching sources, but I haven't had time to delve into this, maybe later | 06:44 |
|---|---|---|
| entil | http://paste.debian.net/901358/ pasted it again just to be safe while I start going to work | 06:44 |
| *** rinigus <rinigus!~rinigus@kybi.ioc.ee> has joined #sfdroid | 06:45 | |
| *** nh1402 <nh1402!~nh1402@host81-133-137-69.in-addr.btopenworld.com> has joined #sfdroid | 08:14 | |
| *** CrKit <CrKit!~nekit@85.143.20.2> has joined #sfdroid | 08:24 | |
| *** CrKit <CrKit!~nekit@85.143.20.2> has quit IRC (Ping timeout: 260 seconds) | 08:58 | |
| *** CrKit <CrKit!~nekit@188.162.51.140> has joined #sfdroid | 09:10 | |
| *** CrKit <CrKit!~nekit@188.162.51.140> has quit IRC (Ping timeout: 256 seconds) | 09:33 | |
| *** nh1402 <nh1402!~nh1402@host81-133-137-69.in-addr.btopenworld.com> has quit IRC (Quit: Leaving) | 13:27 | |
| *** rinigus <rinigus!~rinigus@kybi.ioc.ee> has quit IRC (Quit: Leaving) | 14:07 | |
| *** nh1402 <nh1402!~Thunderbi@95.148.89.25> has joined #sfdroid | 14:07 | |
| krnlyng | entil: looks like there is at least one mismatch | 14:17 |
| *** taaem <taaem!~taaem@unaffiliated/taaem> has joined #sfdroid | 16:01 | |
| *** rinigus <rinigus!~rinigus@jyri-gw.levikom.ee> has joined #sfdroid | 16:06 | |
| entil | krnlyng: that's odd, though | 17:06 |
| entil | krnlyng: is it possible the fp2 branch isn't synced up? | 17:06 |
| krnlyng | entil: which branch? | 17:06 |
| entil | fp2-sibon of android_frameworks_av | 17:07 |
| krnlyng | entil: most likely | 17:07 |
| entil | :( | 17:07 |
| krnlyng | entil: it's not too difficult to create your own clean version of tihs | 17:07 |
| entil | krnlyng: clone the android_frameworks_av repository, add another origin and rebase or what? | 17:08 |
| krnlyng | entil: i would just cherry-pick the needed changes, is probably faster | 17:09 |
| entil | krnlyng: I wouldn't be able to recognize them, I think | 17:09 |
| entil | krnlyng: how would I find out? and what's the other origin I would pick from? | 17:09 |
| krnlyng | entil: in the mako_12 branch i only added commits nothing else, so you should be able to pick those, adjust them to fp2 and give it a go | 17:11 |
| krnlyng | only i added* | 17:11 |
| krnlyng | commits with committer krnlyng* | 17:11 |
| entil | git log mako_12 --committer f..@..at gives me one (1) commit | 17:13 |
| krnlyng | in frameworks_av yes | 17:14 |
| entil | but that commit's present in fp2-sibon | 17:14 |
| entil | so it shouldn't be an issue | 17:14 |
| krnlyng | entil: there are probably more commits in the branch you're using | 17:15 |
| krnlyng | oh i think i know what you mean | 17:16 |
| krnlyng | yeah i think fp2-sibon commits can also be used | 17:16 |
| entil | but that's what I'm doing, my build script checks out fp2-sibon of all repositories | 17:16 |
| entil | mjt@ishtar:~/src/git_checkouts/fp2/fairphone_os/frameworks/av ((dcc0df9...))$ git status | 17:18 |
| entil | HEAD detached at FP2/fp2-sibon | 17:18 |
| entil | krnlyng: anyway, if you can give me a clue, or just tell me ;), what the at least one mismatch is, that'd be great | 17:26 |
| entil | because judging by the mako_12/fp2-sibon commits, fp2-sibon would be up to speed | 17:27 |
| krnlyng | entil: you need to update the fp2-sibon branches to the version you're currently using | 17:37 |
| entil | krnlyng: I understood that means getting your commits from mako_12 but they're (it's) already there, right? | 17:40 |
| krnlyng | entil: no | 17:40 |
| krnlyng | entil: the fp2-sibon branches on the sfdroid github are outdated | 17:41 |
| krnlyng | entil: thats your mismatch | 17:41 |
| entil | krnlyng: so what else do I need from mako_12 but your one commit? | 17:41 |
| krnlyng | entil: nothing. you need commits from the official fp2 branches | 17:41 |
| krnlyng | thats why i was trying to tell you | 17:42 |
| krnlyng | check out the official sources | 17:42 |
| entil | krnlyng: ok, then I misunderstood, and need to merge the proper branch from http://code.fairphone.com/gerrit/fp2-dev/platform/frameworks/av | 17:42 |
| krnlyng | cherry-pick the commits | 17:42 |
| krnlyng | or that | 17:42 |
| entil | it merged without conflicts from fairphone/fp2-sibon | 17:45 |
| krnlyng | yup thats likely since we're only chaging main and i don't see a reason for them to change main | 17:46 |
| entil | let's see if my builder realizes that I want to use my local clone as its repo for av | 17:47 |
| entil | and I would imagine that if, or when, the build keeps on failing, I have to sync the repository's fp2-sibon branches | 17:48 |
| entil | just git merge fairphone/fp2-sibon --no-ff | 17:48 |
| *** piggz <piggz!~piggz@195.147.198.68> has joined #sfdroid | 18:49 | |
| entil | krnlyng: it compiled just fine(!) and I got the rpm built(!) and I added include /init.sfdroid.rc(!) (because it was lost in an update) | 19:50 |
| entil | unfortunately after devel-su killall surfaceflinger main servicemanager zygote (zygote: no process found) - it's black :( | 19:50 |
| entil | I'm collecting a ton of logcat now | 19:53 |
| entil | krnlyng: http://mjt.nysv.org/scratch/sailfish/logcat-2016-12-09.01.txt | 20:01 |
| entil | there's some exception stuff happening, signature mismatch for shared user, and stuff like that | 20:02 |
| *** krnlyng|mobile_ <krnlyng|mobile_!~sailfish@213162068208.public.t-mobile.at> has joined #sfdroid | 21:36 | |
| *** krnlyng|mobile_ <krnlyng|mobile_!~sailfish@213162068208.public.t-mobile.at> has quit IRC (Ping timeout: 268 seconds) | 21:41 | |
| *** krnlyng|mobile_ <krnlyng|mobile_!~sailfish@213162068202.public.t-mobile.at> has joined #sfdroid | 22:07 | |
| *** rinigus <rinigus!~rinigus@jyri-gw.levikom.ee> has quit IRC (Quit: Leaving) | 22:18 | |
| *** nh1402 <nh1402!~Thunderbi@95.148.89.25> has quit IRC (Ping timeout: 248 seconds) | 22:42 | |
| *** krnlyng|mobile_ <krnlyng|mobile_!~sailfish@213162068202.public.t-mobile.at> has quit IRC (Ping timeout: 256 seconds) | 22:44 | |
| *** manjaroDeepin <manjaroDeepin!~Manjaro-D@91-113-84-130.adsl.highway.telekom.at> has joined #sfdroid | 22:48 | |
| *** manjaroDeepin <manjaroDeepin!~Manjaro-D@91-113-84-130.adsl.highway.telekom.at> has quit IRC (Client Quit) | 22:49 | |
| *** horuxan <horuxan!~horuxanxx@201.46.181.44> has quit IRC (Ping timeout: 248 seconds) | 23:15 | |
Generated by irclog2html.py 2.17.1 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!