Short question: What exactly is the make target to get .img files instead of an update zip with make bacon?

First things first: I see a lot of development on github atm (mainly DerArtem and nopy). Thanks for that. I really hope to see a functional CM7 soon on my folio.

The reason I am writing here is DerArtems latest commit on github. You kind of merged in nopys patches. I think it is a good idea to habe one repository where all the patches are combined, but i think there is a more common way to do this that has some advanteges:

• Credidts are taken care of automatically, as the original commiter stays the same
• The overview of the repository is better, as the individual patches are visible (not just a patch saying 'I merged quite everything from here')
• It will be easier for nopy to keep in sync with your repository

So I thought I just tell you a little git-fu:

The proper way to do such a merge is using 'git fetch' and 'git merge'. Lets start fresh without your latest commit:

git clone git://github.com/DerArtem/android-device-betelgeuse.git
cd android-device-betelgeuse/
git revert 7cf53d4c0c8bb122b1a2eab84eada235d741730e

To get in nopy's gingerbread branch just do:

git remote add nopy git://github.com/nopy/android-device-betelgeuse.git
git fetch nopy
git merge nopy/gingerbread

Unfortunately the merge is not clean and reports a conflict:

Auto-merged BoardConfig.mk
CONFLICT (content): Merge conflict in BoardConfig.mk
Auto-merged device_betelgeuse.mk
Auto-merged extract-files.sh
Auto-merged setup-makefiles.sh
Automatic merge failed; fix conflicts and then commit the result.

So lets fix this. Open BoardConfig.mk in your favourite editor. You will notice two blocks starting with '<<<<<<< HEAD:BoardConfig.mk' end ending with '>>>>>>> nopy/gingerbread:BoardConfig.mk':

<<<<<<< HEAD:BoardConfig.mk
=======
TARGET_USES_OLD_LIBSENSORS_HAL := true
TARGET_SENSORS_NO_OPEN_CHECK:=true

# custom recovery ui
BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/nvidia/betelgeuse/recovery/recovery_ui.c
>>>>>>> nopy/gingerbread:BoardConfig.mk

and

<<<<<<< HEAD:BoardConfig.mk
#WPA_SUPPLICANT_VERSION      := VER_0_6_X
=======
WPA_SUPPLICANT_VERSION      := VER_0_5_X
>>>>>>> nopy/gingerbread:BoardConfig.mk

The '=======' line divedes the content of the current head and the file that should be merged. Git does not know what to do with this code, as the pach you want to merge has a different base to start from. E.g. the second conflict comes from the fact, that the patch wants to apply this change:

-WPA_SUPPLICANT_VERSION      := VER_0_6_X
+WPA_SUPPLICANT_VERSION      := VER_0_5_X

to this line:

#WPA_SUPPLICANT_VERSION      := VER_0_6_X

Note the '#' symbol, that is not expected by the patch.

So change the whole conlict block to just the line you would like to keep:

<<<<<<< HEAD:BoardConfig.mk
#WPA_SUPPLICANT_VERSION      := VER_0_6_X
=======
WPA_SUPPLICANT_VERSION      := VER_0_5_X
>>>>>>> nopy/gingerbread:BoardConfig.mk

changes to

WPA_SUPPLICANT_VERSION      := VER_0_5_X

Respectively resolve the firest block to:

TARGET_SENSORS_NO_OPEN_CHECK:=true

as the rest of the lines is already present in other parts of the file.

Exit the editor and do a 'git add BoardConfig.mk' followed by a 'git commit'.

Try a 'git log' and see the merged patches in the list. Then just 'git push origin master' and everything is fine on github.

I hope this little tutorial is kind of useful and not misunderstood as a nagging of someone who has not yet commited anything useful to this project.

mblaster

Hi ,
Nice mini tutorial mblaster !! Thanks for taking the time to write this, yesterday i speak with DerArtem and haven't had time to explain how to use git.

For your question about the system.img, after "make bacon", you have out/target/product/betelgeuse/system.img but you can't flash it because it's not a raw ext4 image.
Run

make_ext4fs -l 268435456 -a system ~/system.img out/target/product/betelgeuse/system

and you can flash the resulting ~/system.img

Originally Posted by nopy

Hi ,
Nice mini tutorial mblaster !! Thanks for taking the time to write this, yesterday i speak with DerArtem and haven't had time to explain how to use git.

For your question about the system.img, after "make bacon", you have out/target/product/betelgeuse/system.img but you can't flash it because it's not a raw ext4 image.
Run

make_ext4fs -l 268435456 -a system ~/system.img out/target/product/betelgeuse/system

and you can flash the resulting ~/system.img

I will check when I get home. But as far as I remember I only found the update_CM7_RC0_KANGED_signed_zip and no image files. Also in the .zip, there was no system.img. Instead a system folder and a boot.img.

I tried flashing the zip with 3 different recoveries, without success. The original recovery at least copied some parts of system to /system. I copied the rest manually via adb shell and fastboot flashed the boot.img, but the system refused to start. Adb logcat repetedly reported that it is waiting for some kind of service to start up (cant remember which), but it never came up. Perhaps it has to do with the fact that I used the blobs from the current official rom. I will try the foliomod1.3 blobs instead and see what happens. Does it boot up for you?

Originally Posted by mblaster

Perhaps it has to do with the fact that I used the blobs from the current official rom. I will try the foliomod1.3 blobs instead and see what happens. Does it boot up for you?

The kernel in the device tree can't run with latest update blobs , nvrm_daemon hang. You need to use foliomod 1.3 blobs. With those blobs i can boot and almost everything is fonctionnal.

OK, tried with the foliomod1.3 blobs. Still get:

D/        ( 2329): 2s elapsed in InitFifo; is daemon started?

looping.

Will look into it later. Thanks for the help with the system image.

PS: I am using the kernel that is in the android-device-betelgeuse git.

€: Here is a full logcat: http://pastebin.com/vNk3sdMH

One of the pids belongs to system server, the other to this:

I/sysproc ( 2443): Entered system_init()
I/sysproc ( 2443): ServiceManager: 0xee1d0
I/SurfaceFlinger( 2443): SurfaceFlinger is starting
I/SurfaceFlinger( 2443): dithering enabled
I/SurfaceFlinger( 2443): SurfaceFlinger's main thread ready to run. Initializing graphics H/W...

Recompiling again with the right blobs, just to make sure I used the right ones.

€€: WOOT: Android on skateboard! Don't know what was wrong before.

Android Market

---

Is Android Market running on Cyanogen?

I can't find it in the APP list...

Alain

I just tested your ROM and that's working almost fine

I noticed a bug : when I choose a language, it's discarded after a reboot and return back to english.

I didn't check if Cyanogenmod 7 is using Tegra 2 hardware acceleration, but if using GB sources from nvidia git we should add in BoardConfig.mk :

BOARD_USES_HW_MEDIAPLUGINS := true
BOARD_USES_HW_MEDIARECORDER := true
BOARD_USES_HW_MEDIASCANNER := true

Originally Posted by mblaster

First things first: I see a lot of development on github atm (mainly DerArtem and nopy). Thanks for that. I really hope to see a functional CM7 soon on my folio.

The reason I am writing here is DerArtems latest commit on github. You kind of merged in nopys patches. I think it is a good idea to habe one repository where all the patches are combined, but i think there is a more common way to do this that has some advanteges:

Thank you for the nice guide. I have really not much clue how git is working. Still learning it. I have just fixed the git tree now.