From cb3c4d0583ddf67243db70e5efe1535a6ca4cf79 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Oct 25 2016 18:44:13 +0000
Subject: [PATCH 1/2] add support for aarch64, armhp, ppc64 and ppc64le


based on https://github.com/projectatomic/rpm-ostree/pull/305 setup
all the groups so that we can build ostrees with a single json file
for all the fedora arches except i386 and s390x

Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/fedora-atomic-docker-host.json b/fedora-atomic-docker-host.json
index fd99234..7d26738 100644
--- a/fedora-atomic-docker-host.json
+++ b/fedora-atomic-docker-host.json
@@ -34,8 +34,6 @@
 		 "cryptsetup",
 		 "authconfig",
 		 "btrfs-progs", "e2fsprogs", "xfsprogs",
-		 "grub2", "grub2-efi", "ostree-grub2",
-		 "efibootmgr", "shim",
 		 "gnupg2",
 		 "basesystem",
 		 "python",
@@ -74,12 +72,23 @@
 		 "python-docker-py",
 		 "iscsi-initiator-utils",
 		 "oddjob-mkhomedir",
-		 "atomic-devmode",
 		 "oci-register-machine",
 		 "oci-systemd-hook",
 		 "mdadm",
 		 "runc"],
 
+    "packages-aarch64": ["grub2-efi", "ostree-grub2",
+                         "efibootmgr", "shim", "atomic-devmode"],
+
+    "packages-armhfp": ["extlinux-bootloader"],
+
+    "packages-ppc64": ["grub2", "ostree-grub2", "atomic-devmode"],
+
+    "packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"],
+
+    "packages-x86_64": ["grub", "grub2-efi", "ostree-grub2",
+                         "efibootmgr", "shim", "atomic-devmode"],
+
     "default_target": "multi-user.target",
 
     "units": ["docker.service", "cockpit.socket", "docker-storage-setup.service"]

From c3d807ec88bdaea0b4a61ba1b42b075d92e86ea4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Oct 25 2016 18:44:23 +0000
Subject: [PATCH 2/2] we need to have grub2 on x86_64 not grub


Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/fedora-atomic-docker-host.json b/fedora-atomic-docker-host.json
index 7d26738..9d4abd4 100644
--- a/fedora-atomic-docker-host.json
+++ b/fedora-atomic-docker-host.json
@@ -86,7 +86,7 @@
 
     "packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"],
 
-    "packages-x86_64": ["grub", "grub2-efi", "ostree-grub2",
+    "packages-x86_64": ["grub2", "grub2-efi", "ostree-grub2",
                          "efibootmgr", "shim", "atomic-devmode"],
 
     "default_target": "multi-user.target",