Second Extended Filesystem (ext2) and other improvements (#33)

[lunaix-os.git] / lunaix-os / makefile

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 54272750b589f00a2fc3075030bc5576bf5c9196..f53d62ea418a1fba0f0a3ae0596b86099ef5748c 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -4,6 +4,7 @@ include $(mkinc_dir)/toolchain.mkinc
 include $(mkinc_dir)/utils.mkinc
 include $(mkinc_dir)/lunabuild.mkinc
 
 include $(mkinc_dir)/utils.mkinc
 include $(mkinc_dir)/lunabuild.mkinc
 

+QEMU_HMP ?= 45454

 ARCH ?= i386
 MODE ?= debug
 export ARCH
 ARCH ?= i386
 MODE ?= debug
 export ARCH


@@ -54,7 +55,7 @@ image: $(kbuild_dir) kernel usr/build
        @cp -r usr/build/* $(os_img_dir)/usr
        @cp -r $(kbin_dir)/* $(os_img_dir)/boot
        @grub-mkrescue -o $(kimg) $(os_img_dir)\
        @cp -r usr/build/* $(os_img_dir)/usr
        @cp -r $(kbin_dir)/* $(os_img_dir)/boot
        @grub-mkrescue -o $(kimg) $(os_img_dir)\

-               -- -volid "$(OS_ID) $(OS_VER)" -system_id "$(OS_NAME)" \
+               -- -volid "LUNA" -system_id "Lunaix" \

                -report_about FAILURE -abort_on FAILURE
 
 usr/build: user
                -report_about FAILURE -abort_on FAILURE
 
 usr/build: user


@@ -70,4 +71,4 @@ clean:
        @$(MAKE) -C usr clean -I $(mkinc_dir)
        @$(MAKE) -f kernel.mk clean -I $(mkinc_dir)
        @rm -rf $(kbuild_dir) || exit 1
        @$(MAKE) -C usr clean -I $(mkinc_dir)
        @$(MAKE) -f kernel.mk clean -I $(mkinc_dir)
        @rm -rf $(kbuild_dir) || exit 1

-       @rm -rf .builder || exit 1
\ No newline at end of file
+       @rm -rf .builder || exit 1