Hello,

I recently pulled the 4.2.2 code and local manifest for SE, but am getting repo 
sync errors. I pulled the Android code first, built and cleaned it (per the 
suggestion on SE wiki), dropped the local manifest in, and repo sync broke. Is 
this a known issue or did I use a bad branch/local manifest somewhere?

I did git init using branch android-4.2.2_r1. Build and clean of full-eng were 
successful.
I then pulled local_manifest.xml from bitbucket using branch seandroid-4.2. I 
dropped that into .repo/local_manifests .

Repo sync'd fine until it started checking out files with several errors saying:

Please, commit your changes or stash them before you can switch branches.
Aborting

At the end, repo says:
error: build/: build checkout afe3536720077838d6401c3c3d62bc605d548f56
error: device/asus/grouper/: device-asus-grouper checkout 
f1f49ae17e59bbadfdac1a3b9ac6b15f482f1034
error: device/lge/mako/: device-lge-mako checkout 
7305285325cae78c844283dd1026e683213ee02d
error: device/samsung/manta/: device-samsung-manta checkout 
b5b517f03740879f3fe064d6b578eb256e316d54
error: device/samsung/tuna/: device-samsung-tuna checkout 
e315f0b86b48dfa731c1b3901f5d1d4efaa4e35b
error: external/checkpolicy/: external-checkpolicy checkout 
0d73ef7049feee794f14cf1af88d05dae8139914
error: external/libselinux/: external-libselinux checkout 
73325928ceaf60fd22f50ce0b53c0e11cfdcabc9
error: external/libsepol/: external-libsepol checkout 
b0e0162a246f2c051427154909c0ecd694cc4805
error: external/sepolicy/: external-sepolicy checkout 
fc18c7a60b93c2ca62600d5564185f3aa657390b
error: frameworks/base/: frameworks-base checkout 
96ca793eeb2e423a2198af71330d6b37a6e6c559
error: system/core/: system-core checkout 
963b785863cd5fea2439ee48027247365be314cb
error: system/extras/: system-extras checkout 
1796fd983498a3d1023bc32cc407fc850691957d
error: system/vold/: system-vold checkout 
72752db1f2a6dfa2b32bbf1b6c9bfcbfabad37fb

Do I really have to repo forall -c git stash? Or, did I screw up somewhere in 
pulling the local manifest? My copy of local_manifest is attached for reference.
----
Tom Palarz
Security Consultant
Neohapsis, Inc.
773-269-6300 x301
312-231-9834 m
773-394-8314 f
[email protected]<mailto:[email protected]>

www.neohapsis.com<http://www.neohapsis.com/>

The contents of this transmitted message are confidential and may be subject to 
privilege.  Disclosure, copying, distribution, or use of the contents of this 
transmission or information it contains is prohibited if you have received this 
transmission in error.  If you are not the named recipient, please immediately 
notify the sender and destroy all copies you have received.

<manifest>
  <remote  name="bitbucket"
           fetch="https://bitbucket.org/seandroid"; />

  <remove-project name="platform/external/libselinux"/>
  <project path="external/libselinux" remote="bitbucket" name="external-libselinux" revision="seandroid"/>
  <remove-project name="platform/external/libsepol"/>
  <project path="external/libsepol" remote="bitbucket" name="external-libsepol" revision="master"/>
  <remove-project name="platform/external/checkpolicy"/>
  <project path="external/checkpolicy" remote="bitbucket" name="external-checkpolicy" revision="master"/>
  <remove-project name="platform/external/sepolicy"/>
  <project path="external/sepolicy" remote="bitbucket" name="external-sepolicy" revision="seandroid"/>
  <project path="packages/apps/SEAndroidManager" remote="bitbucket" name="packages-apps-seandroidmanager" revision="master"/>
  <project path="packages/apps/SEAndroidAdmin" remote="bitbucket" name="packages-apps-seandroidadmin" revision="master"/>

  <project path="kernel/goldfish" remote="bitbucket" name="kernel-goldfish" revision="seandroid-goldfish-3.4"/>
  <project path="kernel/tegra" remote="bitbucket" name="kernel-tegra" revision="seandroid-tegra3-grouper-3.1-jb-mr1.1"/>
  <project path="kernel/omap" remote="bitbucket" name="kernel-omap" revision="seandroid-omap-tuna-3.0-jb-mr1.1"/>
  <project path="kernel/msm" remote="bitbucket" name="kernel-msm" revision="seandroid-msm-mako-3.4-jb-mr1.1"/>
  <project path="kernel/exynos" remote="bitbucket" name="kernel-exynos" revision="seandroid-exynos-manta-3.4-jb-mr1.1"/>

  <remove-project name="platform/build"/>
  <project path="build" remote="bitbucket" name="build" revision="seandroid-4.2">
    <copyfile src="core/root.mk" dest="Makefile" />
  </project>
  
  <remove-project name="platform/bionic"/>
  <project path="bionic" remote="bitbucket" name="bionic" revision="seandroid-4.2" />

  <remove-project name="platform/frameworks/base"/>
  <project path="frameworks/base" remote="bitbucket" name="frameworks-base" revision="seandroid-4.2" />

  <remove-project name="platform/system/core"/>
  <project path="system/core" remote="bitbucket" name="system-core" revision="seandroid-4.2" />

  <remove-project name="platform/system/extras"/>
  <project path="system/extras" remote="bitbucket" name="system-extras" revision="seandroid-4.2" />

  <remove-project name="platform/system/vold"/>
  <project path="system/vold" remote="bitbucket" name="system-vold" revision="seandroid-4.2" />

  <remove-project name="device/samsung/tuna"/>
  <project path="device/samsung/tuna" remote="bitbucket" name="device-samsung-tuna" revision="seandroid-4.2" />

  <remove-project name="device/samsung/manta"/>
  <project path="device/samsung/manta" remote="bitbucket" name="device-samsung-manta" revision="seandroid-4.2" />

  <remove-project name="device/asus/grouper"/>
  <project path="device/asus/grouper" remote="bitbucket" name="device-asus-grouper" revision="seandroid-4.2" />

  <remove-project name="device/lge/mako"/>
  <project path="device/lge/mako" remote="bitbucket" name="device-lge-mako" revision="seandroid-4.2" />

</manifest>

Reply via email to