building error / Branch error. git merge. git pull. west update

RE: building error / Branch error. git merge. git pull. west update

henninglindseth — Thu, 11 Apr 2019 08:57:15 GMT

Thank u for all your help, I managed to set back to last week and now it works with command line.

-henning

RE: building error / Branch error. git merge. git pull. west update

Martin Lesund — Wed, 10 Apr 2019 07:19:12 GMT

Hi Henning,

Currently there is a workaround to use SES

if you are using SES v4.16 you should be able to use the almost the latest updates from master branch, by rolling back to last week.

That means.

cd ncs/nrf
git checkout 08b3d50860633bfc56107f7f9b61106c6087e70b
git checkout -b <choose_branch_name>
west update

Then you should be able to run SES

RE: building error / Branch error. git merge. git pull. west update

Martin Lesund — Tue, 09 Apr 2019 08:11:41 GMT

Hi Henning,

We are aware that SES does not work with the master-branch, and we are working on the fix so a new version should be released soon.

In the meantime I would recommend you to build via the command line as instructed here.

Note you need to add the "non-secure" for the application:

cmake -GNinja -DBOARD=nrf9160_pca10090ns ..

RE: building error / Branch error. git merge. git pull. west update

henninglindseth — Tue, 09 Apr 2019 06:45:02 GMT

Yes, now Ive done everything on the list, I worked so far, however when I set up samples to build in SES 4.14 and 4.16 I get the error that the EMproject is not valid. and when I tried to build in command prompter is says Configuring incomplete.
The samples worked on friday to build on the prompter. It worked fine on friday, I had a ticket about mqtt_simple sample error, but now its closed, cause it got fixed. but after west update on saturday, nothing is working on the new repo, only v0.3.0 to upload.

even done

set ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb

set GNUARMEMB_TOOLCHAIN_PATH=c:\gnuarmemb

RE: building error / Branch error. git merge. git pull. west update

Martin Lesund — Tue, 09 Apr 2019 06:08:57 GMT

Hi Henning,

Please do follow the steps shown in the Documentation referenced in my first post.

Let's start from a clean slate.

make a folder called "ncs"
inside that folder, use the command: (to clone the manifest repo "nrf")
```
west init -m https://github.com/NordicPlayground/fw-nrfconnect-nrf 
```
Then enter the following command: (to clone the project repositories)
```
west update
```

Then you are done, and the structure should look like this:

ncs
 |___ .west
 |___ mcuboot
 |___ nrf
 |___ nrfxlib
 |___ zephyr

If you want to update the repositories, then you just do a:

git pull

In the "nrf" repo. (not nrfxlib repo as shown in your screenshot)

and follow that up with a:

west update

To update all the repoes. That's kind of the neat thing with the west tool.

So it should look like this:

That the other repoes stays in a HEAD detached state is expected behavior and you do not need to change those.

Best Regards,

Martin L.

RE: building error / Branch error. git merge. git pull. west update

henninglindseth — Mon, 08 Apr 2019 13:52:09 GMT

as u see the manifest-rev and HEAD detached shows up agian after west update.

RE: building error / Branch error. git merge. git pull. west update

henninglindseth — Mon, 08 Apr 2019 13:44:15 GMT

I've done west update. but it comes back with a hash instead of MASTER. didn't you read the issue above? sorry a bit crancky cause I'va been sitting thw whole day with this thing.

to check if ive done something wrong.

1. I've deleted the local repos.

2. Clone them agian. and cloned the scripts etc.

3. then i've initiate west whit. west init -l (small L) nrf in the ncs directory.

4. Then west update. but instead of MASTER, it comes back with a hash.

5. to check what that hash is, I wrote " git branch " there i get * (HEAD detached at refs/heads/manifest-rev)
and a extra branch called "manifest-rev"

6. I tried to fixe the HEAD by reattche it and then merge the manifest-rev with master. even tried to delete it, but it reappare afte west update.

RE: building error / Branch error. git merge. git pull. west update

Martin Lesund — Mon, 08 Apr 2019 13:18:55 GMT

Hi Henning,

Please note that when updating repositories, you should only need to pull the latest update in the nrf repo and then just do a: west update

This is to bring the project repositories to a matching revision defined by the manifest file.

Documentation for updating the repositories.