search

MiSTer-DB9 / Issues

Issues about any fork contained in this organization should be placed here.
0 stars 0 forks source link

Main_MiSTer conflicts (help wanted) #9

Closed theypsilon closed 3 years ago

theypsilon commented 3 years ago

Currently there is a conflict with upstream that has to be solved. Could somebody more free take a look at it?

See: image https://github.com/MiSTer-DB9/Main_MiSTer/runs/1983117625?check_suite_focus=true

Task:

  1. Checkout MiSTer-DB9/Main_MiSTer fork
  2. Merge MiSTer-devel/Main_MiSTer
  3. Resolve conflicts, test and push.

How to compile Main_MiSTer:

  1. Unzip https://releases.linaro.org/components/toolchain/binaries/latest-6/arm-linux-gnueabihf/gcc-linaro-6.5.0-2018.12-x86_64_arm-linux-gnueabihf.tar.xz
  2. Put it in your path: PATH="/gcc-linaro/bin:${PATH}"
  3. Run make on the repository.
neurorulez commented 3 years ago

Fixed