From 82c16cc54deab6c10b9019fd408978e235b37e5d Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Tue, 7 Apr 2020 13:45:00 +0300 Subject: [PATCH] workstation: Virtualbox is x86_64-only now --- conf.d/basealt.mk | 5 ++++- pkg.in/lists/workstation/extras | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/conf.d/basealt.mk b/conf.d/basealt.mk index ef5f5fee..b06f151b 100644 --- a/conf.d/basealt.mk +++ b/conf.d/basealt.mk @@ -3,7 +3,7 @@ ifeq (distro,$(IMAGE_CLASS)) ifeq (,$(filter-out i586 x86_64,$(ARCH))) distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\ 3rdparty blender clamav cloud-clients freecad \ - gtk-dictionary kvm smartcard virtualbox voip-clients) + gtk-dictionary kvm smartcard voip-clients) endif distro/alt-workstation: distro/.base +vmguest +wireless +efi \ @@ -22,6 +22,9 @@ distro/alt-workstation: distro/.base +vmguest +wireless +efi \ @$(call add,MAIN_PACKAGES,solaar) ifeq (,$(filter-out i586 x86_64,$(ARCH))) @$(call add,MAIN_GROUPS,$(workstation_groups_x86)) +endif +ifeq (,$(filter-out x86_64,$(ARCH))) + @$(call add,MAIN_GROUPS,workstation/virtualbox) @$(call add,BASE_KMODULES,kvm virtualbox) endif @$(call add,MAIN_LISTS,workstation/extras) diff --git a/pkg.in/lists/workstation/extras b/pkg.in/lists/workstation/extras index b1d32c5e..291db137 100644 --- a/pkg.in/lists/workstation/extras +++ b/pkg.in/lists/workstation/extras @@ -11,7 +11,7 @@ kernel-modules-v4l-un-def kernel-modules-drm-un-def kernel-modules-staging-un-def kernel-modules-drm-nouveau-un-def@X86 -kernel-modules-virtualbox-un-def@X86 +kernel-modules-virtualbox-un-def@x86_64 kernel-modules-virtualbox-addition-un-def@X86 kernel-headers-modules-un-def kernel-headers-un-def