All of lore.kernel.org
 help / color / mirror / Atom feed
* AOSP commit 0cd29e3a3268f99ef0cb72a51782a35f407de1ae to manifests cause failure
@ 2012-06-21 18:49 William Roberts
  2012-06-21 19:24 ` Stephen Smalley
  0 siblings, 1 reply; 2+ messages in thread
From: William Roberts @ 2012-06-21 18:49 UTC (permalink / raw)
  To: selinux

[-- Attachment #1: Type: text/plain, Size: 6168 bytes --]

Commit 0cd29e3a3268f99ef0cb72a51782a35f407de1ae in the manifest for AOSP
changed dalvik to dalvik2, not sure how you guys are managing this switch
but it broke the build. Currently I set my head back by one on the manifest
to work around this.

See the below info for the details:

hqjiang@sta-hqjiang:~/seandroid$ repo sync -j1
Traceback (most recent call last):
  File "/home/hqjiang/seandroid/.repo/repo/main.py", line 385, in <module>
    _Main(sys.argv[1:])
  File "/home/hqjiang/seandroid/.repo/repo/main.py", line 365, in _Main
    result = repo._Run(argv) or 0
  File "/home/hqjiang/seandroid/.repo/repo/main.py", line 121, in _Run
    copts, cargs = cmd.OptionParser.parse_args(argv)
  File "/home/hqjiang/seandroid/.repo/repo/command.py", line 45, in
OptionParser
    self._Options(self._optparse)
  File "/home/hqjiang/seandroid/.repo/repo/subcmds/sync.py", line 126, in
_Options
    self.jobs = self.manifest.default.sync_j
  File "/home/hqjiang/seandroid/.repo/repo/manifest_xml.py", line 245, in
default
    self._Load()
  File "/home/hqjiang/seandroid/.repo/repo/manifest_xml.py", line 293, in
_Load
    self._ParseManifest(nodes)
  File "/home/hqjiang/seandroid/.repo/repo/manifest_xml.py", line 405, in
_ParseManifest
    (name))
error.ManifestParseError: project platform/dalvik not found
hqjiang@sta-hqjiang:~/seandroid$
hqjiang@sta-hqjiang:~/seandroid$
hqjiang@sta-hqjiang:~/seandroid$
hqjiang@sta-hqjiang:~/seandroid$ cd .repo/
hqjiang@sta-hqjiang:~/seandroid/.repo$
hqjiang@sta-hqjiang:~/seandroid/.repo$ grep dalvik *
local_manifest.xml:  <remove-project name="platform/dalvik"/>
local_manifest.xml:  <project path="dalvik" remote="selinuxproject"
name="platform/dalvik" revision="seandroid" />
manifest.xml:  <project path="dalvik" name="platform/dalvik2" />
hqjiang@sta-hqjiang:~/seandroid/.repo$
hqjiang@sta-hqjiang:~/seandroid/.repo$
hqjiang@sta-hqjiang:~/seandroid/.repo$
hqjiang@sta-hqjiang:~/seandroid/.repo$
hqjiang@sta-hqjiang:~/seandroid/.repo$ cd manifests.git/
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests.git$ ls
branches  config  description  FETCH_HEAD  HEAD  hooks  info  logs  objects
 packed-refs  refs  rr-cache
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests.git$
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests.git$
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests.git$
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests.git$ git log
fatal: bad default revision 'HEAD'
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests.git$
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests.git$
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests.git$
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests.git$ cd ..
hqjiang@sta-hqjiang:~/seandroid/.repo$
hqjiang@sta-hqjiang:~/seandroid/.repo$
hqjiang@sta-hqjiang:~/seandroid/.repo$ cd manifests
manifests/     manifests.git/
hqjiang@sta-hqjiang:~/seandroid/.repo$ cd manifests
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests$
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests$
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests$ git log
commit 0cd29e3a3268f99ef0cb72a51782a35f407de1ae
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Jun 21 10:20:14 2012 -0700

    Switch to snapshots for dalvik and libcore

commit b5a0d13b2f49a9fb5e2ae619331c5e6f17c8f46e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Jun 13 18:01:59 2012 -0700

    Add chromium-trace

commit 00ece54b1be0831140102c453d2e108bbd2072ec
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri May 18 11:13:34 2012 -0700

    Remove i686-android-linux-4.4.3 toolchain

commit 8c70177169eab0247227667fb1d318f770617a68
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon May 14 15:14:53 2012 -0700

    Add ant-glob

commit 03fc9565bbe48f8a74cb8333f31febf8f228b138
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Apr 30 15:48:17 2012 -0700

    Add prebuilts/misc

commit 8f95dff32fcbe4287582bb481de67e210ae158bd
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Apr 26 14:14:23 2012 -0700

    Switch to the proper location of IA 4.6 toolchain

commit e56e10bfa2344561c5b4d0f65661d0e65742e622
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Apr 24 14:21:39 2012 -0700

    Add 4.6 toolchains

commit 527678f04df1205ddf229cd114d978fa63130f73
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Apr 20 14:29:22 2012 -0700

    Add new toolchains

commit 23f0e7830de760d2a907fbf4ede543042df41beb
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Apr 19 10:41:14 2012 -0700

    Add prebuilts/eclipse
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests$
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests$
hqjiang@sta-hqjiang:~/seandroid/.repo/manifests$ git diff HEAD^1
diff --git a/default.xml b/default.xml
index c8769eb..54d9d8d 100644
--- a/default.xml
+++ b/default.xml
@@ -17,7 +17,7 @@
   <project path="bootable/diskinstaller"
name="platform/bootable/diskinstaller" />
   <project path="bootable/recovery" name="platform/bootable/recovery" />
   <project path="cts" name="platform/cts" />
-  <project path="dalvik" name="platform/dalvik" />
+  <project path="dalvik" name="platform/dalvik2" />
   <project path="development" name="platform/development" />
   <project path="device/common" name="device/common" />
   <project path="device/generic/goldfish" name="device/generic/goldfish" />
@@ -191,7 +191,7 @@
   <project path="hardware/ti/omap4xxx"
name="platform/hardware/ti/omap4xxx" />
   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
-  <project path="libcore" name="platform/libcore" />
+  <project path="libcore" name="platform/libcore2" />
   <project path="ndk" name="platform/ndk" />
   <project path="packages/apps/BasicSmsReceiver"
name="platform/packages/apps/BasicSmsReceiver" />
   <project path="packages/apps/Bluetooth"
name="platform/packages/apps/Bluetooth" />

-- 
Respectfully,

William C Roberts

[-- Attachment #2: Type: text/html, Size: 10137 bytes --]

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: AOSP commit 0cd29e3a3268f99ef0cb72a51782a35f407de1ae to manifests cause failure
  2012-06-21 18:49 AOSP commit 0cd29e3a3268f99ef0cb72a51782a35f407de1ae to manifests cause failure William Roberts
@ 2012-06-21 19:24 ` Stephen Smalley
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Smalley @ 2012-06-21 19:24 UTC (permalink / raw)
  To: William Roberts; +Cc: selinux

On Thu, 2012-06-21 at 11:49 -0700, William Roberts wrote:
> Commit 0cd29e3a3268f99ef0cb72a51782a35f407de1ae in the manifest for
> AOSP changed dalvik to dalvik2, not sure how you guys are managing
> this switch but it broke the build. Currently I set my head back by
> one on the manifest to work around this.

Seems to be two options:
- repo init -b master-dalvik to keep using dalvik/libcore,
- modify local_manifest.xml to specify dalvik2/libcore2 in the
remove-project lines only.

Still trying to understand what they did and why.

-- 
Stephen Smalley
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-06-21 19:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-21 18:49 AOSP commit 0cd29e3a3268f99ef0cb72a51782a35f407de1ae to manifests cause failure William Roberts
2012-06-21 19:24 ` Stephen Smalley

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.