On Thu, May 27, 2010 at 04:20:01PM +0000, Florian Schlichting wrote:
> Hi,
>
> I'm trying a first-time build of SHR, using the Makefile from
> http://shr.bearstech.com/Makefile. 'make setup' fails with the following
> lines:
>
> ...
> Initialized empty Git repository in /scratch/src/SHR/openembedded/.git/
> remote: Counting objects: 368349, done.
> remote: Compressing objects: 100% (115446/115446), done.
> remote: Total 368349 (delta 247579), reused 363879 (delta 244283)
> Receiving objects: 100% (368349/368349), 150.02 MiB | 307 KiB/s, done.
> Resolving deltas: 100% (247579/247579), done.
> Checking out files: 100% (23528/23528), done.
> Already on 'org.openembedded.dev'
> make[1]: Entering directory `/scratch/src/SHR'
> preparing shr-unstable tree
> Initialized empty Git repository in
> /scratch/src/SHR/shr-unstable/openembedded/.git/
> Checking out files: 100% (23528/23528), done.
> fatal: git checkout: branch org.openembedded.dev already exists
> make[1]: *** [shr-unstable/.configured] Fehler 128
> make[1]: Leaving directory `/scratch/src/SHR'
> make: *** [setup-shr-unstable] Fehler 2
> make: Leaving directory `/scratch/src/SHR'
>
> I'm using the very recent git version 1.7.0.4; I feel the reason might
> be that the new git copies the already checked-out branch from
> ../openembedded, or alternatively, that it won't tolerate 'git checkout
> -b $existing-branchname' any more; anyway the following seems to fix
> things:
>
> --- a/Makefile
> +++ b/Makefile
> @@ -234,7 +234,7 @@ shr-unstable/.configured: common/.git/config
> bitbake/.git/config openembedded/.g
> [ -e shr-unstable/openembedded ] || ( cd shr-unstable ; \
> git clone --reference ../openembedded
> git://git.openembedded.net/openembedded openembedded; \
> cd openembedded ; \
> - git checkout --no-track -b ${SHR_UNSTABLE_BRANCH_OE}
> origin/${SHR_UNSTABLE_BRANCH_OE} )
> + git checkout --no-track origin/${SHR_UNSTABLE_BRANCH_OE} ; git
> branch -f ${SHR_UNSTABLE_BRANCH_OE} )
> [ -d shr-unstable/conf ] || ( mkdir -p shr-unstable/conf )
> [ -e shr-unstable/conf/site.conf ] || ( cd shr-unstable/conf ; ln -sf
> ../../common/conf/site.conf . )
> [ -e shr-unstable/conf/auto.conf ] || ( \
>
>
> What do you think?
maybe
git checkout ${SHR_UNSTABLE_BRANCH_OE} || git checkout --no-track -b
${SHR_UNSTABLE_BRANCH_OE} origin/${SHR_UNSTABLE_BRANCH_OE}
not sure if your solution works when SHR_UNSTABLE_BRANCH_OE is not the
same branch as what is checkouted by default while checkouting ../openembedded
>
> NB Google first led me to (note the typo):
> http://shr-project.org/trac/wiki/Bulding%20SHR -- this page is outdated
> and should probably be removed and redirected to
> http://shr-project.org/trac/wiki/Building%20SHR, no?
Thanks removed the first.
Regards,
--
uin:136542059 jid:[email protected]
Jansa Martin sip:[email protected]
JaMa
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
