From e6aa4eccd99e1ddd9732c78bdc1f49446cc9c9c4 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 8 May 2012 20:25:05 +0300 Subject: [PATCH] use/installer/kms Just like livecd-install, graphical installer KMS support looks better as an optional part of install2 feature. Of course it's optional only if the release manager is fine with VESA drivers and not KMS-requiring intel/radeon/nouveau; thanks led@ for a confirmation just in case. --- features.in/install2/config.mk | 5 +++++ lib/distro.mk | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/features.in/install2/config.mk b/features.in/install2/config.mk index 8f983ace..c2e5416f 100644 --- a/features.in/install2/config.mk +++ b/features.in/install2/config.mk @@ -1,3 +1,4 @@ +# alterator-based installer, second (livecd) stage use/install2: use/stage2 sub/stage2/install2 use/metadata use/cleanup/installer @$(call add_feature) @$(call set,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2) @@ -8,6 +9,10 @@ use/install2: use/stage2 sub/stage2/install2 use/metadata use/cleanup/installer use/install2/net: use/install2 @$(call add,INSTALL2_PACKAGES,curl) +# modern free xorg drivers for mainstream hardware requires KMS support +use/install2/kms: + @$(call set,STAGE1_KMODULES_REGEXP,drm.*) + # see also use/vm/kvm/guest; qxl included in xorg pkglist use/install2/kvm: @$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl) diff --git a/lib/distro.mk b/lib/distro.mk index 92a46128..4c7e8bea 100644 --- a/lib/distro.mk +++ b/lib/distro.mk @@ -30,10 +30,9 @@ distro/.base: distro/.init use/kernel # something marginally useful (as a network-only installer) # NB: doesn't carry stage3 thus cannot use/bootloader -distro/installer: distro/.base use/install2 use/install2/kvm \ - use/syslinux/localboot.cfg +distro/installer: distro/.base use/syslinux/localboot.cfg \ + use/install2 use/install2/kms use/install2/kvm @$(call set,INSTALLER,altlinux-generic) - @$(call set,STAGE1_KMODULES_REGEXP,drm.*) # for KMS distro/.installer: distro/installer use/bootloader/grub use/repo/main; @: