Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
mkimage-profiles
Commits
440ee3bb
Commit
440ee3bb
authored
Jul 09, 2019
by
Gleb Fotengauer-Malinovskiy
Committed by
Michael Shigorin
Aug 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
install2: enable kvm on all arches supported by qemu
parent
58dc0e85
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
16 deletions
+31
-16
config.mk
features.in/install2/config.mk
+31
-16
No files found.
features.in/install2/config.mk
View file @
440ee3bb
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+installer: use/install2/full; @:
+installer: use/install2/full; @:
else
else
+installer: use/install2/packages; @:
+installer: use/install2/packages
use/install2/vmguest
; @:
endif
endif
use/install2: use/stage2 sub/stage2@install2 use/metadata \
use/install2: use/stage2 sub/stage2@install2 use/metadata \
...
@@ -36,8 +36,38 @@ use/install2/stage3: use/install2
...
@@ -36,8 +36,38 @@ use/install2/stage3: use/install2
use/install2/fonts: use/fonts/install2; @:
use/install2/fonts: use/fonts/install2; @:
# see also use/vmguest
# see also use/vmguest
ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le,$(ARCH)))
# see also use/vmguest/kvm; qxl included in xorg pkglist
use/install2/kvm:
@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
# virtualbox guest support for installer
use/install2/vbox:
@$(call add,STAGE1_KMODULES,virtualbox-addition vboxguest)
@$(call add,INSTALL2_PACKAGES,xorg-drv-vboxvideo)
# see also use/vmguest/vmware
use/install2/vmware:
@$(call add,STAGE1_KMODULES,vmware)
@$(call add,STAGE1_KMODULES,scsi) # mptspi in led-ws
@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
use/install2/vmguest: use/install2/kvm use/install2/vbox use/install2/vmware; @:
else
use/install2/vmguest: use/install2/kvm; @:
endif
else
use/install2/vmguest: ; @:
endif
# stash local packages within installation media
# stash local packages within installation media
use/install2/packages: use/install2 use/repo/main; @:
use/install2/packages: use/install2 use/repo/main; @:
...
@@ -54,21 +84,6 @@ use/install2/autoinstall:
...
@@ -54,21 +84,6 @@ use/install2/autoinstall:
@$(call add,INSTALL2_PACKAGES,curl)
@$(call add,INSTALL2_PACKAGES,curl)
@$(call add,BASE_PACKAGES,alterator-postinstall)
@$(call add,BASE_PACKAGES,alterator-postinstall)
# see also use/vmguest/kvm; qxl included in xorg pkglist
use/install2/kvm:
@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
# virtualbox guest support for installer
use/install2/vbox:
@$(call add,STAGE1_KMODULES,virtualbox-addition vboxguest)
@$(call add,INSTALL2_PACKAGES,xorg-drv-vboxvideo)
# see also use/vmguest/vmware
use/install2/vmware:
@$(call add,STAGE1_KMODULES,vmware)
@$(call add,STAGE1_KMODULES,scsi) # mptspi in led-ws
@$(call add,INSTALL2_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
# NB: sort of conflicts with use/install2/cleanup/vnc
# NB: sort of conflicts with use/install2/cleanup/vnc
use/install2/vnc:
use/install2/vnc:
@$(call add,INSTALL2_PACKAGES,x11vnc xterm net-tools)
@$(call add,INSTALL2_PACKAGES,x11vnc xterm net-tools)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment