keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regular.mk: split out .regular-jeos-base

Browse Source 
This is needed for a custom autoinstalling image with grub
(as installer-feature-serial-stage3 doesn't support lilo
reliably yet); see bootloader feature's README regarding
the switch but the change is basically a no-op for the
.regular-jeos intermediate target.
This commit is contained in:
Michael Shigorin 2017-03-31 21:43:06 +03:00
parent 142dd30e77
commit 3330e24e1a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
conf.d/regular.mk
View File

@ -59,20 +59,25 @@ distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
@$(call add,THE_BRANDING,alterator) @$(call add,THE_BRANDING,alterator)
# common base for the very bare distros # common base for the very bare distros
distro/.regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \ distro/.regular-jeos-base: distro/.regular-bare +sysvinit \
use/branding use/bootloader/lilo use/syslinux/lateboot.cfg \ use/isohybrid use/branding use/bootloader/grub \
use/install2/repo use/install2/packages \ use/install2/repo use/install2/packages \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \ use/net/etcnet use/power/acpi/button
use/cleanup/jeos use/net/etcnet use/power/acpi/button @$(call set,BOOTVGA,)
@$(call add,STAGE2_BOOTARGS,vga=0)
@$(call add,BASE_KMODULES,guest scsi vboxguest)
@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
@$(call set,INSTALLER,altlinux-generic) @$(call set,INSTALLER,altlinux-generic)
@$(call add,INSTALL2_BRANDING,alterator notes) @$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator) # just to be cleaned up later on @$(call add,THE_BRANDING,alterator) # just to be cleaned up later on
@$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console) @$(call add,THE_PACKAGES,apt basesystem dhcpcd vim-console)
@$(call add,THE_LISTS,openssh) @$(call add,THE_LISTS,openssh)
# ...and for somewhat bare distros
distro/.regular-jeos: distro/.regular-jeos-base \
use/bootloader/lilo use/syslinux/lateboot.cfg \
use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
use/cleanup/jeos
@$(call add,BASE_KMODULES,guest scsi vboxguest)
@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
# NB: # NB:
# - stock cleanup is not enough (or installer-common-stage3 deps soaring) # - stock cleanup is not enough (or installer-common-stage3 deps soaring)
distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \ distro/regular-jeos: distro/.regular-jeos use/cleanup/jeos/full \