| Message ID | 4D36DCBE.8040901@loskot.net |
|---|---|
| State | New |
| Headers | show |
On Wed, Jan 19, 2011 at 12:44 PM, Mateusz Loskot <mateusz@loskot.net> wrote: > Hi, > > Running ./configure (under MinGW/MSYS) and symlink gives up trying to > create links to non-existing Makefiles in > roms/seabios/Makefile > roms/vgabios/Makefile Those directiories are actually git submodules, when you run 'git submodule update', they get populated. Maybe configure should check if the directories are OK and disables building ROMs if not.
On 19/01/11 18:07, Blue Swirl wrote: > On Wed, Jan 19, 2011 at 12:44 PM, Mateusz Loskot<mateusz@loskot.net> wrote: >> Hi, >> >> Running ./configure (under MinGW/MSYS) and symlink gives up trying to >> create links to non-existing Makefiles in >> roms/seabios/Makefile >> roms/vgabios/Makefile > > Those directiories are actually git submodules, when you run 'git > submodule update', they get populated. Something is not quite working and I don't get anything populated. Here I tried under MinGW mloskot@dog /g/src/qemu/_git/master $ git pull Already up-to-date. mloskot@dog /g/src/qemu/_git/master $ git submodule update mloskot@dog /g/src/qemu/_git/master $ ls roms/seabios/ config.mak I also tested on Linux, same results, nothing pulled. > Maybe configure should check if the directories are OK and disables > building ROMs if not. Generally, if they are optional, I think it's a good idea. Specifically, I'm nearly completely green about qemu internals, so can't tell. Best regards,
On Thu, Jan 20, 2011 at 10:51:17AM +0000, Mateusz Loskot wrote: > On 19/01/11 18:07, Blue Swirl wrote: > >On Wed, Jan 19, 2011 at 12:44 PM, Mateusz Loskot<mateusz@loskot.net> wrote: > >>Hi, > >> > >>Running ./configure (under MinGW/MSYS) and symlink gives up trying to > >>create links to non-existing Makefiles in > >>roms/seabios/Makefile > >>roms/vgabios/Makefile > > > >Those directiories are actually git submodules, when you run 'git > >submodule update', they get populated. > > Something is not quite working and I don't get anything populated. > Here I tried under MinGW > > mloskot@dog /g/src/qemu/_git/master > $ git pull > Already up-to-date. > > mloskot@dog /g/src/qemu/_git/master > $ git submodule update > > mloskot@dog /g/src/qemu/_git/master > $ ls roms/seabios/ > config.mak Make sure roms/{vgabios,seabios} are empty directories. $ git submodule init $ git submodule update This should clone the vgabios and seabios repos and checkout the correct commit. After this completes successfully you should have source trees under roms/{vgabios,seabios}. Stefan
On 20/01/11 10:58, Stefan Hajnoczi wrote: > On Thu, Jan 20, 2011 at 10:51:17AM +0000, Mateusz Loskot wrote: >> On 19/01/11 18:07, Blue Swirl wrote: >>> On Wed, Jan 19, 2011 at 12:44 PM, Mateusz Loskot<mateusz@loskot.net> wrote: >>>> Hi, >>>> >>>> Running ./configure (under MinGW/MSYS) and symlink gives up trying to >>>> create links to non-existing Makefiles in >>>> roms/seabios/Makefile >>>> roms/vgabios/Makefile >>> >>> Those directiories are actually git submodules, when you run 'git >>> submodule update', they get populated. >> >> Something is not quite working and I don't get anything populated. >> Here I tried under MinGW >> >> mloskot@dog /g/src/qemu/_git/master >> $ git pull >> Already up-to-date. >> >> mloskot@dog /g/src/qemu/_git/master >> $ git submodule update >> >> mloskot@dog /g/src/qemu/_git/master >> $ ls roms/seabios/ >> config.mak > > Make sure roms/{vgabios,seabios} are empty directories. > > $ git submodule init > $ git submodule update > > This should clone the vgabios and seabios repos and checkout the correct > commit. After this completes successfully you should have source trees > under roms/{vgabios,seabios}. I forgot about the "init" command. Works now. Thanks! Best regards,
diff --git a/configure b/configure index d68f862..92e2527 100755 --- a/configure +++ b/configure @@ -3235,7 +3235,6 @@ DIRS="$DIRS fsdev ui" FILES="Makefile tests/Makefile" FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" -FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.dtb $source_path/pc-bios/openbios-*; do FILES="$FILES pc-bios/`basename $bios_file`"