Procházet zdrojové kódy

Remove GRUB ISO generation and references to it.

Giovanni Mascellani před 5 roky
rodič
revize
c027c73711
3 změnil soubory, kde provedl 3 přidání a 69 odebrání
  1. 1 25
      Makefile
  2. 2 12
      README.md
  3. 0 32
      boot/grub.cfg

+ 1 - 25
Makefile

@@ -6,7 +6,7 @@ ifeq ($(UNAME),Linux)
 FOUND := 1
 AR=ar
 USE_NASM=0
-all: build build/asmasm_linux build/boot_asmasm.x86 build/boot_empty.x86 build/boot_asmg.x86 build/boot_asmg0.x86 build/boot.iso
+all: build build/asmasm_linux build/boot_asmasm.x86 build/boot_empty.x86 build/boot_asmg.x86 build/boot_asmg0.x86
 endif
 
 ifeq ($(UNAME),Darwin)
@@ -169,27 +169,3 @@ build/asmg0.x86: build/asmg0.x86.exe asmg0/main.g0
 
 build/boot_asmg0.x86: build/bootloader.x86.mbr build/bootloader.x86.stage2 build/asmg0.x86
 	./create_partition.py $^ > $@
-
-# GRUB ISO image
-build/boot/boot/grub/grub.cfg: boot/grub.cfg
-	mkdir -p build/boot/boot/grub
-	cp $^ $@
-
-build/boot/boot/asmasm.x86: build/asmasm.x86
-	mkdir -p build/boot/boot
-	cp $^ $@
-
-build/boot/boot/empty.x86: build/empty.x86
-	mkdir -p build/boot/boot
-	cp $^ $@
-
-build/boot/boot/asmg.x86: build/asmg.x86
-	mkdir -p build/boot/boot
-	cp $^ $@
-
-build/boot/boot/asmg0.x86: build/asmg0.x86
-	mkdir -p build/boot/boot
-	cp $^ $@
-
-build/boot.iso: build/boot/boot/grub/grub.cfg build/boot/boot/asmasm.x86 build/boot/boot/empty.x86 build/boot/boot/asmg.x86 build/boot/boot/asmg0.x86
-	cd build && grub-mkrescue -o boot.iso boot

+ 2 - 12
README.md

@@ -32,7 +32,7 @@ You should use Linux to compile `asmc`, although some parts of it can
 also be built on macOS. If you use Debian, install the prerequisites
 with
 
-    sudo apt-get install build-essential nasm qemu-system-x86 grub-common python3 gcc-multilib
+    sudo apt-get install build-essential nasm qemu-system-x86 python3 gcc-multilib
 
 If you cloned the GIT repository, you will probably want to checkout
 the submodules as well:
@@ -63,12 +63,7 @@ actually have a complete operating system entirely compiled from
 scratches at computer boot!
 
 Together with `boot_asmg.x86`, there will be also `boot_empty.x86`,
-`boot_asmasm.x86` and `boot_asmg0.x86` (see below for what they are)
-and `boot.iso`, which is a bootable ISO image with a GRUB menu where
-you can decide which of the four to run. Such ISO was useful to boot
-`asmc` back in the days when my custom bootloader was not powerful
-enough, but nowadays `asmg` requires some features that GRUB does not
-expose, so it is useless.
+`boot_asmasm.x86` and `boot_asmg0.x86` (see below for what they are).
 
 WARNING! ATTENTION! Remember that you are giving full control over you
 hardware to an experimental program whose author is not an expert
@@ -77,11 +72,6 @@ disk, damage the hardware and whatever. I only run it on an old
 otherwise unused laptop that once belonged to my grandmother. No
 problem has ever become apparent, but care is never too much!
 
-If you use macOS you can build the `boot_*.x86` files, but not
-`boot.iso`, because I did not find a reasonable way to install
-`grub-mkimage` on macOS. If you use Windows or any other operating
-system, nothing will work.
-
 ### How to interpret all the writings
 
 For the full story, read below and the code. However, just to have an

+ 0 - 32
boot/grub.cfg

@@ -1,32 +0,0 @@
-# This file is part of asmc, a bootstrapping OS with minimal seed
-# Copyright (C) 2018 Giovanni Mascellani <gio@debian.org>
-# https://gitlab.com/giomasce/asmc
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-menuentry "asmg" {
-	multiboot /boot/asmg.x86
-}
-
-menuentry "asmg0" {
-	multiboot /boot/asmg0.x86
-}
-
-menuentry "asmasm" {
-	multiboot /boot/asmasm.x86
-}
-
-menuentry "empty" {
-	multiboot /boot/empty.x86
-}