114 replies to this topic

[tilal6991]

I've fixed it. Just do a git pull on device/zte/skate and it should work now.

[razzmataz1478]

Now there's no rule on how to create ROM Manager.

[Nofan Tasi]

there is another reference to device blade in device/zte/skate/BoardConfig.mk

[Nofan Tasi]

after editing
device/zte/skate/device.mk
device/zte/skate/BoardConfig.mk
device/zte/skate/releasetools/ota_from_target_files
(replace blade with skate)
my build finished

[razzmataz1478]

Thanks man I'll try that now

[tilal6991]

Thanks. Have fixed it all I think. git pull should fix the errors.

[razzmataz1478]

This is what I'm getting now..

*** No rule to make target `vendor/cm/proprietary/RomManager.apk', needed by `out/target/product/skate/system/app/RomManager.apk'. Stop.

[tilal6991]

Try running get-prebuilts again.

[Nofan Tasi]

dear gurus

how does one bring private tree up to date ?

Here is what I tried:

cm9 $ repo sync -j4
Fetching projects: 100% (254/254), done.
Syncing work tree:   6% (16/254)  fatal: reference is not a tree: 8d25781706ecd0ae50f2b130e8dd08c57296de5c
Syncing work tree: 100% (254/254), done.

device/zte/skate/: leaving ics; does not track upstream
error: device/zte/skate/: CyanogenMod/android_device_zte_skate checkout 8d25781706ecd0ae50f2b130e8dd08c57296de5c

and (not sure if git-pull is correct way, sorry, not yet familiar with git...):

cm9 $ cd ~/cm9/device/zte
zte $ git pull git://github.com/ColdFusionX/android_device_zte_skate.git skate
fatal: Not a git repository (or any of the parent directories): .git


any help to provide correct commands appreciated

thanks

[razzmataz1478]

Not sure about the first problem, but for the second

cd ~/cm9/device/zte/skate
git pull git://github.com/ColdFusionX/android_device_zte_skate.git 

[Nofan Tasi]

thanks !!!

this works also for git://github.com/koush/proprietary_vendor_zte.git

cm9$ cd ~/cm9/device/zte/skate
skate$ git pull git://github.com/ColdFusionX/android_device_zte_skate.git
From git://github.com/ColdFusionX/android_device_zte_skate
* branch     HEAD    -> FETCH_HEAD
Already up-to-date.

...

cm9$ cd ~/cm9/vendor/zte/proprietary_vendor_zte
proprietary_vendor_zte $ git pull git://github.com/koush/proprietary_vendor_zte.git
From git://github.com/koush/proprietary_vendor_zte
* branch     HEAD    -> FETCH_HEAD
Already up-to-date.

...

but for zte-kernel-msm7x27 I see

cm9$ cd ~/cm9/kernel/zte/zte-kernel-msm7x27
zte-kernel-msm7x27$ git pull git://github.com/CyanogenMod/zte-kernel-msm7x27.git
From git://github.com/CyanogenMod/zte-kernel-msm7x27
* branch     HEAD    -> FETCH_HEAD
Auto-merging drivers/power/ti_gauge.c
Auto-merging drivers/power/msm_battery.c
Auto-merging drivers/power/Kconfig
Auto-merging drivers/input/touchscreen/synaptics_i2c_rmi.c
CONFLICT (content): Merge conflict in drivers/input/touchscreen/synaptics_i2c_rmi.c
Auto-merging drivers/input/touchscreen/synaptics_3k.c
CONFLICT (content): Merge conflict in drivers/input/touchscreen/synaptics_3k.c
Auto-merging arch/arm/mach-msm/board-zte-v9.c
Auto-merging arch/arm/mach-msm/board-zte-blade2.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/board-zte-blade2.c
Auto-merging arch/arm/mach-msm/board-zte-blade2-keypad.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/board-zte-blade2-keypad.c
Auto-merging arch/arm/mach-msm/board-zte-blade.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-zte-blade.c
Auto-merging arch/arm/mach-msm/Kconfig
Auto-merging arch/arm/configs/cyanogen_v9_defconfig
CONFLICT (content): Merge conflict in arch/arm/configs/cyanogen_v9_defconfig
Automatic merge failed; fix conflicts and then commit the result.

