Changeset 239e32b8 in mainline


Ignore:
Timestamp:
2017-06-07T16:11:59Z (8 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c09ff7b
Parents:
4646710
Message:

build initrd also for the targets that use GRUB

Location:
boot
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.build

    r4646710 r239e32b8  
    148148        $(MKARRAY) --deflate $(COMPS) $(COMP) "$(AS_PROLOG)" ".section .components, \"a\"" $^
    149149
    150 $(INITRD).img:
    151 ifeq ($(RDFMT),tmpfs)
    152         $(MKTMPFS) $(DIST_PATH) $@
    153 endif
    154 ifeq ($(RDFMT),fat)
    155         $(MKFAT) 1048576 $(DIST_PATH) $@
    156 endif
    157 ifeq ($(RDFMT),ext4fs)
    158         $(MKEXT4) 1048576 $(DIST_PATH) $@
    159 endif
     150include Makefile.initrd
    160151
    161152$(ARCH_INCLUDE): arch/$(KARCH)/include/

  • boot/Makefile.grub

    r4646710 r239e32b8  
    5757endif
    5858
    59 build_dist: clean
     59build_dist: clean $(COMPONENTS)
    6060        mkdir -p $(BOOT)
    6161        cp -r -L $(GRUB) $(BOOT)/grub
    … …  
    9595clean:
    9696        rm -fr $(DISTROOT)
     97
     98include Makefile.initrd

  • boot/arch/amd64/Makefile.inc

    r4646710 r239e32b8  
    7070
    7171BOOT_OUTPUT = $(ROOT_PATH)/image.iso
    72 PREBUILD = $(INITRD).img
    7372BUILD = Makefile.grub
Note: See TracChangeset for help on using the changeset viewer.