[Q] uploading changes to gerrit - One (M7) Q&A, Help & Troubleshooting

Hi,
I have changed a file and I wanted to upload it to gerrit for review.
I've never done that before. I followed this guide http://wiki.cyanogenmod.org/w/Doc:_using_gerrit
I have set up everything on my side and on review.cyanogenmod.org
when I do "repo upload" I get
Code:
[email protected]:~/m7ul# repo upload
Upload project frameworks/base to remote branch refs/heads/cm-11.0:
branch patch-1 ( 1 commit, Mon Dec 30 11:39:12 2013 +0000):
47614ef1 my changes
to review.cyanogenmod.org (y/N)? y
Uncommitted changes in CyanogenMod/frameworks/base (did you forget to amend?). Continue uploading? (y/N) y
Permission denied (publickey).
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
----------------------------------------------------------------------
[FAILED] frameworks/base/ patch-1 (Upload failed)
What am I doing wrong?

Related

Building AOSP Gingerbread for Droid

(I would post this in the developer forum, but I don't have 10 posts)
I'm working on building Gingerbread from AOSP for Droid. I was hoping to gather information here on how to do this should someone want to build a rom in the future.
So far, I've followed the steps at http://source.android.com/source/download.html to fetch android-2.3.3_r1 (FWIW, I'm running OS X). For the droid, I also needed to clone these git repositories (mostly CM7 fixes) into the associated folder:
https://github.com/koush/proprietary_vendor_motorola - into vendor/motorola. When running git clone, be sure to add "-b gingerbread" to get the latest version. These are the binary blobs that one would normally get by running extract-files.sh.
https://github.com/CyanogenMod/android_device_motorola_sholes - into device/motorola/sholes. This is Droid-specific device information.
https://github.com/CyanogenMod/android_system_wlan_ti - into system/wlan/ti. This is the wifi driver.
https://github.com/CyanogenMod/android_hardware_ti_omap3 - into hardware/ti/omap3. These are other hardware drivers.
https://github.com/CyanogenMod/android_hardware_libhardware_legacy - into hardware/libhardware_legacy. More hardware libraries.
Additional fixes needed to complete build:
In device/motorola/sholes/overlay/frameworks/base/core/res/res/values/config.xml, comment out the line containing "config_flashlight_affects_lightsensor". This is part of CM7 code which disables the light sensor when the flashlight is on; an alternative fix would be to port this code into your tree.
Perform the two fixes at the bottom of the OP in http://forum.xda-developers.com/showthread.php?t=899674 - RGB_565 and Camera. Camera is definitely necessary for building - I believe the RGB_565 fix is necessary for Live Wallpapers.
Take the changes from https://github.com/CyanogenMod/andr...mmit/29f40ea86fe96f66b5a22c7a2bb84055c73e99be - this will prevent Launcher from crashing on boot. Thanks to PeterAlfonso for this fix!
Once the source tree is set up as described, you can run:
Code:
source build/envsetup.sh
lunch (select generic_sholes-userdebug)
make -j 4 otapackage
to start building Android, which will take a while depending on the speed of your machine.
This will create a file named out/target/product/sholes/generic_sholes-ota-eng.*username*.zip - this can be applied as an update.zip in the usual fashion. However, it contains the stock recovery files, which will overwrite the recovery partition you have. So, using any program which can modify zip files, delete the recovery/ folder.
At this point, you should have a flashable, Gingerbread, AOSP rom for droid!
Peter Alfonso (author of a great stock rooted Gingerbread rom for Droid) pointed out a fix for the launcher issues I was having, and I've updated the OP to reflect this. Compiling the changes now - hopefully the rom will boot, and this will represent a full set of instructions for compiling a vanilla gingerbread Droid rom!
I'm trying to compile it, but I'm getting this error:
Code:
Nathan-Camposs-MacBook-Pro:AOSP Nathan$ lunch generic_sholes-userdebug
sed: illegal option -- r
usage: sed script [-Ealn] [-i extension] [file ...]
sed [-Ealn] [-i extension] [-e script] ... [-f script_file] ... [file ...]
build/core/product_config.mk:194: *** _nic.PRODUCTS.[[device/motorola/sholes/sholes.mk]]: "build/target/product/small_base.mk" does not exist. Stop.
** Don't have a product spec for: 'generic_sholes'
** Do you have the right repo manifest?
Nathan-Camposs-MacBook-Pro:AOSP Nathan$
Could you help me?

[DEV][PATCH] HALO for CM 10.1

