Changeset 28fcaee in mainline

Timestamp:

2019-08-17T12:49:43Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

643640a

Parents:

fd6c8b1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-28 13:28:59)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

amd64 boot

Files:

• boot/Makefile (modified) (1 diff)
• boot/Makefile.grub (modified) (1 diff)
• boot/arch/abs32le/Makefile.inc (modified) (1 diff)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• boot/arch/amd64/meson.build (added)
• boot/grub/build_dist.sh.in (added)
• boot/grub/grub.cfg.in (added)
• boot/grub/meson.build (added)
• boot/meson.build (added)
• kernel/meson.build (modified) (1 diff)
• meson.build (modified) (5 diffs)
• tools/ew.py (modified) (1 diff)
• uspace/meson.build (modified) (4 diffs)

boot/Makefile

@@ -31 +31 @@
 include Makefile.common
 
-all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(PREBUILD)
+all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
         $(MAKE) -r -f $(BUILD) PRECHECK=$(PRECHECK)
 ifneq ($(POSTBUILD),)

boot/Makefile.grub

@@ -27 +27 @@
 #
 
-.PHONY: all build_dist clean
+.PHONY: all
+all:
 
-include Makefile.common
-
-GRUB = grub/$(BARCH)-$(GRUB_ARCH)
-BOOT = $(DISTROOT)/boot
-BOOT_CONFIG = $(BOOT)/grub/grub.cfg
-
-ELTORITO = boot/grub/$(GRUB_ARCH).img
-IMAGE = $(DISTROOT)/$(ELTORITO)
-
-ifeq ($(GRUB_ARCH),pc)
-        MULTIBOOT_CMD = multiboot
-        MODULE_CMD = module
-endif
-ifeq ($(GRUB_ARCH),efi)
-        MULTIBOOT_CMD = multiboot2
-        MODULE_CMD = module2
-endif
-
-all: $(POST_OUTPUT)
-
-$(POST_OUTPUT): build_dist
-ifeq ($(GRUB_ARCH),pc)
-        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS-CD" -eltorito-boot $(ELTORITO) -no-emul-boot -boot-info-table -o $@ $(DISTROOT)/
-endif
-ifeq ($(GRUB_ARCH),efi)
-        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS-CD" --efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
-endif
-
-build_dist: clean $(COMPONENTS)
-        mkdir -p $(BOOT)
-        cp -r -L $(GRUB) $(BOOT)/grub
-ifeq ($(GRUB_ARCH),efi)
-        gunzip $(IMAGE)
-endif
-
-ifeq ($(GRUB_LOADER),multiboot)
-        for module in $(COMPONENTS) ; do \
-                cp "$$module" $(BOOT)/ ; \
-        done
-endif
-ifeq ($(GRUB_LOADER),chainloader)
-        cp "$(BOOT_OUTPUT)" $(BOOT)/
-endif
-
-        echo "set default=0" > $(BOOT_CONFIG)
-        echo "set timeout=10" >> $(BOOT_CONFIG)
-        echo "" >> $(BOOT_CONFIG)
-
-ifeq ($(GRUB_ARCH),pc)
-        echo "insmod vbe" >> $(BOOT_CONFIG)
-        echo "insmod vga" >> $(BOOT_CONFIG)
-endif
-ifeq ($(GRUB_ARCH),efi)
-        echo "insmod efi_gop" >> $(BOOT_CONFIG)
-        echo "insmod efi_uga" >> $(BOOT_CONFIG)
-endif
-        echo "" >> $(BOOT_CONFIG)
-
-        echo "menuentry 'HelenOS $(RELEASE)' --class helenos --class os {" >> $(BOOT_CONFIG)
-ifeq ($(GRUB_LOADER),multiboot)
-        for module in $(MODULES) ; do \
-                echo "  echo 'Loading $$module'" >> $(BOOT_CONFIG) ; \
-                if [ "$$module" = "kernel.elf" ] ; then \
-                        echo "  $(MULTIBOOT_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
-                else \
-                        echo "  $(MODULE_CMD) /boot/$$module /boot/$$module" >> $(BOOT_CONFIG) ; \
-                fi \
-        done
-endif
-ifeq ($(GRUB_LOADER),chainloader)
-        echo "  echo 'Loading $(BOOT_OUTPUT)'" >> $(BOOT_CONFIG)
-        echo "  chainloader /boot/$(BOOT_OUTPUT)" >> $(BOOT_CONFIG)
-        echo "  boot" >> $(BOOT_CONFIG)
-endif
-        echo "}" >> $(BOOT_CONFIG)
-
-clean:
-        rm -fr $(DISTROOT)
-
-include Makefile.initrd