trying again:

zte-kernel-msm7x27$ git pull git://github.com/CyanogenMod/zte-kernel-msm7x27.git
U    arch/arm/configs/cyanogen_v9_defconfig
M    arch/arm/configs/cyanogen_v9_recovery_defconfig
A    arch/arm/configs/msm7627_blade2_p736v_defconfig
M    arch/arm/mach-msm/Kconfig
U    arch/arm/mach-msm/board-zte-blade.c
U    arch/arm/mach-msm/board-zte-blade2-keypad.c
U    arch/arm/mach-msm/board-zte-blade2.c
M    arch/arm/mach-msm/board-zte-v9.c
M    arch/arm/mm/Kconfig
U    drivers/input/touchscreen/synaptics_3k.c
U    drivers/input/touchscreen/synaptics_i2c_rmi.c
M    drivers/power/Kconfig
M    drivers/power/msm_battery.c
M    drivers/power/ti_gauge.c
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.


of course I can remove zte-kernel-msm7x27 and clone, but then rebuild
is from scratch on that subtree

[Nofan Tasi]

Hi skate compiling people

I couple of questions before I dare to attempt to flash own built
.zip.

First, why do I want to build myself?

- Just for fun
- I would like to use USB storage (via kernel config)
  (as to be able to, say, play music from an USB stick)
- I would perhaps like to use a DVB-T stick (via kernel config)
  (to use once vlc for android is ready)