This information is purely for devs wanting to add HALO to their CM 10.1 based ROM so they don't have to deal with the same merge conflicts from ParanoidAndroid that I've taken care of. There's nothing here you can flash, etc.
This isn't specific to the Optimus 4X HD, but I'm just posting it here because it's the only place I know.
Workflow might be something like:
Code:
$ repo sync
$ cd frameworks/base
$ git tag cm-head
$ git checkout f90658c55fbf7b21a80b5f75b1760839484278fd # Merge "framework: Update German translation" into cm-10.1
$ git apply ../../halo-for-cm-framework-base-d76f23efbc101e14d3423b8dd0645d64f7425555-for-f90658c55fbf7b21a80b5f75b1760839484278fd.patch # HALO: new drawables for hdpi and mdpi
$ git commit -m 'Add HALO'
$ git tag halo
$ git checkout cm-head
$ git merge -m 'Merge HALO' halo # There might be trivial merge conflicts here
$ git tag -d cm-head
$ git tag -d halo
There's also changes to the Settings app, but those are trivial.
arararagi said:
This information is purely for devs wanting to add HALO to their CM 10.1 based ROM so they don't have to deal with the same merge conflicts from ParanoidAndroid that I've taken care of. There's nothing here you can flash, etc.
This isn't specific to the Optimus 4X HD, but I'm just posting it here because it's the only place I know.
Workflow might be something like:
Code:
$ repo sync
$ cd frameworks/base
$ git tag cm-head
$ git checkout f90658c55fbf7b21a80b5f75b1760839484278fd # Merge "framework: Update German translation" into cm-10.1
$ git apply ../../halo-for-cm-framework-base-d76f23efbc101e14d3423b8dd0645d64f7425555-for-f90658c55fbf7b21a80b5f75b1760839484278fd.patch # HALO: new drawables for hdpi and mdpi
$ git commit -m 'Add HALO'
$ git tag halo
$ git checkout cm-head
$ git merge -m 'Merge HALO' halo # There might be trivial merge conflicts here
$ git tag -d cm-head
$ git tag -d halo
There's also changes to the Settings app, but those are trivial.
Click to expand...
Click to collapse
Great I have also tried to figure out the magic...good work :thumbsup:
best regards SnXo
How hard would it be to implement this into existing CM10 nightlies?
we're waiting for a port or even better a flashable zip!
good work guys!
juanacevedo said:
How hard would it be to implement this into existing CM10 nightlies?
Click to expand...
Click to collapse
you can't just implement it into a compiled rom. this is source code only
in MokeeOS its fully functional implemented
thaaaank you, working on a little miui project, this could make it more fun
leris2 said:
we're waiting for a port or even better a flashable zip!
good work guys!
Click to expand...
Click to collapse
There's already one: http://forum.xda-developers.com/showthread.php?t=2253129
you easily cherry-pick both merges by choosing the parent carefully and build
arararagi said:
This information is purely for devs wanting to add HALO to their CM 10.1 based ROM so they don't have to deal with the same merge conflicts from ParanoidAndroid that I've taken care of. There's nothing here you can flash, etc.
This isn't specific to the Optimus 4X HD, but I'm just posting it here because it's the only place I know.
Workflow might be something like:
Code:
$ repo sync
$ cd frameworks/base
$ git tag cm-head
$ git checkout f90658c55fbf7b21a80b5f75b1760839484278fd # Merge "framework: Update German translation" into cm-10.1
$ git apply ../../halo-for-cm-framework-base-d76f23efbc101e14d3423b8dd0645d64f7425555-for-f90658c55fbf7b21a80b5f75b1760839484278fd.patch # HALO: new drawables for hdpi and mdpi
$ git commit -m 'Add HALO'
$ git tag halo
$ git checkout cm-head
$ git merge -m 'Merge HALO' halo # There might be trivial merge conflicts here
$ git tag -d cm-head
$ git tag -d halo
There's also changes to the Settings app, but those are trivial.
Click to expand...
Click to collapse
Hey! Im just building my CM10.1 from source, but I have not a big idea of patching. Will this give me a working HALO?
Also I would need the HDPI drawables I guess :/ https://github.com/tonyp/android_frameworks_base/commit/d76f23efbc101e14d3423b8dd0645d64f7425555
I dont want to test it blindly, as I don't know how to revert patches.
I'm not using an Optimus 4. Im on Sony Xperia Ray and there is no HALO ROM till now :/
Thanks for your help!
This patch includes that commit. To revert, git reset --hard
arararagi said:
This patch includes that commit. To revert, git reset --hard
Click to expand...
Click to collapse
Thank you!
Sadly the patch did not work for me :/
Code:
target Java: apache-xml (/media/tim/Cyanogenmod/CM10.1/android/system/out/target/common/obj/JAVA_LIBRARIES/apache-xml_intermediates/classes)
frameworks/base/packages/SystemUI/res/layout/halo_bubble.xml:13: error: Error: No resource found that matches the given name (at 'src' with value '@drawable/halo_bg').
frameworks/base/packages/SystemUI/res/layout/halo_number.xml:8: error: Error: No resource found that matches the given name (at 'background' with value '@drawable/halo_number').
frameworks/base/packages/SystemUI/res/layout/halo_speech.xml:17: error: Error: No resource found that matches the given name (at 'background' with value '@drawable/bubble_black_r').
frameworks/base/packages/SystemUI/res/layout/halo_speech.xml:31: error: Error: No resource found that matches the given name (at 'background' with value '@drawable/bubble_black_l').
frameworks/base/packages/SystemUI/res/layout/status_bar_expanded_header.xml:77: error: Error: No resource found that matches the given name (at 'src' with value '@drawable/ic_notify_halo_normal').
make: *** [/media/tim/Cyanogenmod/CM10.1/android/system/out/target/common/obj/APPS/SystemUI_intermediates/src/R.stamp] Fehler 1
make: *** Warte auf noch nicht beendete Prozesse...
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
Looks like all drawables are missing :/
And was is actually about updates for HALO?
Sadly paranoid androids Gerrit is not working. How can I track their changes? And how can I cherry pick like from the review.cyanogenmod.com?
Thanks for your help
The drawables are definitely in the patch. Did you get any messages when you applied the patch?
arararagi said:
This information is purely for devs wanting to add HALO to their CM 10.1 based ROM so they don't have to deal with the same merge conflicts from ParanoidAndroid that I've taken care of. There's nothing here you can flash, etc.
This isn't specific to the Optimus 4X HD, but I'm just posting it here because it's the only place I know.
Workflow might be something like:
Code:
$ repo sync
$ cd frameworks/base
$ git tag cm-head
$ git checkout f90658c55fbf7b21a80b5f75b1760839484278fd # Merge "framework: Update German translation" into cm-10.1
$ git apply ../../halo-for-cm-framework-base-d76f23efbc101e14d3423b8dd0645d64f7425555-for-f90658c55fbf7b21a80b5f75b1760839484278fd.patch # HALO: new drawables for hdpi and mdpi
$ git commit -m 'Add HALO'
$ git tag halo
$ git checkout cm-head
$ git merge -m 'Merge HALO' halo # There might be trivial merge conflicts here
$ git tag -d cm-head
$ git tag -d halo
There's also changes to the Settings app, but those are trivial.
Click to expand...
Click to collapse
I have a question
If I want to embed it on another rom as BAKED, is the same procedure? Or there are some differences?
franzyroy said:
I have a question
If I want to embed it on another rom as BAKED, is the same procedure? Or there are some differences?
Click to expand...
Click to collapse
You can cherry pick the commits from paranoid androids github. Just during the merge choose the right parent.
Yes this methods should work on all ROMs .
Sent from my Nexus 7 using Tapatalk 4 Beta
Red Devil said:
You can cherry pick the commits from paranoid androids github. Just during the merge choose the right parent.
Yes this methods should work on all ROMs .
Sent from my Nexus 7 using Tapatalk 4 Beta
Click to expand...
Click to collapse
OK Thanks!
arararagi said:
There's also changes to the Settings app, but those are trivial.
Click to expand...
Click to collapse
You say the changes are trivial... but maybe this will be interesting to know them! Because in the Settings app, it's to set your settings, style those of Halo. You don't think?
Red Devil said:
You can cherry pick the commits from paranoid androids github. Just during the merge choose the right parent.
Yes this methods should work on all ROMs .
Sent from my Nexus 7 using Tapatalk 4 Beta
Click to expand...
Click to collapse
Where is the cherry pick please?
there are 2 commits.. one of them in frameworks/base and one in settings..
search for them
they are labelled as " HALO(1/2) and HALO(2/2)
Red Devil said:
there are 2 commits.. one of them in frameworks/base and one in settings..
search for them
they are labelled as " HALO(1/2) and HALO(2/2)
Click to expand...
Click to collapse
I already saw before but I have no experience how to add these commits ... can you explain me how add them?

