[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Lost] [Patch] Buildsystem - Ein bisschen aufräumen
Dieser Patch sorgt für ein bisschen mehr übersicht in build/ und auf den
Images. Zusätzlich werden jetzt die Anwendungen auch komprimiert.
=== build/data/Vera.ttf
==================================================================
Cannot display: file marked as a binary type.
Property changes on: build/data/Vera.ttf
___________________________________________________________________
Name: svn:mime-type
-application/octet-stream
=== build/default.cfg
==================================================================
--- build/default.cfg (revision 1451)
+++ build/default.cfg (local)
@@ -1,13 +1,13 @@
title LOST
-kernel /lost.kgz debug=s
-module /init.mgz
-module /vterm.mgz
-module /console.mgz vterm:/vterm0/out vterm:/vterm0/in
-module /dma.mgz
-module /floppy.mgz
-module /fat.mgz
-module /kbc.mgz
-module /cmos.mgz
-module /pci.mgz
+kernel /boot/lost debug=s
+module /modules/init
+module /modules/vterm
+module /modules/console vterm:/vterm0/out vterm:/vterm0/in
+module /modules/dma
+module /modules/floppy
+module /modules/fat
+module /modules/kbc
+module /modules/cmos
+module /modules/pci
module /apps/sh
boot
=== build/root/data/Vera.ttf
==================================================================
Cannot display: file marked as a binary type.
Property changes on: build/root/data/Vera.ttf
___________________________________________________________________
Name: svn:mime-type
+application/octet-stream
=== buildmk.sh
==================================================================
--- buildmk.sh (revision 1451)
+++ buildmk.sh (local)
@@ -77,7 +77,7 @@
ASM_ELF=nasm -felf -O99 $NASMINCLUDES
ASM_BIN=nasm -fbin -O99
-BUILD_ROOT=$LOST_BUILDMK_ROOT/build
+BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output
BUILD_DIR=`pwd | sed s#^$LOST_BUILDMK_ROOT#\$\(BUILD_ROOT\)#`
AS=$LOST_TOOLS_AS
@@ -225,29 +225,38 @@
PATH=\$\$PATH:/sbin:/usr/sbin:/usr/local/sbin ;\
dd if=/dev/zero of=build/lost.img bs=1024 count=1440 ;\
mkfs.msdos build/lost.img ;\
- mmd -i build/lost.img ::/grub ;\
- mcopy -i build/lost.img /boot/grub/stage? ::/grub ;\
- mcopy -i build/lost.img build/default.cfg ::/grub/menu.lst ;\
+ mmd -i build/lost.img ::/boot ;\
+ mmd -i build/lost.img ::/boot/grub ;\
+ mmd -i build/lost.img ::/modules ;\
+ mmd -i build/lost.img ::/apps ;\
+ mcopy -i build/lost.img /boot/grub/stage? ::/boot/grub ;\
+ mcopy -i build/lost.img build/default.cfg ::/boot/grub/menu.lst ;\
echo device '(fd0)' build/lost.img > build/grub.txt ;\
echo root '(fd0)' >> build/grub.txt ;\
echo setup '(fd0)' >> build/grub.txt ;\
- grub --batch < build/grub.txt ;\
+ grub --batch < build/grub.txt ;\
rm build/grub.txt ;\
fi
- for i in build/*.krn; do \
- gzip -c \$\$i > build/\`basename \$\$i .krn\`.kgz ;\
+ for i in build/output/kernel/*; do \
+ gzip -c \$\$i > build/output/gz/kernel/\`basename \$\$i\` ;\
done
- for i in build/*.mod; do \
- gzip -c \$\$i > build/\`basename \$\$i .mod\`.mgz ;\
+ for i in build/output/modules/*; do \
+ gzip -c \$\$i > build/output/gz/modules/\`basename \$\$i\` ;\
done
- mcopy -D o -i build/lost.img build/default.cfg ::/grub/menu.lst
- mcopy -D o -i build/lost.img build/*.kgz ::/
- mcopy -D o -i build/lost.img build/*.mgz ::/
- mcopy -D o -i build/lost.img build/apps ::/
- mcopy -D o -i build/lost.img build/data ::/
+ for i in build/output/apps/*; do \
+ gzip -c \$\$i > build/output/gz/apps/\`basename \$\$i\` ;\
+ done
+
+
+ mcopy -D o -i build/lost.img build/default.cfg ::/boot/grub/menu.lst
+
+ mcopy -D o -i build/lost.img build/output/gz/kernel/* ::/boot/
+ mcopy -D o -i build/lost.img build/output/gz/modules/* ::/modules/
+ mcopy -D o -i build/lost.img build/output/gz/apps/* ::/apps/
+ mcopy -D o -i build/lost.img build/root/* ::/
image:
make --no-print-directory -s all
=== src/kernel/src/Makefile.all
==================================================================
--- src/kernel/src/Makefile.all (revision 1451)
+++ src/kernel/src/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/lost.krn"
+echo "LD $1/kernel/lost"
$LOST_TOOLS_LD -olost.krn -Tkernel.ld header.o !(header).o $2
-mv lost.krn $1/
+mv lost.krn $1/kernel/lost
=== src/kernel2/src/arch/amd64/Makefile.all
==================================================================
--- src/kernel2/src/arch/amd64/Makefile.all (revision 1451)
+++ src/kernel2/src/arch/amd64/Makefile.all (local)
@@ -15,4 +15,4 @@
$LOST_TOOLS_LD -olost2.krn -Tloader/loader.ld loader/startup.o loader/!(startup).o kernel.o $2
-mv lost2.krn $1/
+mv lost2.krn $1/kernel/lost2
=== src/kernel2/src/arch/i386/Makefile.all
==================================================================
--- src/kernel2/src/arch/i386/Makefile.all (revision 1451)
+++ src/kernel2/src/arch/i386/Makefile.all (local)
@@ -8,6 +8,6 @@
$LOST_TOOLS_OBJCOPY -B i386:i386 -I binary -O elf32-i386 rm_trampoline.o rm_trampo_conv.o
rm rm_trampoline.o
-echo "LD $1/lost2.krn"
+echo "LD $1/kernel/lost2"
$LOST_TOOLS_LD -olost2.krn -Tkernel.ld header.o --start-group !(header).o */*.o $KERNEL/*.o $KERNEL/*/!(rm_trampoline).o $2 --end-group
-mv lost2.krn $1/
+mv lost2.krn $1/kernel/lost2
=== src/modules/cdi/ata/Makefile.all
==================================================================
--- src/modules/cdi/ata/Makefile.all (revision 1451)
+++ src/modules/cdi/ata/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/ata.mod"
+echo "LD $1/modules/ata"
$LOST_TOOLS_LD -oata.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s ata.mod -o $1/ata.mod
+$LOST_TOOLS_STRIP -s ata.mod -o $1/modules/ata
=== src/modules/cdi/floppy/Makefile.all
==================================================================
--- src/modules/cdi/floppy/Makefile.all (revision 1451)
+++ src/modules/cdi/floppy/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/cdi_floppy.mod"
+echo "LD $1/modules/cdi_floppy"
$LOST_TOOLS_LD -ocdi_floppy.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s cdi_floppy.mod -o $1/cdi_floppy.mod
+$LOST_TOOLS_STRIP -s cdi_floppy.mod -o $1/modules/cdi_floppy
=== src/modules/cdi/sis900/Makefile.all
==================================================================
--- src/modules/cdi/sis900/Makefile.all (revision 1451)
+++ src/modules/cdi/sis900/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/sis900.mod"
+echo "LD $1/modules/sis900"
$LOST_TOOLS_LD -osis900.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s sis900.mod -o $1/sis900.mod
+$LOST_TOOLS_STRIP -s sis900.mod -o $1/modules/sis900
=== src/modules/cmos/Makefile.all
==================================================================
--- src/modules/cmos/Makefile.all (revision 1451)
+++ src/modules/cmos/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/cmos.mod"
+echo "LD $1/modules/cmos"
$LOST_TOOLS_LD -ocmos.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s cmos.mod -o $1/cmos.mod
+$LOST_TOOLS_STRIP -s cmos.mod -o $1/modules/cmos
=== src/modules/console/Makefile.all
==================================================================
--- src/modules/console/Makefile.all (revision 1451)
+++ src/modules/console/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/console.mod"
+echo "LD $1/modules/console"
$LOST_TOOLS_LD -Ttext=0x40000000 -oconsole.mod *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s console.mod -o $1/console.mod
+$LOST_TOOLS_STRIP -s console.mod -o $1/modules/console
=== src/modules/cpp/cpptest/Makefile.all
==================================================================
--- src/modules/cpp/cpptest/Makefile.all (revision 1451)
+++ src/modules/cpp/cpptest/Makefile.all (local)
@@ -1,7 +1,7 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/cpptest.mod"
-$LOST_TOOLS_LD -ocpptest.mod -T../lib/linkcpp.ld --start-group ../lib/start.o ../lib/startup.o *.o $2 --end-group
-mv cpptest.mod $1/
+echo "LD $1/apps/cpptest"
+$LOST_TOOLS_LD -ocpptest -T../lib/linkcpp.ld --start-group ../lib/start.o ../lib/startup.o *.o $2 --end-group
+$LOST_TOOLS_STRIP cpptest $1/apps/cpptest
=== src/modules/dma/Makefile.all
==================================================================
--- src/modules/dma/Makefile.all (revision 1451)
+++ src/modules/dma/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/dma.mod"
+echo "LD $1/modules/dma"
$LOST_TOOLS_LD -odma.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s dma.mod -o $1/dma.mod
+$LOST_TOOLS_STRIP -s dma.mod -o $1/modules/dma
=== src/modules/ext2/Makefile.all
==================================================================
--- src/modules/ext2/Makefile.all (revision 1451)
+++ src/modules/ext2/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/ext2.mod"
+echo "LD $1/modules/ext2"
$LOST_TOOLS_LD -Ttext=0x40000000 -oext2.mod *.o libext2/*.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s ext2.mod -o $1/ext2.mod
+$LOST_TOOLS_STRIP -s ext2.mod -o $1/modules/ext2
=== src/modules/fat/Makefile.all
==================================================================
--- src/modules/fat/Makefile.all (revision 1451)
+++ src/modules/fat/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/fat.mod"
+echo "LD $1/modules/fat"
$LOST_TOOLS_LD -ofat.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s fat.mod -o $1/fat.mod
+$LOST_TOOLS_STRIP -s fat.mod -o $1/modules/fat
=== src/modules/file/Makefile.all
==================================================================
--- src/modules/file/Makefile.all (revision 1451)
+++ src/modules/file/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/file.mod"
+echo "LD $1/modules/file"
$LOST_TOOLS_LD -ofile.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s file.mod -o $1/file.mod
+$LOST_TOOLS_STRIP -s file.mod -o $1/modules/file
=== src/modules/floppy/Makefile.all
==================================================================
--- src/modules/floppy/Makefile.all (revision 1451)
+++ src/modules/floppy/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/floppy.mod"
+echo "LD $1/modules/floppy"
$LOST_TOOLS_LD -ofloppy.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s floppy.mod -o $1/floppy.mod
+$LOST_TOOLS_STRIP -s floppy.mod -o $1/modules/floppy
=== src/modules/gui/Makefile.all
==================================================================
--- src/modules/gui/Makefile.all (revision 1451)
+++ src/modules/gui/Makefile.all (local)
@@ -1,9 +1,9 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/gui.mod"
+echo "LD $1/modules/gui"
$LOST_TOOLS_LD -Ttext=0x40000000 -ogui.mod src/*.o src/freetype/base/ftbase.o src/freetype/base/ftsystem.o src/freetype/base/ftglyph.o src/freetype/base/ftbitmap.o src/freetype/base/ftinit.o src/freetype/autofit/autofit.o src/freetype/smooth/smooth.o src/freetype/psaux/psaux.o src/freetype/psnames/psnames.o src/freetype/pshinter/pshinter.o src/freetype/truetype/truetype.o src/freetype/raster/raster.o src/freetype/gzip/ftgzip.o src/freetype/lzw/ftlzw.o src/freetype/sfnt/sfnt.o --start-group $2 --end-group
-mv gui.mod $1/
+mv gui.mod $1/modules/gui
#Andere Formate (in def ftmodule.h aktivieren):
#src/freetype/type42/type42.o
#src/freetype/type1/type1.o
=== src/modules/init/Makefile.all
==================================================================
--- src/modules/init/Makefile.all (revision 1451)
+++ src/modules/init/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/init.mod"
+echo "LD $1/modules/init"
$LOST_TOOLS_LD -Ttext=0x40000000 -oinit.mod *.o */*.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s init.mod -o $1/init.mod
+$LOST_TOOLS_STRIP -s init.mod -o $1/modules/init
=== src/modules/kbc/Makefile.all
==================================================================
--- src/modules/kbc/Makefile.all (revision 1451)
+++ src/modules/kbc/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/kbc.mod"
+echo "LD $1/modules/kbc"
$LOST_TOOLS_LD -m elf_i386 -okbc.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s kbc.mod -o $1/kbc.mod
+$LOST_TOOLS_STRIP -s kbc.mod -o $1/modules/kbc
=== src/modules/pas/kirc/Makefile.all
==================================================================
--- src/modules/pas/kirc/Makefile.all (revision 1451)
+++ src/modules/pas/kirc/Makefile.all (local)
@@ -2,5 +2,5 @@
source $LOST_BUILDMK_ROOT/config.sh
echo "LD $1/apps/kirc"
-$LOST_TOOLS_LD -okirc.mod -Ttext=0x40000000 *.o --start-group ../lib/units/*.a $2 --end-group
-$LOST_TOOLS_STRIP -s kirc.mod -o $1/apps/kirc
+$LOST_TOOLS_LD -okirc -Ttext=0x40000000 *.o --start-group ../lib/units/*.a $2 --end-group
+$LOST_TOOLS_STRIP -s kirc -o $1/apps/kirc
=== src/modules/pas/pashello/Makefile.all
==================================================================
--- src/modules/pas/pashello/Makefile.all (revision 1451)
+++ src/modules/pas/pashello/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/pashello.mod"
-$LOST_TOOLS_LD -opashello.mod -Ttext=0x40000000 *.o --start-group ../lib/units/*.a $2 --end-group
-$LOST_TOOLS_STRIP -s pashello.mod -o $1/pashello.mod
+echo "LD $1/apps/pashello"
+$LOST_TOOLS_LD -opashello -Ttext=0x40000000 *.o --start-group ../lib/units/*.a $2 --end-group
+$LOST_TOOLS_STRIP -s pashello -o $1/apps/pashello
=== src/modules/pci/Makefile.all
==================================================================
--- src/modules/pci/Makefile.all (revision 1451)
+++ src/modules/pci/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/pci.mod"
+echo "LD $1/modules/pci"
$LOST_TOOLS_LD -opci.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s pci.mod -o $1/pci.mod
+$LOST_TOOLS_STRIP -s pci.mod -o $1/modules/pci
=== src/modules/rpcbench/Makefile.all
==================================================================
--- src/modules/rpcbench/Makefile.all (revision 1451)
+++ src/modules/rpcbench/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/rpcbench.mod"
+echo "LD $1/modules/rpcbench"
$LOST_TOOLS_LD -Ttext=0x40000000 -orpcbench.mod --start-group *.o $2 --end-group
-$LOST_TOOLS_STRIP -s rpcbench.mod -o $1/rpcbench.mod
+$LOST_TOOLS_STRIP -s rpcbench.mod -o $1/modules/rpcbench
=== src/modules/rtl8139/Makefile.all
==================================================================
--- src/modules/rtl8139/Makefile.all (revision 1451)
+++ src/modules/rtl8139/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/rtl8139.mod"
+echo "LD $1/modules/rtl8139"
$LOST_TOOLS_LD -Ttext=0x40000000 -ortl8139.mod *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s rtl8139.mod -o $1/rtl8139.mod
+$LOST_TOOLS_STRIP -s rtl8139.mod -o $1/modules/rtl8139
=== src/modules/skeleton/Makefile.all
==================================================================
--- src/modules/skeleton/Makefile.all (revision 1451)
+++ src/modules/skeleton/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/skeleton.mod"
+echo "LD $1/modules/skeleton"
$LOST_TOOLS_LD -Ttext=0x40000000 -oskeleton.mod *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s skeleton.mod -o $1/skeleton.mod
+$LOST_TOOLS_STRIP -s skeleton.mod -o $1/modules/skeleton
=== src/modules/speaker/Makefile.all
==================================================================
--- src/modules/speaker/Makefile.all (revision 1451)
+++ src/modules/speaker/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/speaker.mod"
+echo "LD $1/speaker"
$LOST_TOOLS_LD -Ttext=0x40000000 -ospeaker.mod *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s speaker.mod -o $1/speaker.mod
+$LOST_TOOLS_STRIP -s speaker.mod -o $1/modules/speaker
=== src/modules/sysinfo/Makefile.all
==================================================================
--- src/modules/sysinfo/Makefile.all (revision 1451)
+++ src/modules/sysinfo/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/sysinfo.mod"
+echo "LD $1/modules/sysinfo"
$LOST_TOOLS_LD -Ttext=0x40000000 -osysinfo.mod *.o --start-group $2 --end-group
-mv sysinfo.mod $1/
+$LOST_TOOLS_STRIP -s sysinfo.mod -o $1/modules/sysinfo
=== src/modules/tcpip/Makefile.all
==================================================================
--- src/modules/tcpip/Makefile.all (revision 1451)
+++ src/modules/tcpip/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/tcpip.mod"
+echo "LD $1/modules/tcpip"
$LOST_TOOLS_LD -Ttext=0x40000000 -otcpip.mod *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s tcpip.mod -o $1/tcpip.mod
+$LOST_TOOLS_STRIP -s tcpip.mod -o $1/modules/tcpip
=== src/modules/testlib/Makefile.all
==================================================================
--- src/modules/testlib/Makefile.all (revision 1451)
+++ src/modules/testlib/Makefile.all (local)
@@ -1,7 +1,7 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/tests.mod"
+echo "LD $1/modules/tests"
$LOST_TOOLS_LD -otests.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s tests.mod -o $1/tests.mod
+$LOST_TOOLS_STRIP -s tests.mod -o $1/modules/tests
=== src/modules/tmp/Makefile.all
==================================================================
--- src/modules/tmp/Makefile.all (revision 1451)
+++ src/modules/tmp/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/tmp.mod"
+echo "LD $1/modules/tmp"
$LOST_TOOLS_LD -otmp.mod -Ttext=0x40000000 *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s tmp.mod -o $1/tmp.mod
+$LOST_TOOLS_STRIP -s tmp.mod -o $1/modules/tmp
=== src/modules/vesa/Makefile.all
==================================================================
--- src/modules/vesa/Makefile.all (revision 1451)
+++ src/modules/vesa/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/vesa.mod"
+echo "LD $1/modules/vesa"
$LOST_TOOLS_LD -Ttext=0x40000000 -ovesa.mod *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s vesa.mod -o $1/vesa.mod
+$LOST_TOOLS_STRIP -s vesa.mod -o $1/modules/vesa
=== src/modules/vga/Makefile.all
==================================================================
--- src/modules/vga/Makefile.all (revision 1451)
+++ src/modules/vga/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/vga.mod"
+echo "LD $1/modules/vga"
$LOST_TOOLS_LD -Ttext=0x40000000 -ovga.mod *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s vga.mod -o $1/vga.mod
+$LOST_TOOLS_STRIP -s vga.mod -o $1/modules/vga
=== src/modules/vterm/Makefile.all
==================================================================
--- src/modules/vterm/Makefile.all (revision 1451)
+++ src/modules/vterm/Makefile.all (local)
@@ -1,6 +1,6 @@
shopt -s extglob
source $LOST_BUILDMK_ROOT/config.sh
-echo "LD $1/vterm.mod"
+echo "LD $1/modules/vterm"
$LOST_TOOLS_LD -Ttext=0x40000000 -ovterm.mod *.o --start-group $2 --end-group
-$LOST_TOOLS_STRIP -s vterm.mod -o $1/vterm.mod
+$LOST_TOOLS_STRIP -s vterm.mod -o $1/modules/vterm