boot/arch/abs32le/Makefile.inc

@@ -31 +31 @@
 JOB =
 MAP =
-PREBUILD =
 BUILD = Makefile.empty

boot/arch/amd64/Makefile.inc

@@ -27 +27 @@
 #
 
-RD_DRV_CFG += \
-        bus/isa
-
 POST_OUTPUT = $(ROOT_PATH)/image.iso
 BUILD = Makefile.empty

kernel/meson.build

@@ -166 +166 @@
 endforeach
 
+rd_init_binaries += [[ kernel_elf, 'boot/kernel.elf' ]]
+
 install_files += [[ 'boot', kernel_elf.full_path(), 'kernel.elf' ]]
 install_deps += [ kernel_elf ]

meson.build

@@ -22 +22 @@
 unzip = find_program('unzip')
 which = find_program('which')
-sh = find_program('sh')
+sh = [ find_program('sh'), '-x', '-u', '-e' ]
 mkext4 = find_program('tools/mkext4.py')
 mkfat = find_program('tools/mkfat.py')
+cp = find_program('cp')
+
+genisoimage = find_program('genisoimage', required: false)
+
+if not genisoimage.found()
+        genisoimage = find_program('mkisofs', required: false)
+endif
+
+if not genisoimage.found()
+        xorriso = find_program('xorriso', required: false)
+
+        if xorriso.found()
+                genisoimage = [ xorriso, '-as', 'genisoimage' ]
+        else
+                error('Need genisoimage, mkisofs or xorriso.')
+        endif
+endif
+
 
 autocheck = generator(find_program('tools/autocheck.awk'),
@@ -136 +154 @@
         'UARCH',
         'KARCH',
+        'BARCH',
+        'GRUB_ARCH',
 ]
 
@@ -275 +295 @@
 # Init binaries.
 rd_init = [
+        # IMPORTANT: The order of entries is important for bootloader!
+        'srv/ns',
+        'srv/loader',
         'app/init',
+        'srv/locsrv',
         'srv/bd/rd',
+        'srv/vfs',
+        'srv/logger',
         'srv/fs/' + RDFMT,
-        'srv/loader',
-        'srv/locsrv',
-        'srv/logger',
-        'srv/ns',
-        'srv/vfs',
-]
+]
+
+# References to the actual binary files. Filled in by uspace.
+rd_init_binaries = []
 
 # Binaries allowed on the initrd image when CONFIG_BAREBONE is enabled.
@@ -451 +475 @@
         output: 'dist.tag',
         input: [ install_script, install_deps ],
-        command: [ sh, '-x', '-u', '-e', '@INPUT0@', '@OUTPUT@', dist_dir ],
-        build_by_default: true,
+        command: [ sh, '@INPUT0@', '@OUTPUT@', dist_dir ],
 )
 
@@ -471 +494 @@
         input: dist,
         command: initrd_cmd,
+)
+
+rd_init_binaries += [[ initrd_img, 'boot/initrd.img' ]]
+
+subdir('boot')
+
+custom_target(POST_OUTPUT,
+        output: POST_OUTPUT,
+        input: POST_INPUT,
+        command: [ cp, '@INPUT@', '@OUTPUT@' ],
         build_by_default: true,
 )
-

tools/ew.py

@@ -270 +270 @@
 
         if cfg['image'] == 'image.iso':
-                cmdline += ' -boot d -cdrom image.iso'
+                cmdline += ' -boot d -cdrom build/image.iso'
         elif cfg['image'] == 'image.iso@arm64':
                 # Define image.iso cdrom backend.

uspace/meson.build

@@ -127 +127 @@
                         'c_args': c_args,
                         'link_args': link_args + (static_build ? [ '-static' ] : []),
+                        'init': rd_init.contains(dir),
                 }
         endif
@@ -143 +144 @@
                         'c_args': c_args,
                         'link_args': link_args,
+                        'init': false,
                 }
         endif
@@ -157 +159 @@
         _build_name = _full_install_path.underscorify()
         _full_build_name = meson.current_build_dir() / _build_name
+        _is_init = tst.get('init')
 
         if link_map
@@ -174 +177 @@
         )
 
+        if _is_init
+                rd_init_binaries += [[ _bin, _full_install_path ]]
+        endif
+
         if disassemble
                 _disasm = custom_target(_build_name + '.disasm',