recovery and bootable/recovery

[Ben Leslie]

These two (recently added?) modules seem to be _almost_ identical, and
the both have the same LOCAL_MODULE name.

The exact error you get (for other people grepping the web) is:

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

Simply "rm -r bootable/recovery recovery" seems to get past the
problem, but I'm guessing that the repo and/or manifest file should be
updated to fix the problem.

Cheers,

Benno

[Jean-Baptiste Queru]

They're identical. recovery is the old location, bootable/recovery is
the new location. The latest manifest includes the new location, but I
don't know whether there's a mechanism to delete the old one. It might
make sense to make the root makefile explicitly ignore the old
location.

rm -rf recovery is indeed the right thing to do.

JBQ

--
Jean-Baptiste M. "JBQ" Queru
Android Engineer, Google.

[Ben Leslie]

On Sat, Dec 20, 2008 at 2:39 PM, Jean-Baptiste Queru <j...@google.com> wrote:
>
> They're identical.

"diff -r" disagrees ;), but that isn't really important.

>recovery is the old location, bootable/recovery is
> the new location. The latest manifest includes the new location, but I
> don't know whether there's a mechanism to delete the old one. It might
> make sense to make the root makefile explicitly ignore the old
> location.

OK cool, makes sense. It is probably difficult and/or dangerous
(depending on implementation) to have 'repo' automatically deleting
old directories. On balance I don't think it is worth 'fixing', you
aren't going to be moving modules like this all the time (right?).

> rm -rf recovery is indeed the right thing to do.

Yeah, rm -fr + a new sync fixed everything good. Anyone having he same
problem, a "rm -r recovery" should be sufficient to fix things.

Cheers,

Benno

[Jean-Baptiste Queru]

Indeed. They're not identical on your disk (one is the pre-cupcake
version that you got in your last sync, the other one is the
post-cupcake version). If you git cloned both from the server, you'd
find them identical).

Sorry for the mixup.

JBQ

[Kenny Yu]

Can you explain more, JBQ? How to see them identical? Please put down
the GIT commands here.

I've been trapped in the MAKE problem for hours because I guess the
"repo sync" lost something. Particularly, simply using the latest repo
as below:
cd myExistingAndroid
repo sync

We will see ./packages/providers/Telephony and system/wlan/ti have
"Untracked files". I fixed the two with "git-reset --hard HEAD" and
"repo sync". Then I see the "identical recovery module" blocking MAKE.

Put down the GIT commands please, it will help me understand the
background and relief my worry about the source sync-up.

Thanks,

Kenny

On Dec 20, 11:52 am, Jean-Baptiste Queru <j...@google.com> wrote:
> Indeed. They're not identical on your disk (one is the pre-cupcake
> version that you got in your last sync, the other one is the
> post-cupcake version). If you git cloned both from the server, you'd
> find them identical).
>
> Sorry for the mixup.
>
> JBQ
>
>
>
>
>
> On Fri, Dec 19, 2008 at 7:47 PM, Ben Leslie <be...@benno.id.au> wrote:
>
> > On Sat, Dec 20, 2008 at 2:39 PM, Jean-Baptiste Queru <j...@google.com> wrote:
>
> >> They're identical.
>
> > "diff -r" disagrees ;), but that isn't really important.
>
> >>recoveryis the old location, bootable/recoveryis
> >> the new location. The latest manifest includes the new location, but I
> >> don't know whether there's a mechanism to delete the old one. It might
> >> make sense to make the root makefile explicitly ignore the old
> >> location.
>
> > OK cool, makes sense. It is probably difficult and/or dangerous
> > (depending on implementation) to have 'repo' automatically deleting
> > old directories. On balance I don't think it is worth 'fixing', you
> > aren't going to be moving modules like this all the time (right?).
>

> >> rm -rfrecoveryis indeed the right thing to do.

>
> > Yeah, rm -fr + a new sync fixed everything good. Anyone having he same

> > problem, a "rm -rrecovery" should be sufficient to fix things.

>
> > Cheers,
>
> > Benno
>
> >> JBQ
>
> >> On Fri, Dec 19, 2008 at 7:36 PM, Ben Leslie <be...@benno.id.au> wrote:
>
> >>> These two (recently added?) modules seem to be _almost_ identical, and
> >>> the both have the same LOCAL_MODULE name.
>
> >>> The exact error you get (for other people grepping the web) is:
>
> >>> build/core/base_rules.mk:117: ***recovery:

> >>> MODULE.TARGET.EXECUTABLES.recoveryalready defined by
> >>> bootable/recovery.  Stop.
>
> >>> Simply "rm -r bootable/recoveryrecovery" seems to get past the

> >>> problem, but I'm guessing that the repo and/or manifest file should be
> >>> updated to fix the problem.
>
> >>> Cheers,
>
> >>> Benno
>
> >> --
> >> Jean-Baptiste M. "JBQ" Queru
> >> Android Engineer, Google.
>
> --
> Jean-Baptiste M. "JBQ" Queru

> Android Engineer, Google.- Hide quoted text -
>
> - Show quoted text -

[Kenny Yu]

I removed all files except .repo directory. Then I ran "repo sync"
again. The new working trees are clean - no more <recovery> or
<bootloader>. Actually new manifest.xml doesn't take the two old
directories.

Kenny