diff --git a/fedora.conf b/fedora.conf index 51ace8c..54ebfd1 100644 --- a/fedora.conf +++ b/fedora.conf @@ -124,7 +124,7 @@ lorax_options = [ # fomat: [(variant_uid_regex, {arch|*: [packages]})] additional_packages = [ - ('^(Workstation|Server|Everything)$', { + ('^(Server|Everything)$', { '*': [ 'kernel*', 'dracut*', @@ -152,12 +152,6 @@ additional_packages = [ ], }), - ('^Workstation$', { - '*': [ - - ], - }), - ] multilib = [ @@ -168,7 +162,7 @@ multilib = [ filter_packages = [ ("^.*$", {"*": ["glibc32", "libgcc32"]}), - ('(Workstation|Server)$', { + ('(Server)$', { '*': [ 'kernel*debug*', 'kernel-kdump*', @@ -214,11 +208,6 @@ multilib_whitelist = { } createiso_skip = [ - ('^Workstation$', { - '*': True, - 'src': True - }), - ('^Server$', { 'src': True }), @@ -237,7 +226,7 @@ createiso_skip = [ # fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})] #extra_files = [ -# ('^(Server|Workstation)$', { +# ('^(Server)$', { # '*': [ # { # 'scm': 'rpm', diff --git a/variants-fedora.xml b/variants-fedora.xml index 7df854f..928ef12 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -70,36 +70,12 @@ x86_64 - + aarch64 armhfp x86_64 - - base-x - container-management - core - firefox - fonts - gnome-desktop - guest-desktop-agents - hardware-support - libreoffice - multimedia - networkmanager-submodules - printing - workstation-ostree-support - workstation-product - virtualization - arm-tools - - anaconda-tools - platform-vmware - - - workstation-product-environment -