From b461398aefde4ffd72957e296f2cf43ff2903f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Sat, 6 Apr 2019 19:01:56 +0200
Subject: [PATCH] Move packages needed for all variants to common manifest

---
 fedora-common-ostree.yaml | 12 ++++++++++++
 fedora-silverblue.yaml    | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index feece1e..f278a13 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -16,6 +16,18 @@ packages:
   - skopeo
   - toolbox
   - xdg-desktop-portal
+  # HFS filesystem tools for Apple hardware
+  # See https://github.com/projectatomic/rpm-ostree/issues/1380
+  - hfsplus-tools
+  # Bundle the minimal -devel packages needed to build a kernel.
+  # This is needed because we can't rely on layering to install these
+  # due to version conflicts with the base image.
+  - glibc-devel
+  - kernel-devel
+  - elfutils-libelf-devel
+  # Contains default ostree remote config to be used on client's
+  # system for fetching ostree update
+  - fedora-repos-ostree
 
 selinux: true
 documentation: true
diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml
index a16db70..f6cda62 100644
--- a/fedora-silverblue.yaml
+++ b/fedora-silverblue.yaml
@@ -11,18 +11,6 @@ packages:
   # Does it really still make sense to ship Qt by default if we
   # expect people to run apps in containers?
   - qgnomeplatform
-  # HFS filesystem tools for Apple hardware
-  # See https://github.com/projectatomic/rpm-ostree/issues/1380
-  - hfsplus-tools
-  # Bundle the minimal -devel packages needed to build a kernel.
-  # This is needed because we can't rely on layering to install these
-  # due to version conflicts with the base image.
-  - glibc-devel
-  - kernel-devel
-  - elfutils-libelf-devel
-  # Contains default ostree remote config to be used on client's
-  # system for fetching ostree update
-  - fedora-repos-ostree
 
 repos:
   - fedora-rawhide