repo upload to a repository in local_manifest.xml

[Chris]

Hi,

I'm trying to repo upload a contributed file based on cupcake x86
support. To build, according to http://groups.google.com/group/android-porting/msg/d887f12d202e87e1,
we need a local_manifest like this:
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<project name="platform/vendor/asus/eee_701" path="vendor/asus/
eee_701"/>
</manifest>

I want to upload a contribution that adds to this directory/repository
but get this error:

[FAILED] vendor/asus/eee_701/ mystuff (unknown project
"platform/vendor/asus/eee_701")

What do I need to do up upload to this project?

The .git/config for vendor/asus/eee_701 looks like:
...
[remote "korg"]
url = git://android.git.kernel.org/platform/vendor/asus/eee_701.git
review = review.source.android.com
projectname = platform/vendor/asus/eee_701
fetch = +refs/heads/*:refs/remotes/korg/*
...

[Dave Bort]

I think the problem is that gerrit doesn't know about the
vendor/asus/eee_701 project yet. I just added it.

The other problem you may run into is that cupcake is a read-only
branch, so you won't be able to upload commits against it. Luckily,
JBQ just merged cupcake into master, so you should be able to do your
x86 work in the master branch now. You may need to re-create your
client, though (new dir, "repo init -u git://blah", no -b).

--dbort

[Chris]

okay... I'll repull from master and do it again... :-)

Thx,
Chris

On Dec 19, 4:25 pm, Dave Bort <db...@android.com> wrote:
> I think the problem is that gerrit doesn't know about the
> vendor/asus/eee_701 project yet.  I just added it.
>
> The other problem you may run into is that cupcake is a read-only
> branch, so you won't be able to upload commits against it.  Luckily,
> JBQ just merged cupcake into master, so you should be able to do your
> x86 work in the master branch now.  You may need to re-create your
> client, though (new dir, "repo init -u git://blah", no -b).
>
> --dbort
>
>
>
> On Fri, Dec 19, 2008 at 4:11 PM, Chris <chris.l.elf...@intel.com> wrote:
>
> > Hi,
>
> >  I'm trying to repo upload a contributed file based on cupcake x86

> > support.  To build, according tohttp://groups.google.com/group/android-porting/msg/d887f12d202e87e1,

> > we need a local_manifest like this:
> > <?xml version="1.0" encoding="UTF-8"?>
> > <manifest>
> >  <project name="platform/vendor/asus/eee_701" path="vendor/asus/
> > eee_701"/>
> > </manifest>
>
> > I want to upload a contribution that adds to this directory/repository
> > but get this error:
>
> > [FAILED] vendor/asus/eee_701/ mystuff          (unknown project
> > "platform/vendor/asus/eee_701")
>
> > What do I need to do up upload to this project?
>
> > The .git/config for vendor/asus/eee_701 looks like:
> > ...
> > [remote "korg"]
> >        url = git://android.git.kernel.org/platform/vendor/asus/eee_701.git
> >        review = review.source.android.com
> >        projectname = platform/vendor/asus/eee_701
> >        fetch = +refs/heads/*:refs/remotes/korg/*

> > ...- Hide quoted text -
>
> - Show quoted text -

[Chris]

It does not look like master builds anymore. We have tried several
different targets and they all result in:

build/core/base_rules.mk:117: *** recovery/amend:
MODULE.HOST.EXECUTABLES.amend already defined by bootable/recovery/
amend. Stop.

> > - Show quoted text -- Hide quoted text -

[Dave Bort]

It looks like you initted on top of your old client, and repo doesn't
handle this very well right now. You could either rm -rf your entire
client directory (or just create a new one), or maybe try

cd clientdir
rm -rf recovery bootloader

The recovery and bootloader/legacy projects moved into a new bootable/
directory, and it looks like you have copies of both sitting around.

--dbort

[Chris]

This particular droid directory had always been inited to master (I
have one inited to master and another to cupcake). In any event, I
wiped my whole master droid a few minutes ago and am about halfway
thru a sync on a fresh init. Certainly that should get rid of any
duplicate versions.

Chris

[Chris]

Thx. The freshly inited and synced droid is building now.

[Dave Bort]

On Fri, Dec 19, 2008 at 5:14 PM, Chris <chris.l...@intel.com> wrote:
>
> This particular droid directory had always been inited to master (I
> have one inited to master and another to cupcake). In any event, I
> wiped my whole master droid a few minutes ago and am about halfway
> thru a sync on a fresh init. Certainly that should get rid of any
> duplicate versions.
>

I think the problem is that the manifest in master has changed, and
repo isn't very good at dealing with those changes. So, it's less
about a branch change than it is about a manifest change. Glad it's
working for you, now, though.

--dbort

[Chris]

Okay, I'm trying to upload again this time from a local branch created
on a droid based on master and now I'm back to something like the
original problem. I see this:

[FAILED] vendor/asus/eee_701/ elfy (unknown branch "refs/
heads/master")

git reports that there is a remotes/korg/cupcake, remotes/korg/master
and a remote/m/master for the vendor/asus/eee_701 git repository.

Thx,
Chris

[Chris]

I still see this issue trying to upload a to <project name="platform/
vendor/asus/eee_701" path="vendor/asus/eee_701"/>

[FAILED] vendor/asus/eee_701/ elfy (unknown branch "refs/
heads/master")

thx,
Chris

[Shawn Pearce]

This should be fixed now.  I failed to register the eee_701 project with Gerrit when I created it.

[Chris]

Great! It does indeed work now. Thanks Shawn.
Chris

On Dec 26, 3:36 pm, Shawn Pearce <s...@google.com> wrote:
> This should be fixed now.  I failed to register the eee_701 project with
> Gerrit when I created it.
>