[GUIDE]Git tuts drive me nuts -a Roofer's guide to GIT

For all the things you can do in Android
somewhere someone has made a great definitive guide
that will help to both guide you
and provide a basic understanding of the steps involved
assuring you of success in your android tweaking endeavour.
This is not one of those guides.
I'm going to do my best to articulate my
dysfunctional
and admitted retardation
of an understanding of git.
I'll provide some links to guides I have found
so you can check them out and hopefully get a better grasp than I.
When you do, post your tips and tricks here..
I will add links to any posts with tips tricks or guides so you get your proper credit.
(if your into that sorta thing)
This guide is in no particular order and
is subject to random mistakes and inaccuracies.
I will be putting all git commands in red
If it's in red you can assume you just type that and hit enter.​
What is Git?
Git is a tool used to manage projects housed on github and/or locally on your machine. For a greater understanding and comprehensive guide try gitready.com
Cloning
The simplest of things to do with git. Same steps to clone any repository be it your own or one from another github.
git clone <URL of your repository on github> -b <branch> (name of repo)
Example:
Code:
[COLOR="Red"]git clone [email protected]:jamieg71/kernel.git -b master msm8960
[/COLOR]
This tells it what to clone, denotes the branch with -b in this case branch
name is 'master' and finally (name of repo) tells git what you wish for your
cloned repository to be named in this case 'msm8960'.
Making commits & Pushing
Let's say you want to make a couple changes to an app and then push those changes back to github,
we'll use ROMControl for an example.
Navigate to root of ROMControl directory.
First do
repo start ska43 .
Here use the name of the branch you are on, for SofaKingAndroid 4.3 it's "ska43",
also include the dot [space dot] "." at the end of the command.
If instead of working within the rom source in /packages/apps/ you
instead had cloned ROMControl to it's own seperate folder, this is not necessary.
Some helpful commands-
gitk a helpful GUI for git
git status
This will give you an update of what branch you are on and what if any changes have been made.
git log
Will give you a commit history with change ID's commit messages authors time stamps etc,
it can be very handy when looking for specific commits to cherry-pick or revert. This should
show the complete history of a given project with all contributions along the way. To exit this
quickly hit the "q" key.
git reflog
This will give you a short history of your local cloned repository listing each seperate head
Click to expand...
Click to collapse
Once you've made your changes, (and built to be sure everything works as planned....)
git status Just for a reference of what you've done, it will also show any files with a "~" in case your like me and occasionally screw up
To stage changes before committing you have multiple options-
git add .
This will add ALL changed files, sometimes it's handy but if you have done several unrelated
things it can be nice to have them in separate commits with their own commit messages and ID's
git add -a
Same as above
git add (directory/name of file) Example: git add src/com/aokp/romcontrol/AOKPActivity.java
The easiest way to do this, for me, is to just c/p the names of modified files
from the list after running git status
Click to expand...
Click to collapse
Now to commit-
git commit -m 'your message here' Put a brief description of what your commit involves
To Push-
git push <URL of your repository on github>
Example:
Code:
[COLOR="Red"]git push [email protected]:SofaKingAndroid/packages_apps_ROMControl.git[/COLOR]
Fetching Upstream Changes
What if you had forked a project and been working on it for awhile, and you notice there where changes to the original source. Now you need to pull in upstream changes. To do this let's clone our fork to it's own folder on our machine-
We will assume you work in ~/android/ and know how to mkdir upstrm4krnl && cd upstrm4krnl
git clone <URL of your repository on github> -b <branch> (name of repo)
Example:
Code:
[COLOR="Red"]git clone [email protected]:jamieg71/kernel.git -b master msm8960[/COLOR]
This tells it what to clone, denotes the branch with -b in this case branch
name is 'master' and finally (name of repo) tells git what you wish for your
cloned repository to be named in this case 'msm8960'.
To add a remote repository to fetch upstream changes, (where you forked from)
git remote add upstream <URL of remote repository>
Example:
Code:
[COLOR="Red"]git remote add upstream [email protected]:CyanogenMod/android_kernel_htc_msm8960.git[/COLOR]
[COLOR="Red"]git fetch upstream [/COLOR]
This will add the log and pre stage all the changes on the remote repository.
After doing this Be aware of what your intentions are. If there have only been
minor changes with low likelyhood of major conflicts go ahead with merge.
Otherwise it may be best to cherry-pick specific changes.
To add these changes to your working files you have some options, I'm positive these are not the extent of those options but perhaps someone with better know-how will chime in....
[quote]
[COLOR="Red"]git merge upstream/master[/COLOR]
This merges all commits from both the upstream repository and any commits
you made to your forked repo.
[COLOR="Red"]git pull upstream/master[/COLOR]
This will pull in changes only from the remote repository[/quote]
For a better explanation see [url="http://eagain.net/articles/git-for-computer-scientists/#history"]Git for Computer Scientists[/url]
Now do-
[COLOR="Red"]git checkout master[/COLOR]
This should return you to your working branch
of course do a [COLOR="Red"]git status[/COLOR]
Finally do-
[COLOR="Red"]git add .[/COLOR]
[COLOR="Red"]git commit -m 'commit message'[/COLOR]
[COLOR="Red"]git push[/COLOR]
From cloned repo a simple git push should suffice. If not go ahead
and do git push <URL of your forked repo>
Example: [code][COLOR="Red"]git push [email protected]:jamieg71/kernel.git[/COLOR]
Cherry-picking
What is cherry-picking? Simple answer- grabbing commits from a different repo and adding to your own.
Here's some links-
Cherry-Pick-Manual from Kernel.org it don't 'git' more comprehensive than that.
Gitready Guide Greate guide for beginners to experts
I never really got it until I found this on Pastebin. Unknown author or I'd give em creds in all my threads.
And another here it has a different take at the begining
A multitude of guides can be found on Google, I have found the majority take for granted there is a roofer trying to follow them and don't necessarily explain some of the simple things. Which is always what screws me up..
Here's what works for me. I'm going to c/p a session from terminal and will highlight the actual git commands in red and add notes in green (0)
Code:
[email protected]:~/android/sofa/frameworks$ [COLOR="Red"]git clone [email protected]:SofaKingAndroid/frameworks_base.git -b ska43 base[/COLOR]
Cloning into 'base'...
remote: Counting objects: 796444, done.
remote: Compressing objects: 100% (192783/192783), done.
remote: Total 796444 (delta 525643), reused 795809 (delta 525149)
Receiving objects: 100% (796444/796444), 1.06 GiB | 6.67 MiB/s, done.
Resolving deltas: 100% (525643/525643), done.
Checking out files: 100% (21192/21192), done.
[email protected]:~/android/sofa/frameworks$ cd base
[email protected]:~/android/sofa/frameworks/base$ [COLOR="Red"]git status[/COLOR]
# On branch ska43
nothing to commit, working directory clean
[email protected]:~/android/sofa/frameworks/base$ [COLOR="Red"]git remote add ok [email protected]:AOKP/frameworks_base.git[/COLOR] [COLOR="SeaGreen"](1)[/COLOR]
[email protected]:~/android/sofa/frameworks/base$ [COLOR="Red"]git fetch ok[/COLOR]
remote: Counting objects: 40, done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 23 (delta 14), reused 12 (delta 3)
Unpacking objects: 100% (23/23), done.
From github.com:AOKP/frameworks_base
* [new branch] jb -> ok/jb
* [new branch] jb-broke -> ok/jb-broke
* [new branch] jb-mr1 -> ok/jb-mr1
* [new branch] jb-mr2 -> ok/jb-mr2
[email protected]:~/android/sofa/frameworks/base$ [COLOR="Red"]git cherry-pick 4829174d6f6fa33cd51f2bde9df2e100420ef3bf[/COLOR] [COLOR="SeaGreen"](2)[/COLOR]
[ska43 f8380a3] SystemUI: 4G/LTE icon toggle
Author: Roman Birg <[email protected]>
2 files changed, 17 insertions(+), 2 deletions(-)
[email protected]:~/android/sofa/frameworks/base$ [COLOR="Red"]git status[/COLOR]
# On branch ska43
# Your branch is ahead of 'origin/ska43' by 1 commit.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
[email protected]:~/android/sofa/frameworks/base$ [COLOR="Red"]git remote add upstream [email protected]:SofaKingAndroid/frameworks_base.git[/COLOR] [COLOR="SeaGreen"](3)[/COLOR]
[email protected]:~/android/sofa/frameworks/base$ [COLOR="Red"]git push[/COLOR]
Counting objects: 31, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (13/13), done.
Writing objects: 100% (16/16), 1.61 KiB, done.
Total 16 (delta 10), reused 0 (delta 0)
To [email protected]:SofaKingAndroid/frameworks_base.git
05ade0e..f8380a3 ska43 -> ska43
Notes
1) git remote add (initials) <URL of repository to grab commits>
The initials are what you make em, I used "ok"
2) git cherry-pick <Change ID or SHA of commit you want>
To find the change ID refer to commit history for
the project you are working on after fetch
you may be able to do git log and find the
change ID you want.
3) git remote add upstream <URL of your github repository>
Pretty sure I could have done git checkout ska43 and
it would have returned me to my working files, but I
wasn't sure so I did it this way.
This is an example of a very simple cherry-pick with no conflicting code. Most times when cherry-picking there will be many conflicts. You can use gitk (a GUI for git) to help resolve conflicts and get ready to merge.
More to come.
If you see a mistake or have anything to add
please by all means
respond in this thread.
More to come-​
reserved
Great Guide .!
Thanks for this one! Bookmarked!
haha, love the title, thanks for the laugh and useful info!
Nice work Jamie!
-Mike
Great work there Jamie!
Good Job! Lots of work went into this along with a sense of humor.
forking in another way
git remote add fork <url of fork>
git fetch fork
git checkout -b fork_branch fork/<branch>
example :-
I want to fork https://github.com/omnirom/android_frameworks_av android-4.4 branch into https://github.com/Legacy-Xperia/android_frameworks_av xyz branch
make a directory as you wish in your PC/COMP
git init
git pull https://github.com/Legacy-Xperia/android_frameworks_av.git
git remote add fork https://github.com/omnirom/android_frameworks_av
git fetch fork
git checkout -b xyz fork/android-4.4
done then push it
PS:- You can directly fork using browser but i love working via terminal
You can also add gitg in OP, it's a great software for working with git.
Sent from my EMVIRUS Sensation XL ! using XDA Premium 4 mobile app
excellent guide jamie
great job as always :beer:
percy_g2 said:
forking in another way
git remote add fork <url of fork>
git fetch fork
git checkout -b fork_branch fork/<branch>
example :-
I want to fork https://github.com/omnirom/android_frameworks_av android-4.4 branch into https://github.com/Legacy-Xperia/android_frameworks_av xyz branch
make a directory as you wish in your PC/COMP
git init
git pull https://github.com/Legacy-Xperia/android_frameworks_av.git
git remote add fork https://github.com/omnirom/android_frameworks_av
git fetch fork
git checkout -b xyz fork/android-4.4
done then push it
PS:- You can directly fork using browser but i love working via terminal
Click to expand...
Click to collapse
Nice, thanks for the alternate means.
Nico_60 said:
You can also add gitg in OP, it's a great software for working with git.
Click to expand...
Click to collapse
I've been inactive for some time now dang life gets in the way of me hobby. Next time I'm in the PC I'll add this as well as Percy_g2 method. Thanks for the input.
youdug said:
excellent guide jamie
great job as always :beer:
Click to expand...
Click to collapse
Hey hey, I see you doing some great stuff over in the G2 forum. Great stuff buddy!
Sent from my EVO using Tapatalk
http://www.youtube.com/watch?v=ZDR433b0HJY
Interesting talk about how git works(rebase,merge,pull,push,status etc) and more info

