make failed after updating#2

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

make failed after updating#2

Chris Efstathiou
I did install a fresh copy of the master and reapplied my changes mainly
to conf.xml and it worked just once, when i did "make clean" and "make"
again i got the below error at the end of the build:

luftboot.c: In function 'main':
luftboot.c:481:9: note: #pragma message: Luftboot using 12MHz external
clock to PLL it to 72MHz.
  #pragma message "Luftboot using 12MHz external clock to PLL it to 72MHz."
          ^~~~~~~
   CC      luftboot.elf
   create  luftboot.bin
   create  luftboot.hex
GENERATE ../../var/include/mavlink
error: Your local changes to the following files would be overwritten by
checkout:
     AEAD_Poly1305_64.c
     Hacl_Ed25519.c
     Makefile
Please, commit your changes or stash them before you can switch branches.
Aborting
Unable to checkout 'bca1a10ddc9bf6844b8b3ab1f895070523edd149' in
submodule path 'sw/ext/hacl-c'
Makefile:46: recipe for target 'hacl-c.update' failed
make[1]: *** [hacl-c.update] Error 1
Makefile:172: recipe for target 'ext' failed
make: *** [ext] Error 2


_______________________________________________
Paparazzi-devel mailing list
[hidden email]
https://lists.nongnu.org/mailman/listinfo/paparazzi-devel
Reply | Threaded
Open this post in threaded view
|

Re: make failed after updating#2

Michal Podhradsky
You seem to have changes in sw/ext/hacl-c
As the error message says - you need to remove or commit your local changes in sw/ext/hacl-c. Another option is a fresh git clone of paparazzi and then reapply your local changes there (of conf.xml)
M

On Sun, Mar 25, 2018 at 9:36 AM, Chris <[hidden email]> wrote:
I did install a fresh copy of the master and reapplied my changes mainly to conf.xml and it worked just once, when i did "make clean" and "make" again i got the below error at the end of the build:

luftboot.c: In function 'main':
luftboot.c:481:9: note: #pragma message: Luftboot using 12MHz external clock to PLL it to 72MHz.
 #pragma message "Luftboot using 12MHz external clock to PLL it to 72MHz."
         ^~~~~~~
  CC      luftboot.elf
  create  luftboot.bin
  create  luftboot.hex
GENERATE ../../var/include/mavlink
error: Your local changes to the following files would be overwritten by checkout:
    AEAD_Poly1305_64.c
    Hacl_Ed25519.c
    Makefile
Please, commit your changes or stash them before you can switch branches.
Aborting
Unable to checkout 'bca1a10ddc9bf6844b8b3ab1f895070523edd149' in submodule path 'sw/ext/hacl-c'
Makefile:46: recipe for target 'hacl-c.update' failed
make[1]: *** [hacl-c.update] Error 1
Makefile:172: recipe for target 'ext' failed
make: *** [ext] Error 2


_______________________________________________
Paparazzi-devel mailing list
[hidden email]
https://lists.nongnu.org/mailman/listinfo/paparazzi-devel


_______________________________________________
Paparazzi-devel mailing list
[hidden email]
https://lists.nongnu.org/mailman/listinfo/paparazzi-devel
Reply | Threaded
Open this post in threaded view
|

Re: make failed after updating#2

Chris Efstathiou
In reply to this post by Chris Efstathiou
Hi Michal

I definitely have not made any changes to those files :-)

In any case i erase everything  and installed a fresh copy of master
with git clone and after applying my code in it everything still works.

It looks to me that git pull is not working very well in updating all
the files because i have seen this build error too many times.

Chris


_______________________________________________
Paparazzi-devel mailing list
[hidden email]
https://lists.nongnu.org/mailman/listinfo/paparazzi-devel
Reply | Threaded
Open this post in threaded view
|

Re: make failed after updating#2

Michal Podhradsky
Hi Chris,

I am sorry to hear that it doesn't work reliably for you. if there is some issue with git itself, that is, unfortunately, something we can't influence (a bug report to git or github devs might be more useful).

Regards
M

On Sun, Mar 25, 2018 at 10:20 AM, Chris <[hidden email]> wrote:
Hi Michal

I definitely have not made any changes to those files :-)

In any case i erase everything  and installed a fresh copy of master with git clone and after applying my code in it everything still works.

It looks to me that git pull is not working very well in updating all the files because i have seen this build error too many times.

Chris



_______________________________________________
Paparazzi-devel mailing list
[hidden email]
https://lists.nongnu.org/mailman/listinfo/paparazzi-devel


_______________________________________________
Paparazzi-devel mailing list
[hidden email]
https://lists.nongnu.org/mailman/listinfo/paparazzi-devel