bigsupersquid
o_O
- Feb 19, 2011
- 1,971
- 284
- 0
andyopie150@Dell-OptiPlex-GX620DT:~/android/system$ git branch -va
remotes/upstream/10.1 b0110a2 Permission changes in ICS and Jelly Bean that restrict /dev/diag access to qcom_diag group mitigate CVE-2012-4220 and CVE-2012-4221
remotes/upstream/cm-10.1 bdaa8f5 build a15
remotes/upstream/cm-10.2 d3f33eb Update recovery.fstab
remotes/upstream/froyo 575a932 Xionia v013 with updated LCD driver
remotes/upstream/gb1 b18e7c4 1-16d big rearrangement
remotes/upstream/gb3 b5dd6e5 handset mic with headphones routing fix1
remotes/upstream/gingerbread 4041249 Edited BoardConfig.mk via GitHub
remotes/upstream/ic20 23b9dda revert most
remotes/upstream/ics13 6883362 bt mac fix2, keyboard overlay fix1
remotes/upstream/ics17 834fea9 supercharger tweaks
remotes/upstream/ics18 63cc9ff fix merge
remotes/upstream/ics19 aa64ba8 new audio routing fix from popdog123
remotes/upstream/slimjb 8cdbf9f trying to fix camera
remotes/upstream/tc 89f643e inline with pac
andyopie150@Dell-OptiPlex-GX620DT:~/android/system$ git checkout master
error: pathspec 'master' did not match any file(s) known to git.
andyopie150@Dell-OptiPlex-GX620DT:~/android/system$
You don't need to merge the whole thing just individual projects that you've forked. All the projects you haven't forked will be updated by repo sync. If you want to merge upstream changes in the forked projects go to the base directory for the project and follow the instructions for that project. The base directory will have a file in it called Android.mk. I wouldn't bother with merging TheJBC device files, I don't think they're changing.Well, I did everything according to the link bigsupersquid left and got up to the part about merging.
I get this:
.Code:andyopie150@Dell-OptiPlex-GX620DT:~/android/system$ git branch -va remotes/upstream/10.1 b0110a2 Permission changes in ICS and Jelly Bean that restrict /dev/diag access to qcom_diag group mitigate CVE-2012-4220 and CVE-2012-4221 remotes/upstream/cm-10.1 bdaa8f5 build a15 remotes/upstream/cm-10.2 d3f33eb Update recovery.fstab remotes/upstream/froyo 575a932 Xionia v013 with updated LCD driver remotes/upstream/gb1 b18e7c4 1-16d big rearrangement remotes/upstream/gb3 b5dd6e5 handset mic with headphones routing fix1 remotes/upstream/gingerbread 4041249 Edited BoardConfig.mk via GitHub remotes/upstream/ic20 23b9dda revert most remotes/upstream/ics13 6883362 bt mac fix2, keyboard overlay fix1 remotes/upstream/ics17 834fea9 supercharger tweaks remotes/upstream/ics18 63cc9ff fix merge remotes/upstream/ics19 aa64ba8 new audio routing fix from popdog123 remotes/upstream/slimjb 8cdbf9f trying to fix camera remotes/upstream/tc 89f643e inline with pac andyopie150@Dell-OptiPlex-GX620DT:~/android/system$ git checkout master error: pathspec 'master' did not match any file(s) known to git. andyopie150@Dell-OptiPlex-GX620DT:~/android/system$
Now what?
I'm going to try and summarize this as I understand it, remember I don't know much more about it than you do. You probably know most of this but just to review:So let me get this right, When you make changes to your repo's that I have forked, when I do a repo sync all those changes will be there to use when I make bacon?
Do I even need to clone the fork at all (I hope I don't, they will take a lot of room on hard drive I need for the build).
I have only cloned one repo so far to see if I could do it easy (cloned the kernel repo). I ended up deleting my AndyOpie150 account at Github. I made to many mistakes trying to get your changes incorporated to my forks, thought it would be easier to delete, then start a new account with same name, only different e-mail (that wasn't possible). My new Github user name is just AndyOpie.
A little more info on getting any changes I make to my forks to your master would be helpful. Links will work. There is just so much info out there, all saying something a little different, I could benefit from someone with practical experience on what really works/is needed.
PS: Thanks for all the help so far.
I tried figuring out how to use the Github last year (signed up), but I'm completely lost on it for some reason. Any pointers?
I'd love to help. I have plenty of time.
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<project name="skinbark/android_device_lge_thunderc" path="device/lge/thunderc" remote="github" revision="cm-10.2" />
<project name="skinbark/android_device_lge_msm7x27-common" path="device/lge/msm7x27-common" remote="github" revision="cm-10.2" />
<project name="skinbark/android_device_qcom_msm7x27" path="device/qcom/msm7x27" remote="github" revision="cm-10.2" />
<project name="bigsupersquid/android_kernel_lge_msm7x27-3.0.x" path="kernel/lge/msm7x27-3.0.x" remote="github" revision="squid" />
<project name="skinbark/android_vendor_lge" path="vendor/lge" remote="github" revision="cm-10.2" />
<project name="skinbark/android_external_chromium_org" path="external/chromium/org" remote="github" revision="cm-11.0" />
<project name="skinbark/android_frameworks_base" path="frameworks/base" remote="github" revision="cm-11.0" />
<project name="skinbark/android_frameworks_av" path="frameworks/av" remote="github" revision="cm-11.0" />
<project name="mirror-androidarmv6/android_vendor_qcom_msm7x27" path="vendor/qcom/msm7x27" remote="github" revision="cm-10.2" />
</manifest>
Resolving deltas: 100% (103482/103482), done.
From git://github.com/skinbark/android_external_chromium_org
* [new branch] cm-11.0 -> github/cm-11.0
Fetching projects: 100% (446/446), done.
Deleting obsolete path /home/andyopie150/android/system/external/chromium_org
Checking out files: 100% (45881/45881), done.t files: 8% (4124/45881)
Checking out files: 100% (9597/9597), done.out files: 9% (940/9597)
Checking out files: 100% (4301/4301), done.
Checking out files: 100% (4082/4082), done.out files: 19% (803/4082)
Checking out files: 100% (3352/3352), done.out files: 17% (601/3352)
Syncing work tree: 100% (446/446), done.
frameworks/av/: discarding 75 commits
frameworks/base/: discarding 28 commits
andyopie150@Dell-OptiPlex-GX620DT:~/android/system$
Kit Kat won't flash with an older recovery, at least not without editing the update script, which isn't the right way to install it anyway. The problem's not with the recovery it's because the core android services are crashing and restarting during bootup. I haven't done anything more with the recovery because I've been focussing on trying to get kit kat to boot. I have to learn how to use some debugging tools to get more info on what's going wrong. I also got a bigger hard drive and installed a new os (Linux Mint, nice!) so I've been busy setting up my build system again. Now I'm ready to roll! Good news: hephappy released a kit kat rom for p500 that actually bootsJust downloaded it this week (I think). Been worrying to much about getting everything setup properly that I almost forgot I downloaded it.
Lots of info. Small brain. Hope it all fits. Lol.
skinbark: What recovery's have you tried to use to boot your ROM zip other than trying to port the newest TWRP. I have the BobZohme, the Touch Screen ClockworkMod, Xionia, ZenGarden, and the TWRP ported over by thekraven (Cant find a download link to the COT anywhere). Maybe you could try all of them to see if it might boot?
I added your other repo's (except for the recovery) to the roomservice.xml. Does this look right?
Do I need to take those out of the manifest.xml?Code:<?xml version="1.0" encoding="UTF-8"?> <manifest> <project name="skinbark/android_device_lge_thunderc" path="device/lge/thunderc" remote="github" revision="cm-10.2" /> <project name="skinbark/android_device_lge_msm7x27-common" path="device/lge/msm7x27-common" remote="github" revision="cm-10.2" /> <project name="skinbark/android_device_qcom_msm7x27" path="device/qcom/msm7x27" remote="github" revision="cm-10.2" /> <project name="bigsupersquid/android_kernel_lge_msm7x27-3.0.x" path="kernel/lge/msm7x27-3.0.x" remote="github" revision="squid" /> <project name="skinbark/android_vendor_lge" path="vendor/lge" remote="github" revision="cm-10.2" /> <project name="skinbark/android_external_chromium_org" path="external/chromium/org" remote="github" revision="cm-11.0" /> <project name="skinbark/android_frameworks_base" path="frameworks/base" remote="github" revision="cm-11.0" /> <project name="skinbark/android_frameworks_av" path="frameworks/av" remote="github" revision="cm-11.0" /> <project name="mirror-androidarmv6/android_vendor_qcom_msm7x27" path="vendor/qcom/msm7x27" remote="github" revision="cm-10.2" /> </manifest>
I read that selinux needs enabled in kernel config, not sure if it is already.Kit Kat won't flash with an older recovery, at least not without editing the update script, which isn't the right way to install it anyway. The problem's not with the recovery it's because the core android services are crashing and restarting during bootup. I haven't done anything more with the recovery because I've been focussing on trying to get kit kat to boot. I have to learn how to use some debugging tools to get more info on what's going wrong. I also got a bigger hard drive and installed a new os (Linux Mint, nice!) so I've been busy setting up my build system again. Now I'm ready to roll! Good news: hephappy released a kit kat rom for p500 that actually bootsIt's the first for armv6 that I know of. I'm going to examine it closely and try to replicate what he did for ours. Rather than edit the manifest file I'd add the remove-project statements before the chromium, base and av project statements to override the manifest. Not sure if it's necessary but I'd delete the external/chromium_org, frameworks/av and frameworks/base folders before you run repo sync.
Import includes file: /home/andyopie150/android/system/out/target/product/thunderc/obj/EXECUTABLES/pigz_intermediates/import_includes
make: *** No rule to make target `vendor/cm/proprietary/Term.apk', needed by `/home/andyopie150/android/system/out/target/product/thunderc/system/app/Term.apk'. Stop.
make: *** Waiting for unfinished jobs....
andyopie150@Dell-OptiPlex-GX620DT:~/android/system$
frameworks/av/media/libstagefright/colorconversion/SoftwareRenderer.cpp:30:26: fatal error: gralloc_priv.h: No such file or directory
compilation terminated.
make: *** [/home/andyopie150/android/system/out/target/product/thunderc/obj/STATIC_LIBRARIES/libstagefright_color_conversion_intermediates/SoftwareRenderer.o] Error 1
make: *** Waiting for unfinished jobs....
andyopie150@Dell-OptiPlex-GX620DT:~/android/system$
There's a section in defconfig at about line 2450 called security that has the selinux option. There's more flags that get generated by make config. I just pasted in the whole security section from a working kit kat config file, some Samsung phone I think. I did enable selinux but there may be some other selinux settings besides the kernel flags that come into play. I think there are selinux flags in one or two of the device makefiles. There's something about 'permissive mode' and 'enforcing mode' that I haven't figured out yet. What I'm running into now is a segmentation fault (SIGSEGV) that seems to be related to or caused by one of the adreno200 libraries. Just my luck that the thing that flakes out has to be a closed source driver. There's a tool in the android ndk called ndk-stack that's supposed to let you track down what line of code caused the segfault.I read that selinux needs enabled in kernel config, not sure if it is already.
maybe check that.
// edit: can't find any references to it on a quick scan-thru.
I changed the code in my github. Resync and try it again, it should be fixed.Code:frameworks/av/media/libstagefright/colorconversion/SoftwareRenderer.cpp:30:26: fatal error: gralloc_priv.h: No such file or directory compilation terminated. make: *** [/home/andyopie150/android/system/out/target/product/thunderc/obj/STATIC_LIBRARIES/libstagefright_color_conversion_intermediates/SoftwareRenderer.o] Error 1 make: *** Waiting for unfinished jobs.... andyopie150@Dell-OptiPlex-GX620DT:~/android/system$