From 1d6013b8507273b478447e12b9d605e8b57799b9 Mon Sep 17 00:00:00 2001
From: Brian Stinson <bstinson@centosproject.org>
Date: Jan 15 2020 19:53:29 +0000
Subject: redo armhfp configs


---

diff --git a/c8-armhfp.conf b/c8-armhfp.conf
index 0ba0f9a..deade04 100644
--- a/c8-armhfp.conf
+++ b/c8-armhfp.conf
@@ -6,7 +6,7 @@ from include-excludes import *
 release_name = "CentOS Altarch" 
 release_short = "CentOS-Altarch"
 release_version = "8"
-release_is_layered = False
+version = "8.1.1911"
 
 # GENERAL SETTINGS
 comps_file = {
@@ -29,9 +29,10 @@ multilib = []
 
 variants_file = 'variants-armhfp.xml'
 sigkeys = ['8483C65D']
+#sigkeys = [None]
 hashed_directories = False
 
-tree_arches = ['armv7hl']
+tree_arches = ['armhfp']
 
 # RUNROOT SETTINGS
 runroot_channel = 'image'
@@ -40,7 +41,7 @@ runroot_method = 'koji'
 
 # PKGSET
 pkgset_source = "koji"
-koji_profile = "mbox"
+koji_profile = "armhfp-mbox"
 
 # PKGSET - KOJI
 pkgset_koji_tag = "dist-c8-compose"
@@ -50,18 +51,18 @@ pkgset_koji_module_tag = "modular-updates-candidate"
 filter_system_release_packages = False
 
 # GATHER
-gather_prepopulate = "centos-packages.json"
+gather_prepopulate = "centos-armhfp-packages.json"
 
 gather_method = {
-        "^(?!(AppStream|PowerTools|CR)).*$":{
-                "comps": "deps"
-        },
+        "^(?!(AppStream|PowerTools|CR)).*$": {
+		"comps": "deps"
+	},
         "^(AppStream|PowerTools|CR)$": "hybrid",
 }
 
 gather_backend = "dnf"
 check_deps = False
-greedy_method = "none"
+greedy_method = "all"
 repoclosure_backend = "dnf"
 
 # CREATEREPO
@@ -94,7 +95,7 @@ lorax_options = [
 ]
 
 buildinstall_skip = [
-    ("^(AppStream|PowerTools|CR|HighAvailability)$", {
+    ("^(AppStream|PowerTools|)$", {
        "*": True
        }),
 ]
@@ -104,13 +105,13 @@ image_name_format = {
     ".*": "{release_short}-{version}-{arch}-{disc_type}{disc_num}{suffix}",
 }
 
-image_volid_formats = [ '{release_short}-{release_version}-{arch}-{disc_type}', ]
+image_volid_formats = [ '{release_short}-{version}-{arch}-{disc_type}', ]
 
 # CREATEISO
 create_optional_isos = False
 
 createiso_skip = [
-    ('^(BaseOS|AppStream|PowerTools|HighAvailability|CR)$', {
+    ('^(BaseOS|AppStream|PowerTools)$', {
         '*': True,
         'src':True
     }),
@@ -131,8 +132,6 @@ variant_as_lookaside = [
     ('AppStream', 'BaseOS'),
     ('PowerTools', 'BaseOS'),
     ('PowerTools', 'AppStream'),
-    ('HighAvailability', 'BaseOS'),
-    ('HighAvailability', 'AppStream'),
 ]
 
 productimg = False
diff --git a/include-excludes.conf b/include-excludes.conf
index 3b6040e..b5e6280 100644
--- a/include-excludes.conf
+++ b/include-excludes.conf
@@ -27,12 +27,36 @@ additional_packages = [
 
             "libreoffice-langpack-*",
             "libreoffice-help-*",
-        ]
+        ],
+	"armhfp": [
+            "libreoffice-*",
+            "libreoffice-help-*",
+            "libreoffice-langpack-*",
+	    "emacs-*",
+	    "autocorr*",
+            "fence-agents*",
+            "gnome-shell-extension*",
+            "google-noto*",
+            "hunspell-*",
+            "hyphen-*",
+	]
     }),
 
     ("^BaseOS$", {
         "*": [
             "kernel-doc",
         ]
+        ],
+	"armhfp": [
+	    "kernel-lpae*",
+	    "uboot-tools",
+            "uboot-images*",
+            "grub2*",
+            "grubby-deprecated",
+            "efibootmgr",
+            "cloud-utils-growpart",
+            "bcm283x-firmware",
+            "efivar*",
+	]
     }),
 ]
diff --git a/variants-armhfp.xml b/variants-armhfp.xml
index d26fe5e..0c93fd6 100644
--- a/variants-armhfp.xml
+++ b/variants-armhfp.xml
@@ -4,7 +4,7 @@
   <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">
     <!-- List of architectures for BaseOS compose variant -->
     <arches>
-      <arch>armv7hl</arch>
+      <arch>armhfp</arch>
     </arches>
     <!-- List of comps groups that should be part of BaseOS compose variant -->
     <groups>
@@ -59,7 +59,7 @@
   <variant id="AppStream" name="AppStream" type="variant">
     <!-- List of architectures for AppStream compose variant -->
     <arches>
-      <arch>armv7hl</arch>
+      <arch>armhfp</arch>
     </arches>
     <!-- List of comps groups that should be part of AppStream compose variant -->
     <groups>
@@ -201,7 +201,7 @@
   <variant id="PowerTools" name="PowerTools" type="variant">
     <!-- List of architectures for Powertools compose variant -->
     <arches>
-      <arch>armv7hl</arch>
+      <arch>armhfp</arch>
     </arches>
     <groups>
       <group default="true">centos-powertools</group>