- I would perhaps want to have a slightly different set of apps
  (but I don't know yet how to do that)
- ...

So here the questions

- if I flash minor upgrade, do I need to wipe anything?
- build system_size says (int) 230686720 and my /system partition df = 220M
  also: 220*1024*1024 = 230686720
   does this mean that my /system partition will be 100% full?
- unlike
  update-cm-9-20120531-SNAPSHOT-skate-ColdFusionX-tilal6991-signed.zip,
  my zip also has an extra directory with videoeditor app and media
  files.
   I don't need them, but will they be flashed, and, where?
  Can I just unzip, throw them away and make a zip file without?
- todays zip is called cm-9-20120608-UNOFFICIAL-skate.zip whereas
  yesterday's zip was called
  update-cm-9-20120607-SNAPSHOT-skate-signed.zip
   Is this name change intentional?

Thanks for all help

  have a good weekend

[razzmataz1478]

Nofan Tasi, on 08 June 2012 - 06:23 PM, said:

Hi skate compiling people

I couple of questions before I dare to attempt to flash own built
.zip.

First, why do I want to build myself?

- Just for fun
- I would like to use USB storage (via kernel config)
  (as to be able to, say, play music from an USB stick)
- I would perhaps like to use a DVB-T stick (via kernel config)
  (to use once vlc for android is ready)
- I would perhaps want to have a slightly different set of apps
  (but I don't know yet how to do that)
- ...

So here the questions

- if I flash minor upgrade, do I need to wipe anything?
- build system_size says (int) 230686720 and my /system partition df = 220M
  also: 220*1024*1024 = 230686720
   does this mean that my /system partition will be 100% full?
- unlike
  update-cm-9-20120531-SNAPSHOT-skate-ColdFusionX-tilal6991-signed.zip,
  my zip also has an extra directory with videoeditor app and media
  files.
   I don't need them, but will they be flashed, and, where?
  Can I just unzip, throw them away and make a zip file without?
- todays zip is called cm-9-20120608-UNOFFICIAL-skate.zip whereas
  yesterday's zip was called
  update-cm-9-20120607-SNAPSHOT-skate-signed.zip
   Is this name change intentional?

Thanks for all help

  have a good weekend

-No wipes
-Not sure
-Look in Meta-Inf/com/android/google to see where they are flashed, you will most likely just be able to delete them form the zip
-Did you

export CM_SNAPSHOT=1

????

[Nofan Tasi]

thanks razzmataz for pointing me at meta inf scripts

~cm9$ echo $CM_SNAPSHOT
1

[Nofan Tasi]

Sorry to ask ... I am not a git connoisseur

How does one pull a snapshot, say, date 20120615, from cm9 and zte
repository?

Also: are certain snapshots (perhaps weeklies) more 'stable' than
others?

Say, I like and trust tilal6991's snapshot (which, in fact, I do, of
course) and I want to change a tiny bit (but I do not want to end up
in some, perhaps, unstable situation).

Thanks!

[Nofan Tasi]

recently (2 days) build fails:
device/zte/skate/overlay/frameworks/base/core/res/res/values/dimens.xml:4: error: Error parsing XML: junk after document element
make: *** [out/target/common/obj/APPS/framework-res_intermediates/package-export.apk] Error 1
make: *** Deleting file `out/target/common/obj/APPS/framework-res_intermediates/package-export.apk'

but the xml looks not bad to me:

cat device/zte/skate/overlay/frameworks/base/core/res/res/values/dimens.xml
    <!-- Height of the horizontal navigation bar on devices that require it -->
    <dimen name="navigation_bar_height">36dp</dimen>
    <!-- Width of the vertical navigation bar on devices that require it -->
    <dimen name="navigation_bar_width">42dp</dimen>

anybody sees this?

[tilal6991]

git pull the skate repo.

[Nofan Tasi]

Thanks for the kind help.

Pardon my lack of git command knowledge, I do undestand how some
version control systems work but not git.

It seems somehow I have an unmerged file that cannot be automatically
resolved.  (arch/arm/configs/cyanogen_v9_defconfig).

Of course, right now, I am not planning to commit anything, just play
around a bit.

Any hint on how to resolve (and, perhaps, avoid) the conflict?

PS: some time ago I have, for test purpose, done a make config and,
perhaps, I copied the .config to cyanogen_v9_defconfig, but then,
meanwhile I have removed the local entire zte-kernel-msm7x27 directory
several times.


# cd ~/cm9/kernel/zte/zte-kernel-msm7x27

# git pull git://github.com/CyanogenMod/zte-kernel-msm7x27.git
From git://github.com/CyanogenMod/zte-kernel-msm7x27
* branch HEAD    -> FETCH_HEAD
Auto-merging drivers/power/ti_gauge.c
Auto-merging drivers/power/msm_battery.c
Auto-merging drivers/power/Kconfig
Auto-merging drivers/input/touchscreen/synaptics_i2c_rmi.c
CONFLICT (content): Merge conflict in drivers/input/touchscreen/synaptics_i2c_rmi.c
Auto-merging drivers/input/touchscreen/synaptics_3k.c
CONFLICT (content): Merge conflict in drivers/input/touchscreen/synaptics_3k.c
Auto-merging arch/arm/mach-msm/board-zte-v9.c
Auto-merging arch/arm/mach-msm/board-zte-blade2.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/board-zte-blade2.c
Auto-merging arch/arm/mach-msm/board-zte-blade2-keypad.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/board-zte-blade2-keypad.c
Auto-merging arch/arm/mach-msm/board-zte-blade.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-zte-blade.c
Auto-merging arch/arm/mach-msm/Kconfig
Auto-merging arch/arm/configs/cyanogen_v9_defconfig
CONFLICT (content): Merge conflict in arch/arm/configs/cyanogen_v9_defconfig
Automatic merge failed; fix conflicts and then commit the result.

# git pull git://github.com/CyanogenMod/zte-kernel-msm7x27.git
U    arch/arm/configs/cyanogen_v9_defconfig
M    arch/arm/configs/cyanogen_v9_recovery_defconfig
A    arch/arm/configs/msm7627_blade2_p736v_defconfig
M    arch/arm/mach-msm/Kconfig
U    arch/arm/mach-msm/board-zte-blade.c
U    arch/arm/mach-msm/board-zte-blade2-keypad.c
U    arch/arm/mach-msm/board-zte-blade2.c
M    arch/arm/mach-msm/board-zte-v9.c
M    arch/arm/mm/Kconfig
U    drivers/input/touchscreen/synaptics_3k.c
U    drivers/input/touchscreen/synaptics_i2c_rmi.c
M    drivers/power/Kconfig
M    drivers/power/msm_battery.c
M    drivers/power/ti_gauge.c
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.

Edited by Nofan Tasi, 18 June 2012 - 12:59 PM.

[utternoob]

I'm no expert either but shouldn't all of the blade bits be Skate

[razzmataz1478]

The kernel git includes the blade crescent (blade 2) skate and v9 so no they're fine.