[Dev][Krt16m][4.4] unofficial_cyanogenmod-11 [Thread-Closed]

Note : this thread is intended only for dev disscusion , working as i m getting things mixed in my beanstalk thread So, decided to create this thread thanks @DomusX10 and @[NUT] for idea
this is work to make Kitkat working on xperia 2011 devices
Source : github.com/cyanogemod
https://github.com/rebelos/msm7x30-3.4.x-nAa
Test Build 1 link :- http://www.mediafire.com/download/5zkr6d5dxzl7zdr/cm-11-20131110-UNOFFICIAL-anzu.zip
Test Build #2
Link : http://www.mediafire.com/download/ww4p6srrs0d58kd/cm-11-20131118-UNOFFICIAL-anzu.zip
Add this line in build prop before flashing..
Code:
#ADB
ro.debuggable=1
persist.sys.usb.config=adb
thank you!
current status : stuck at bootanim [on build #1] on build #2 needed to be verified
credits : Mikeioannia , legacy xperia , saki3d ,cyanogenmod , fxp ,szezso , munjeni
how to build guide
Code:
[B]How To Make Your Own Cm_11 builds for Anzu , urushi and smultron[/B]
1. mkdir cm
2. repo init -u git://github.com/CyanogenMod/android.git -b cm-11.0
3. mkdir -p ~/cm/.repo/local_manifests
4. curl https://raw.github.com/rebelos/local_manifests/cm-11.0/semc.xml > ~/cm/.repo/local_manifests/semc.xml
5. repo sync -j1
6. curl https://raw.github.com/rebelos/local_manifests/cm-11.0/updates.sh > ~/cm/updates.sh
7. chmod a+x updates.sh
8. ./updates.sh
9. cd ~/cm/vendor/cm
10. ./get-prebuilts
11. cd ~/cm
12. . build/envsetup.sh
13. breakfast <device>
14. brunch <device>
guys build it .. try it.. debug it ..
[Dev][Krt16m][4.4] unofficial_cyanogenmod-11
I am running now the 4.4 on my n4 it don't have new kernel but it have some new resources that the devs will take and they optimization the performance.. My n4 flying I hope to see my arc s flying to..
Sent from my Nexus 4 using XDA Premium 4 mobile app
nokiagye said:
I am running now the 4.4 on my n4 it don't have new kernel but it have some new resources that the devs will take and they optimization the performance.. My n4 flying I hope to see my arc s flying to..
Sent from my Nexus 4 using XDA Premium 4 mobile app
Click to expand...
Click to collapse
this evening I read about which sony device reiceve kitkat, and I read that xperia V and T will receive 4.3 officially.
Hope of 4.4 on Arc S never die. Obviously with a cooked ROM from xda...:good:
[Dev][Krt16m][4.4] unofficial_cyanogenmod-11
any experienced user here who knows how to do logcat cause i needed few testers for 4.4
[Dev][Krt16m][4.4] unofficial_cyanogenmod-11
officiallysonyrebel said:
any experienced user here who knows how to do logcat cause i needed few testers for 4.4
Click to expand...
Click to collapse
OK i can test and maybe ask @besttt & @vishal_android freak
which link to download?
cheers
officiallysonyrebel said:
any experienced user here who knows how to do logcat cause i needed few testers for 4.4
Click to expand...
Click to collapse
stuck with me at kernel logo using provided kernel
Cheers
[Dev][Krt16m][4.4] unofficial_cyanogenmod-11
elguneid said:
Me too confused about that ...
Sent from my LT18i using xda app-developers app
Click to expand...
Click to collapse
fixed....
Code:
[B]How To Make Your Own Cm_11 builds for Anzu , urushi and smultron[/B]
1. mkdir cm
2. repo init -u git://github.com/CyanogenMod/android.git -b cm-11.0
3. mkdir -p ~/cm/.repo/local_manifests
4. curl https://raw.github.com/rebelos/local_manifests/cm-11.0/semc.xml > ~/cm/.repo/local_manifests/semc.xml
5. repo sync -j1
6. curl https://raw.github.com/rebelos/local_manifests/cm-11.0/updates.sh > ~/cm/updates.sh
7. chmod a+x updates.sh
8. ./updates.sh
9. cd ~/cm/vendor/cm
10. ./get-prebuilts
11. cd ~/cm
12. . build/envsetup.sh
13. breakfast <device>
14. brunch <device>
guys build it .. try it.. debug it ..
[Dev][Krt16m][4.4] unofficial_cyanogenmod-11
officiallysonyrebel said:
fixed....
Code:
[B]How To Make Your Own Cm_11 builds for Anzu , urushi and smultron[/B]
1. mkdir cm
2. repo init -u git://github.com/CyanogenMod/android.git -b cm-11.0
3. mkdir -p ~/cm/.repo/local_manifests
4. curl https://raw.github.com/rebelos/local_manifests/cm-11.0/semc.xml > ~/cm/.repo/local_manifests/semc.xml
5. repo sync -j1
6. curl https://raw.github.com/rebelos/local_manifests/cm-11.0/updates.sh > ~/cm/updates.sh
7. chmod a+x updates.sh
8. ./updates.sh
9. cd ~/cm/vendor/cm
10. ./get-prebuilts
11. cd ~/cm
12. . build/envsetup.sh
13. breakfast <device>
14. brunch <device>
guys build it .. try it.. debug it ..
Click to expand...
Click to collapse
I have an ARC, no coding experience though...
Before I try this:
No need to get blobs for 4.4?
officiallysonyrebel said:
i saw u on Z forum u have created XZ dual recovery ...
everything is updated on my github..nothing needed but the problem i m not able to surpass boot screen with no adb shell access according to mikeioanniai busybox is broken ... currently trying to fix up things ... plz if u can try it for fixing these thigns then that will be great
best regards
Officiallysonyrebel
Click to expand...
Click to collapse
XZDualRecovery, yes, that's me
PM me your hangouts email, I'll attempt a build ASAP and we will be able to do some live debugging while you code
officiallysonyrebel said:
fixed....
Code:
[B]How To Make Your Own Cm_11 builds for Anzu , urushi and smultron[/B]
[STRIKE]1. mkdir cm[/STRIKE]
[STRIKE]2. repo init -u git://github.com/CyanogenMod/android.git -b cm-11.0[/STRIKE]
[STRIKE]3. mkdir -p ~/cm/.repo/local_manifests[/STRIKE]
[STRIKE]4. curl https://raw.github.com/rebelos/local_manifests/cm-11.0/semc.xml > ~/cm/.repo/local_manifests/semc.xml[/STRIKE]
[STRIKE]5. repo sync -j1[COLOR="Red"][B]0[/B][/COLOR][/STRIKE]
[STRIKE]6. curl https://raw.github.com/rebelos/local_manifests/cm-11.0/updates.sh > ~/cm/updates.sh[/STRIKE]
[STRIKE]7. chmod a+x updates.sh[/STRIKE]
[STRIKE]12. . build/envsetup.sh[/STRIKE] [COLOR="Green"][B]needed to do here!!![/B][/COLOR]
[STRIKE]8. ./updates.sh[/STRIKE]
[COLOR="Green"][B]Open and comment cherries 53164, 51130, 51224, 52888 and 53495: ALREADY MERGED![/B][/COLOR]
[STRIKE]9. cd ~/cm/vendor/cm[/STRIKE]
[STRIKE]10. ./get-prebuilts[/STRIKE]
[STRIKE]11. cd ~/cm[/STRIKE]
[STRIKE]13. breakfast anzu[/STRIKE]
14. brunch anzu [COLOR="Red"][B]RUNNING[/B][/COLOR]
guys build it .. try it.. debug it ..
Click to expand...
Click to collapse
Doing this now, will strike off everything done sofar to show progress
-- EDIT --
Man, CM is so freaking big, even with my 2 (yes, really) 20Mbit connections it's taking for ever
@officiallysonyrebel
Code:
# breakfast anzu
including vendor/cm/vendorsetup.sh
build/core/product_config.mk:238: *** _nic.PRODUCTS.[[device/semc/anzu/cm.mk]]: "hardware/ti/wlan/mac80211/wl127x-wlan-products.mk" does not exist. Stop.
Device anzu not found. Attempting to retrieve device repository from CyanogenMod Github (http://github.com/CyanogenMod).
Found repository: android_device_semc_anzu
Default revision: cm-11.0
Checking branch info
Default revision cm-11.0 not found in android_device_semc_anzu. Bailing.
Branches found:
cm-9.0.0
gb-release-7.2
gingerbread
gingerbread-release
ics
ics-release
jellybean
jellybean-stable
cm-7.1.0
Use the ROOMSERVICE_BRANCHES environment variable to specify a list of fallback branches.
build/core/product_config.mk:238: *** _nic.PRODUCTS.[[device/semc/anzu/cm.mk]]: "hardware/ti/wlan/mac80211/wl127x-wlan-products.mk" does not exist. Stop.
** Don't have a product spec for: 'cm_anzu'
** Do you have the right repo manifest?
Any idea how to get this fixed? For some reason, repo breakfast is not picking up your repository as a valid one... I can't find why
The path device/semc/anzu is there... breakfast somehow thinks it's not
---------- Post added at 01:31 AM ---------- Previous post was at 01:30 AM ----------
arc_n_krizt said:
How big data source for cm???
Sent from my Xperia Arc S using xda app-developers app
Click to expand...
Click to collapse
22Gb sofar... no idea if it will grow even more...
[NUT] said:
@officiallysonyrebel
Code:
# breakfast anzu
including vendor/cm/vendorsetup.sh
build/core/product_config.mk:238: *** _nic.PRODUCTS.[[device/semc/anzu/cm.mk]]: "hardware/ti/wlan/mac80211/wl127x-wlan-products.mk" does not exist. Stop.
Device anzu not found. Attempting to retrieve device repository from CyanogenMod Github (http://github.com/CyanogenMod).
Found repository: android_device_semc_anzu
Default revision: cm-11.0
Checking branch info
Default revision cm-11.0 not found in android_device_semc_anzu. Bailing.
Branches found:
cm-9.0.0
gb-release-7.2
gingerbread
gingerbread-release
ics
ics-release
jellybean
jellybean-stable
cm-7.1.0
Use the ROOMSERVICE_BRANCHES environment variable to specify a list of fallback branches.
build/core/product_config.mk:238: *** _nic.PRODUCTS.[[device/semc/anzu/cm.mk]]: "hardware/ti/wlan/mac80211/wl127x-wlan-products.mk" does not exist. Stop.
** Don't have a product spec for: 'cm_anzu'
** Do you have the right repo manifest?
Any idea how to get this fixed? For some reason, repo breakfast is not picking up your repository as a valid one... I can't find why
The path device/semc/anzu is there... breakfast somehow thinks it's not
---------- Post added at 01:31 AM ---------- Previous post was at 01:30 AM ----------
22Gb sofar... no idea if it will grow even more...
Click to expand...
Click to collapse
Hi,
see if these works:
First, check if in cm\device folder there is "semc\anzu\..."
if not, local manifest should be changed
if there is anzu folder in cm\device\ then try one of these:
breakfast cm_anzu
breakfast cm_anzu-eng
or alternatively just type lunch and select anzu from the list
[NUT] said:
@officiallysonyrebel
Code:
# breakfast anzu
including vendor/cm/vendorsetup.sh
build/core/product_config.mk:238: *** _nic.PRODUCTS.[[device/semc/anzu/cm.mk]]: "hardware/ti/wlan/mac80211/wl127x-wlan-products.mk" does not exist. Stop.
Device anzu not found. Attempting to retrieve device repository from CyanogenMod Github (http://github.com/CyanogenMod).
Found repository: android_device_semc_anzu
Default revision: cm-11.0
Checking branch info
Default revision cm-11.0 not found in android_device_semc_anzu. Bailing.
Branches found:
cm-9.0.0
gb-release-7.2
gingerbread
gingerbread-release
ics
ics-release
jellybean
jellybean-stable
cm-7.1.0
Use the ROOMSERVICE_BRANCHES environment variable to specify a list of fallback branches.
build/core/product_config.mk:238: *** _nic.PRODUCTS.[[device/semc/anzu/cm.mk]]: "hardware/ti/wlan/mac80211/wl127x-wlan-products.mk" does not exist. Stop.
** Don't have a product spec for: 'cm_anzu'
** Do you have the right repo manifest?
Any idea how to get this fixed? For some reason, repo breakfast is not picking up your repository as a valid one... I can't find why
The path device/semc/anzu is there... breakfast somehow thinks it's not
---------- Post added at 01:31 AM ---------- Previous post was at 01:30 AM ----------
22Gb sofar... no idea if it will grow even more...
Click to expand...
Click to collapse
its easy ..
cd ~/cm/hardware/ti/wlan
git fetch http://review.cyanogenmod.org/CyanogenMod/android_hardware_ti_wlan refs/changes/24/51224/7 && git cherry-pick FETCH_HEAD
only if it show some wired thing then
git commit --allow-empty
source is aroung 30 gb's
yup we can use hangouts [email protected] -- if anybody has problem regarding kk then can contact me at hangouts .. thnx
after it u might get librpc error [maybe] the n go in hardware / gps / delete lib rpc .. i m updating sources to upstream changes..
best regards
officiallysonyrebel
officiallysonyrebel said:
its easy ..
cd ~/cm/hardware/ti/wlan
git fetch http://review.cyanogenmod.org/CyanogenMod/android_hardware_ti_wlan refs/changes/24/51224/7 && git cherry-pick FETCH_HEAD
only if it show some wired thing then
git commit --allow-empty
source is aroung 30 gb's
yup we can use hangouts [email protected] -- if anybody has problem regarding kk then can contact me at hangouts .. thnx
after it u might get librpc error [maybe] the n go in hardware / gps / delete lib rpc .. i m updating sources to upstream changes..
best regards
officiallysonyrebel
Click to expand...
Click to collapse
gosssss.... it more 5 days to finish in my country!!! does anyone have the cd form .... it's like a repository in linux right??
arc_n_krizt said:
gosssss.... it more 5 days to finish in my country!!! does anyone have the cd form .... it's like a repository in linux right??
Click to expand...
Click to collapse
whats u r bandwidth..?
officiallysonyrebel said:
its easy ..
cd ~/cm/hardware/ti/wlan
git fetch http://review.cyanogenmod.org/CyanogenMod/android_hardware_ti_wlan refs/changes/24/51224/7 && git cherry-pick FETCH_HEAD
only if it show some wired thing then
git commit --allow-empty
source is aroung 30 gb's
yup we can use hangouts [email protected] -- if anybody has problem regarding kk then can contact me at hangouts .. thnx
after it u might get librpc error [maybe] the n go in hardware / gps / delete lib rpc .. i m updating sources to upstream changes..
best regards
officiallysonyrebel
Click to expand...
Click to collapse
The git fetch line fixed it indeed :good: I did need to remove the hardware/qcom/gps/librpc folder though, so that was a smart move
officiallysonyrebel said:
whats u r bandwidth..?
Click to expand...
Click to collapse
i cant share in this forum... whether there is a link than github??
Great!
Now it is much easier to discuss progress with kit kat on xperia 2011 lines! :good::good:
Boy, that split was a hassle
Anyway... ROM compile still running... I'm afraid to stop it, but I forgot to add export USE_CCACHE=1 and to have brunch run with a -j3 switch (which will enable it to use multicore systems)...
It's been running since 7:30 AM (GMT+1) ...
-- EDIT --
If you use the -j switch, take the amount of cores and add 1 to determine the number of threads it can handle. For every 4 cores you can add 1 extra thread. So a dual-core CPU can handle 3, a quad-core can handle 5 but an octo-core can handle 10.
Don't mix up HYPERTHREADING (HT) with actual number of cores, if you have a Pentium series CPU with HT, half the number of cores you might see in your /proc/cpuinfo, HT is doubling your core count but while compiling, it will hinder the processing power of your CPU more then it helps
That clearly does not work on lunch,brunch and breakfast ... too bad!
:victory: FINALY it was done ... or so I thought...
Code:
In file included from external/chromium_org/content/common/android/hash_set.cc:5:0:
/storage/home/nut/development/xperia/cyanogen/beanstalk/out/target/product/anzu/obj/GYP/shared_intermediates/content/jni/HashSet_jni.h:10:26: error: extra tokens at end of #ifndef directive [-Werror]
/storage/home/nut/development/xperia/cyanogen/beanstalk/out/target/product/anzu/obj/GYP/shared_intermediates/content/jni/HashSet_jni.h:11:26: error: missing whitespace after the macro name [-Werror]
target thumb C++: content_content_common_gyp <= external/chromium_org/content/common/android/surface_texture_peer.cc
In file included from external/chromium_org/content/common/android/hash_set.cc:5:0:
/storage/home/nut/development/xperia/cyanogen/beanstalk/out/target/product/anzu/obj/GYP/shared_intermediates/content/jni/HashSet_jni.h:24:20: error: expected initializer before '<' token
/storage/home/nut/development/xperia/cyanogen/beanstalk/out/target/product/anzu/obj/GYP/shared_intermediates/content/jni/HashSet_jni.h:26:17: error: expected initializer before '<' token
/storage/home/nut/development/xperia/cyanogen/beanstalk/out/target/product/anzu/obj/GYP/shared_intermediates/content/jni/HashSet_jni.h:29:22: error: expected '{' before '<' token
/storage/home/nut/development/xperia/cyanogen/beanstalk/out/target/product/anzu/obj/GYP/shared_intermediates/content/jni/HashSet_jni.h:29:22: error: expected unqualified-id before '<' token
external/chromium_org/content/common/android/hash_set.cc:30:1: error: expected '}' at end of input
cc1plus: all warnings being treated as errors
make: *** [/storage/home/nut/development/xperia/cyanogen/beanstalk/out/target/product/anzu/obj/STATIC_LIBRARIES/content_content_common_gyp_intermediates/content/common/android/hash_set.o] Error 1
make: *** Waiting for unfinished jobs....
Lets see if I can fix that...
-- EDIT --
I thought it might have been a typo somewhere ... but I'm lost already
Need help

39A based Rom Building - No SIm

So, I've tried building CM12 off JPC's sources.
I've tried building PAC-ROM 5.1.
They both boot fine for me. Except that neither recognize my SIM on boot.
Is there some commit that *has* to be made/reverted/cherry-picked in order to get the SIM to work?
I can provide my dmesg/locat if that helps.
Please, only devs reply. No need to clutter the thread with useless chatter.
*diregard* got to the bottom of it on IRC and JPC's CM12 thread. There was a boardconfig flag missing.
Where is the reference link?You can tell us how to fix it
qqzwc said:
Where is the reference link?You can tell us how to fix it
Click to expand...
Click to collapse
Here was his original instructions for what commits to revert/cherrypick: http://forum.xda-developers.com/showpost.php?p=60404718&postcount=3614
And here was the fix: http://forum.xda-developers.com/showpost.php?p=60418759&postcount=3641
However, he's updated his device tree on github to account for it now.
Yoinx said:
Here was his original instructions for what commits to revert/cherrypick: http://forum.xda-developers.com/showpost.php?p=60404718&postcount=3614
And here was the fix: http://forum.xda-developers.com/showpost.php?p=60418759&postcount=3641
However, he's updated his device tree on github to account for it now.
Click to expand...
Click to collapse
Well I just tried to build RR and kicked it off about 4 hours ago. I'll do another repo sync and try again.
Bright side, RR booted up for me
Edit - tried pulling in the commit and cherrypicking the fix (http://review.cyanogenmod.org/#/c/61459/) and got the stuff below. I'm wondering if the changes he made to his source took care of this?
Code:
[email protected]:~/rr$ git fetch http://review.cyanogenmod.org/CyanogenMod/android_frameworks_native refs/changes/59/61459/1 && git cherry-pick FETCH_HEAD
From http://review.cyanogenmod.org/CyanogenMod/android_frameworks_native
* branch refs/changes/59/61459/1 -> FETCH_HEAD
error: cherry-pick is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit, or use
hint: 'git commit -a'.
fatal: cherry-pick failed
[email protected]:~/rr$
ming3r said:
Well I just tried to build RR and kicked it off about 4 hours ago. I'll do another repo sync and try again.
Bright side, RR booted up for me
Edit - tried pulling in the commit and cherrypicking the fix (http://review.cyanogenmod.org/#/c/61459/) and got the stuff below. I'm wondering if the changes he made to his source took care of this?
Code:
[email protected]:~/rr$ git fetch http://review.cyanogenmod.org/CyanogenMod/android_frameworks_native refs/changes/59/61459/1 && git cherry-pick FETCH_HEAD
From http://review.cyanogenmod.org/CyanogenMod/android_frameworks_native
* branch refs/changes/59/61459/1 -> FETCH_HEAD
error: cherry-pick is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit, or use
hint: 'git commit -a'.
fatal: cherry-pick failed
[email protected]:~/rr$
Click to expand...
Click to collapse
You've changed files. Do 'git status' to find out what changes you made, then you have to commit them before you can cherry-pick anything.
Thanks. Trying to do a "git add ." right now so I can get the cherry pick in, but I'm a little surprised that it didn't pull the change automatically from the device tree when I did a repo sync earlier today for this. Thanks for helping out with my newb-ness
Edit - instead of doing a git add *, it's better to go into the specific folder and just do the cherrypick from there...go figure. Time to build this out again!

Categories

Resources