From 4e5cee610901e5440e96d9ab85d102d08533ddf7 Mon Sep 17 00:00:00 2001 From: Milos Vyletel Date: Nov 30 2018 16:56:12 +0000 Subject: [PATCH 1/5] fix build for xfce and kde variant in cb7b538 Dusty moved repos from common to silverblue what was essentially partial revert 61d907b and therefore breaking xfce/kde builds. this fixes it by adding repos back (cherry picked from commit 9cb8e83eb2c1bca379e723e1e65ada6d6e43ab5f) --- diff --git a/fedora-xfce.json b/fedora-xfce.json index fc0306a..2989267 100644 --- a/fedora-xfce.json +++ b/fedora-xfce.json @@ -1,5 +1,6 @@ { - "ref": "fedora/rawhide/${basearch}/xfce", + "ref": "fedora/29/${basearch}/xfce", + "repos": ["fedora-29"], "include": "xfce-desktop-pkgs.json", diff --git a/kinoite.json b/kinoite.json index 295feec..1c4ae73 100644 --- a/kinoite.json +++ b/kinoite.json @@ -1,5 +1,6 @@ { - "ref": "fedora/rawhide/${basearch}/kinoite", + "ref": "fedora/29/${basearch}/kinoite", + "repos": ["fedora-29"], "include": "kde-desktop-pkgs.json", From de82e1b979de4912e74cb3f42e00343f1c697ccf Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Nov 30 2018 16:56:12 +0000 Subject: [PATCH 2/5] Migrate Silverblue definition to YAML, add rojig Prep for adding a rojig build. (cherry picked from commit 2fe083091f250c12013316e6782e06fe23daa02c) --- diff --git a/fedora-silverblue.json b/fedora-silverblue.json deleted file mode 100644 index d0b2e75..0000000 --- a/fedora-silverblue.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ref": "fedora/29/${basearch}/silverblue", - "repos": ["fedora-29"], - - "include": "gnome-desktop-pkgs.json", - - "packages": [ - "desktop-backgrounds-gnome", - "gnome-shell-extension-background-logo", - "pinentry-gnome3", - "qgnomeplatform" - ] -} diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml new file mode 100644 index 0000000..4e41377 --- /dev/null +++ b/fedora-silverblue.yaml @@ -0,0 +1,16 @@ +include: gnome-desktop-pkgs.json +ref: fedora/29/${basearch}/silverblue +rojig: + name: fedora-silverblue + summary: "Fedora Silverblue base image" + license: MIT +packages: + - desktop-backgrounds-gnome + - gnome-shell-extension-background-logo + - pinentry-gnome3 + # Does it really still make sense to ship Qt by default if we + # expect people to run apps in containers? + - qgnomeplatform + +repos: + - fedora-29 From b871dd8c3d8acb0649f2a854fba477e4b0bac1cc Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Nov 30 2018 16:56:12 +0000 Subject: [PATCH 3/5] Remove extraneous symlink (cherry picked from commit 0cbd671fd5e6bc5c7fe1419b9074f523ad9bcca6) --- diff --git a/fedora-atomic-workstation.json b/fedora-atomic-workstation.json deleted file mode 120000 index b50123e..0000000 --- a/fedora-atomic-workstation.json +++ /dev/null @@ -1 +0,0 @@ -./fedora-silverblue.json \ No newline at end of file From 11e11d9227f5ff26cbc63cfa5b7db921edc70d0f Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Nov 30 2018 16:56:12 +0000 Subject: [PATCH 4/5] add in hfsplus-tools rpm for HFS filesystem on Macs See https://github.com/projectatomic/rpm-ostree/issues/1380 (cherry picked from commit ece0b044732ada7685b11b74008677e9cfee3d93) --- diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 4e41377..451a715 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -11,6 +11,9 @@ 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 repos: - fedora-29 From 5a3c3a4d22e8b4d8183a3ee09957f9fe65b12843 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Nov 30 2018 16:56:12 +0000 Subject: [PATCH 5/5] comps-sync f29 2018-11-27 Output from `./comps-sync.py ../fedora-comps/comps-f29.xml.in --save` ``` Syncing packages common to all ostree based desktop versions: 2 packages not in workstation-product-environment: gstreamer1-plugin-mpg123 ibus-rawcode 2 packages not in manifest: mesa-vulkan-drivers (mandatory, groups: base-x) policycoreutils-python-utils (mandatory, groups: workstation-product) Wrote fedora-common-ostree-pkgs.json Syncing packages for gnome-desktop specific version: All manifest packages are already listed in comps. 2 packages not in manifest: chrome-gnome-shell gnome-terminal-nautilus Wrote gnome-desktop-pkgs.json Syncing packages for kde-desktop specific version: All manifest packages are already listed in comps. All comps packages are already listed in manifest. Syncing packages for xfce-desktop specific version: All manifest packages are already listed in comps. 2 packages not in manifest: gnome-keyring-pam gvfs-mtp Wrote xfce-desktop-pkgs.json ``` --- diff --git a/fedora-common-ostree-pkgs.json b/fedora-common-ostree-pkgs.json index 9bb5a88..4fc26a5 100644 --- a/fedora-common-ostree-pkgs.json +++ b/fedora-common-ostree-pkgs.json @@ -68,7 +68,6 @@ "google-noto-sans-cjk-ttc-fonts", "google-noto-sans-sinhala-fonts", "google-noto-serif-cjk-ttc-fonts", - "gstreamer1-plugin-mpg123", "gstreamer1-plugins-bad-free", "gstreamer1-plugins-good", "gutenprint", @@ -85,7 +84,6 @@ "ibus-libzhuyin", "ibus-m17n", "ibus-qt", - "ibus-rawcode", "ibus-typing-booster", "initscripts", "iproute", @@ -139,6 +137,7 @@ "mcelog", "mdadm", "mesa-dri-drivers", + "mesa-vulkan-drivers", "microcode_ctl", "mlocate", "mpage", @@ -161,6 +160,7 @@ "plymouth", "plymouth-system-theme", "policycoreutils", + "policycoreutils-python-utils", "polkit", "procps-ng", "pulseaudio", diff --git a/gnome-desktop-pkgs.json b/gnome-desktop-pkgs.json index 2de5c7c..c351463 100644 --- a/gnome-desktop-pkgs.json +++ b/gnome-desktop-pkgs.json @@ -14,6 +14,7 @@ "at-spi2-atk", "at-spi2-core", "avahi", + "chrome-gnome-shell", "dconf", "gdm", "glib-networking", @@ -33,6 +34,7 @@ "gnome-software", "gnome-system-monitor", "gnome-terminal", + "gnome-terminal-nautilus", "gnome-themes-extra", "gnome-user-docs", "gnome-user-share", diff --git a/xfce-desktop-pkgs.json b/xfce-desktop-pkgs.json index 8848843..4871ada 100644 --- a/xfce-desktop-pkgs.json +++ b/xfce-desktop-pkgs.json @@ -25,6 +25,7 @@ "bluebird-xfwm4-theme", "desktop-backgrounds-compat", "fedora-icon-theme", + "gnome-keyring-pam", "greybird-gtk2-theme", "greybird-gtk3-theme", "greybird-xfce4-notifyd-theme", @@ -32,6 +33,7 @@ "gtk-xfce-engine", "gvfs", "gvfs-archive", + "gvfs-mtp", "initial-setup-gui", "lightdm-gtk", "network-manager-applet",