manifest: Use -x64 grub on x86_64

Copy of https://pagure.io/fedora-atomic/pull-request/84

fedora-ostree-workstation.json

@@ -146,8 +146,6 @@
 		"google-noto-sans-tagalog-fonts",
 		"google-noto-sans-tai-tham-fonts",
 		"google-noto-sans-tai-viet-fonts",
-		"grub2",
-		"grub2-efi",
 		"gutenprint",
 		"gutenprint-cups",
 		"gvfs-afc",
@@ -298,7 +296,6 @@
 		"openssh-clients",
 		"openssh-server",
 		"orca",
-		"ostree-grub2",
 		"PackageKit-gstreamer-plugin",
 		"paktype-naskh-basic-fonts",
 		"pam_krb5",
@@ -433,5 +430,13 @@
 		"zip"
 		],
 
-    "default_target": "graphical.target"
+    "default_target": "graphical.target",
+
+    "comment-for-packages": "Keep this in sync with fedora-atomic-host.json from fedora-atomic",
+    "packages-aarch64": ["grub2-efi", "ostree-grub2", "efibootmgr", "shim"],
+    "packages-armhfp": ["extlinux-bootloader"],
+    "packages-ppc64": ["grub2", "ostree-grub2", "atomic-devmode"],
+    "packages-ppc64le": ["grub2", "ostree-grub2", "atomic-devmode"],
+    "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2",
+                         "efibootmgr", "shim", "microcode_ctl"]
 }