search

Angstrom-distribution / setup-scripts

Helper scripts for setting an Angstrom development environment
http://www.angstrom-distribution.org/building-angstrom
MIT License
84 stars 108 forks source link

meta-linaro branch not found #18

Closed sravanM closed 11 years ago

sravanM commented 11 years ago

I am getting this error when running 'MACHINE=beaglebone ./oebb.sh update'

Processing meta-kde: Fixed to revision 316d9c27e72cfebc7618268f8766624ee3f5e18e, skipping update WARNING!!!! WARNING: meta-linaro is using a different branch 'master' than configured in layers.txt 'danny' WARNING: Changing branch to: 'danny' WARNING!!!!

j-hoppe commented 11 years ago

Same for me: Not working for BeagleBone. I think this error was fixed a few days ago for the BeagleBoard? My log: $ git clone https://github.com/Angstrom-distribution/setup-scripts.git ... $ cd setup-scripts ; git pull .... $ MACHINE=beaglebone ./oebb.sh config beaglebone ..... Layer checkout missing at /home/joerg/angstrom_v2012_12/setup-scripts/sources/meta-linaro, creating one Cloning into '/home/joerg/angstrom_v2012_12/setup-scripts/sources/meta-linaro'... remote: Counting objects: 2409, done. remote: Compressing objects: 100% (1260/1260), done. remote: Total 2409 (delta 966), reused 2361 (delta 930) Receiving objects: 100% (2409/2409), 887.52 KiB | 584 KiB/s, done. Resolving deltas: 100% (966/966), done. fatal: git checkout: updating paths is incompatible with switching branches. Did you intend to checkout 'origin/danny' which can not be resolved as commit? Layers present in repository: meta-linaro/meta-linaro meta-linaro/meta-linaro-toolchain meta-linaro/meta-aarch64

Processing meta-linaro: Current branch master is up to date. ....

pragtich commented 11 years ago

Exactly the same is happening here as j-hoppe is reporting.

bulwahn commented 11 years ago

I had the same problem as @sravanM. It seems that the layers.txt [1] pulls the meta-linaro layer from a fork [2] of the original repository [3]. Unfortunately, this fork contains only master and dylan, not contain the danny branch which we need here.

So, to solve the problem I changed the layers.txt to point to the original repository. When you then run ./oebb.sh update the first time, it reports some warning (meta-linaro is using a different uri..., meta-linaro is using a different branch), but then it resolves the problems; and when you run it again, the problem is solved and the warning disappears.

[1] https://github.com/Angstrom-distribution/setup-scripts/blob/master/sources/layers.txt#L20 [2] git://github.com/Angstrom-distribution/meta-linaro.git [3] git://git.linaro.org/openembedded/meta-linaro.git

Here's my diff to see what has to be changed:

diff --git a/sources/layers.txt b/sources/layers.txt index 4acfc1a..793280d 100644 --- a/sources/layers.txt +++ b/sources/layers.txt @@ -17,7 +17,7 @@ meta-java,git://github.com/woglinde/meta-java.git,master,75dee76c7cfbf1418e5c581 meta-browser,git://github.com/Angstrom-distribution/meta-browser.git,angstrom-staging-yocto1.3,HEAD meta-mono,git://git.yoctoproject.org/meta-mono.git,master,adf47f078dbf788a80ff1398a15a4fd5a334d320 meta-kde,git://gitorious.org/openembedded-core-layers/meta-kde.git,master,316d9c27e72cfebc7618268f8766624ee3f5e18e -meta-linaro,git://github.com/Angstrom-distribution/meta-linaro.git,danny,HEAD +meta-linaro,git://git.linaro.org/openembedded/meta-linaro.git,danny,HEAD meta-minnow,git://git.yoctoproject.org/meta-minnow,danny,HEAD meta-allwinner,git://github.com/naguirre/meta-allwinner.git,danny,HEAD meta-ros,git://github.com/bmwcarit/meta-ros.git,master,7e2cd2c0952ee35e30c8e3f9dc57f277d58419b8

koenkooi commented 11 years ago

The mirror has been updated with the other branches now