diff --git a/msvsphere-aarch64/additional_packages.conf b/msvsphere-aarch64/additional_packages.conf
index fe1a36b..e10c873 100644
--- a/msvsphere-aarch64/additional_packages.conf
+++ b/msvsphere-aarch64/additional_packages.conf
@@ -85,34 +85,6 @@ additional_packages = [
]
}
),
- (
- '^LibreOffice$', {
- '*': [
- "sphere-repos-libreoffice"
- ]
- }
- ),
- (
- '^Virtualization$', {
- '*': [
- "sphere-repos-virtualization"
- ]
- }
- ),
- (
- '^Hosting$', {
- '*': [
- "sphere-repos-hosting"
- ]
- }
- ),
- (
- '^KernelExtra$', {
- '*': [
- "sphere-repos-kernelextra"
- ]
- }
- ),
(
'^Server$', {
'*': [
diff --git a/msvsphere-aarch64/filter_packages.conf b/msvsphere-aarch64/filter_packages.conf
index 83371eb..dce94ca 100644
--- a/msvsphere-aarch64/filter_packages.conf
+++ b/msvsphere-aarch64/filter_packages.conf
@@ -125,34 +125,6 @@ filter_packages = [
]
}
),
- (
- '^LibreOffice$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
- (
- '^Virtualization$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
- (
- '^Hosting$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
- (
- '^KernelExtra$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
(
'^Devel$', {
'*': [
diff --git a/msvsphere-aarch64/general.conf b/msvsphere-aarch64/general.conf
index 99e570a..f61c23e 100644
--- a/msvsphere-aarch64/general.conf
+++ b/msvsphere-aarch64/general.conf
@@ -41,7 +41,7 @@ gather_method = {
"comps": "deps",
"json": "deps",
},
- "^(AppStream|CRB|Devel|HighAvailability|ResilientStorage|Minimal|Server|Extras|Hosting|KernelExtra|LibreOffice|Virtualization|Testing)$": "hybrid",
+ "^(AppStream|CRB|Devel|HighAvailability|ResilientStorage|Minimal|Server|Extras|Testing)$": "hybrid",
}
hashed_directories = False
@@ -76,7 +76,7 @@ create_optional_isos = False
createiso_use_xorrisofs = True
createiso_skip = [
- ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|ResilientStorage|Minimal|Server|Extras|Hosting|KernelExtra|LibreOffice|Virtualization|Testing)$", {
+ ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|ResilientStorage|Minimal|Server|Extras|Testing)$", {
# No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
# No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
# No binary or src ISOs for CRB
@@ -137,14 +137,6 @@ variant_as_lookaside = [
("Devel", "Extras"),
("Extras", "BaseOS"),
("Extras", "AppStream"),
- ("Hosting", "BaseOS"),
- ("Hosting", "AppStream"),
- ("KernelExtra", "BaseOS"),
- ("KernelExtra", "AppStream"),
- ("LibreOffice", "BaseOS"),
- ("LibreOffice", "AppStream"),
- ("Virtualization", "BaseOS"),
- ("Virtualization", "AppStream"),
("Testing", "BaseOS"),
("Testing", "AppStream")
]
diff --git a/msvsphere-i686/additional_packages.conf b/msvsphere-i686/additional_packages.conf
index 865c85d..4487376 100644
--- a/msvsphere-i686/additional_packages.conf
+++ b/msvsphere-i686/additional_packages.conf
@@ -79,34 +79,6 @@ additional_packages = [
]
}
),
- (
- '^LibreOffice$', {
- '*': [
- "sphere-repos-libreoffice"
- ]
- }
- ),
- (
- '^Virtualization$', {
- '*': [
- "sphere-repos-virtualization"
- ]
- }
- ),
- (
- '^Hosting$', {
- '*': [
- "sphere-repos-hosting"
- ]
- }
- ),
- (
- '^KernelExtra$', {
- '*': [
- "sphere-repos-kernelextra"
- ]
- }
- ),
(
'^Server$', {
'*': [
diff --git a/msvsphere-i686/filter_packages.conf b/msvsphere-i686/filter_packages.conf
index aa3ac44..459b598 100644
--- a/msvsphere-i686/filter_packages.conf
+++ b/msvsphere-i686/filter_packages.conf
@@ -59,34 +59,6 @@ filter_packages = [
]
}
),
- (
- '^LibreOffice$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
- (
- '^Virtualization$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
- (
- '^Hosting$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
- (
- '^KernelExtra$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
(
'^Devel$', {
'*': [
diff --git a/msvsphere-i686/general.conf b/msvsphere-i686/general.conf
index 0755ac4..cd1cc83 100644
--- a/msvsphere-i686/general.conf
+++ b/msvsphere-i686/general.conf
@@ -41,7 +41,7 @@ gather_method = {
"comps": "deps",
"json": "deps",
},
- "^(AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Hosting|KernelExtra|LibreOffice|Virtualization|Testing)$": "hybrid",
+ "^(AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$": "hybrid",
}
hashed_directories = False
@@ -76,7 +76,7 @@ create_optional_isos = False
createiso_use_xorrisofs = True
createiso_skip = [
- ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Hosting|KernelExtra|LibreOffice|Virtualization|Testing)$", {
+ ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$", {
# No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
# No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
# No binary or src ISOs for CRB
@@ -142,14 +142,6 @@ variant_as_lookaside = [
("Devel", "Extras"),
("Extras", "BaseOS"),
("Extras", "AppStream"),
- ("Hosting", "BaseOS"),
- ("Hosting", "AppStream"),
- ("KernelExtra", "BaseOS"),
- ("KernelExtra", "AppStream"),
- ("LibreOffice", "BaseOS"),
- ("LibreOffice", "AppStream"),
- ("Virtualization", "BaseOS"),
- ("Virtualization", "AppStream"),
("Testing", "BaseOS"),
("Testing", "AppStream")
]
diff --git a/msvsphere/additional_packages.conf b/msvsphere/additional_packages.conf
index 5ebe6a7..38ad095 100644
--- a/msvsphere/additional_packages.conf
+++ b/msvsphere/additional_packages.conf
@@ -85,34 +85,6 @@ additional_packages = [
]
}
),
- (
- '^LibreOffice$', {
- '*': [
- "sphere-repos-libreoffice"
- ]
- }
- ),
- (
- '^Virtualization$', {
- '*': [
- "sphere-repos-virtualization"
- ]
- }
- ),
- (
- '^Hosting$', {
- '*': [
- "sphere-repos-hosting"
- ]
- }
- ),
- (
- '^KernelExtra$', {
- '*': [
- "sphere-repos-kernelextra"
- ]
- }
- ),
(
'^Server$', {
'*': [
diff --git a/msvsphere/filter_packages.conf b/msvsphere/filter_packages.conf
index 705ef3d..43a6cfc 100644
--- a/msvsphere/filter_packages.conf
+++ b/msvsphere/filter_packages.conf
@@ -125,34 +125,6 @@ filter_packages = [
]
}
),
- (
- '^LibreOffice$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
- (
- '^Virtualization$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
- (
- '^Hosting$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
- (
- '^KernelExtra$', {
- '*': [
- "sphere-release-el"
- ]
- }
- ),
(
'^Devel$', {
'*': [
diff --git a/msvsphere/general.conf b/msvsphere/general.conf
index 2615261..5428483 100644
--- a/msvsphere/general.conf
+++ b/msvsphere/general.conf
@@ -41,7 +41,7 @@ gather_method = {
"comps": "deps",
"json": "deps",
},
- "^(AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Hosting|KernelExtra|LibreOffice|Virtualization|Testing)$": "hybrid",
+ "^(AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$": "hybrid",
}
hashed_directories = False
@@ -76,7 +76,7 @@ create_optional_isos = False
createiso_use_xorrisofs = True
createiso_skip = [
- ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Hosting|KernelExtra|LibreOffice|Virtualization|Testing)$", {
+ ("^(BaseOS|AppStream|CRB|Devel|HighAvailability|ResilientStorage|NFV|RT|Minimal|Server|Extras|Testing)$", {
# No binary ISOs for BaseOS (but still generate src ISOs) - RCM-41330
# No binary ISOs for AppStream (but still generate src ISOs) - RCM-40356
# No binary or src ISOs for CRB
@@ -142,14 +142,6 @@ variant_as_lookaside = [
("Devel", "Extras"),
("Extras", "BaseOS"),
("Extras", "AppStream"),
- ("Hosting", "BaseOS"),
- ("Hosting", "AppStream"),
- ("KernelExtra", "BaseOS"),
- ("KernelExtra", "AppStream"),
- ("LibreOffice", "BaseOS"),
- ("LibreOffice", "AppStream"),
- ("Virtualization", "BaseOS"),
- ("Virtualization", "AppStream"),
("Testing", "BaseOS"),
("Testing", "AppStream")
]
diff --git a/variants-aarch64.xml b/variants-aarch64.xml
index e827cda..584a1ac 100644
--- a/variants-aarch64.xml
+++ b/variants-aarch64.xml
@@ -314,38 +314,6 @@
additional-devel
-
-
-
- aarch64
-
-
- additional-devel
-
-
-
-
- aarch64
-
-
- additional-devel
-
-
-
-
- aarch64
-
-
- additional-devel
-
-
aarch64
diff --git a/variants-i686.xml b/variants-i686.xml
index 58133b7..cacffad 100644
--- a/variants-i686.xml
+++ b/variants-i686.xml
@@ -310,38 +310,6 @@
additional-devel
-
-
-
- i386
-
-
- additional-devel
-
-
-
-
- i386
-
-
- additional-devel
-
-
-
-
- i386
-
-
- additional-devel
-
-
i386
diff --git a/variants.xml b/variants.xml
index 5a81977..c7f5852 100644
--- a/variants.xml
+++ b/variants.xml
@@ -312,38 +312,6 @@
additional-devel
-
-
-
- x86_64
-
-
- additional-devel
-
-
-
-
- x86_64
-
-
- additional-devel
-
-
-
-
- x86_64
-
-
- additional-devel
-
-
x86_64