From 78432354e3fd2b2ef931aebd1c5f2cd49f59b60a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 07 2018 18:56:47 +0000 Subject: [PATCH 1/7] comps-sync.py: remove deplicate func def & fixup comment --- diff --git a/comps-sync.py b/comps-sync.py index 20685fe..68a8a4c 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -160,21 +160,13 @@ for desktop in [ 'gnome-desktop', 'kde-desktop', 'xfce-desktop' ]: print(' ' + pkg) manifest_packages.remove(pkg) - # Look for packages in workstation but not in the manifest + # Look for packages in comps but not in the manifest ws_added = set() for pkg in ws_pkgs: if pkg not in manifest_packages: ws_added.add(pkg) manifest_packages.add(pkg) - def format_pkgtype(n): - if n == libcomps.PACKAGE_TYPE_DEFAULT: - return 'default' - elif n == libcomps.PACKAGE_TYPE_MANDATORY: - return 'mandatory' - else: - assert False - n_comps_new = len(ws_added) if n_comps_new == 0: print("All comps packages are already listed in manifest.") From bb65154f10d706991278ff2143ff3a595f7b85c2 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 07 2018 19:00:00 +0000 Subject: [PATCH 2/7] comps-sync-blacklist.yml: re-add sssd-kcm to common (not KDE specific) --- diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml index 8687a56..2972c45 100644 --- a/comps-sync-blacklist.yml +++ b/comps-sync-blacklist.yml @@ -31,8 +31,6 @@ blacklist: # Needs to be arch specific - powerpc-utils - lsvpd - # KDE specific? - - sssd-kcm base-x: # These are for arm...need to handle arch-specific bits - xorg-x11-drv-armsoc diff --git a/fedora-common-ostree-pkgs.json b/fedora-common-ostree-pkgs.json index 3a7eea0..26aece5 100644 --- a/fedora-common-ostree-pkgs.json +++ b/fedora-common-ostree-pkgs.json @@ -195,6 +195,7 @@ "spice-vdagent", "sssd", "sssd-common", + "sssd-kcm", "stix-fonts", "sudo", "system-config-printer-udev", From 96bdd4b055dd0d86933ca93d1cfac4806196dacb Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 07 2018 19:00:00 +0000 Subject: [PATCH 3/7] comps-sync-blacklist.yml: minor category fixup (cosmetic change) --- diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml index 2972c45..f70ee02 100644 --- a/comps-sync-blacklist.yml +++ b/comps-sync-blacklist.yml @@ -145,11 +145,11 @@ desktop_blacklist: # Incompatible with ostree for various reasons - abrt-desktop - cups-pk-helper + - dnfdragora - plasma-pk-updates # Non-critical apps -> Flatpak - akregator - cagibi - - dnfdragora - dolphin - gnome-keyring-pam - gwenview @@ -199,18 +199,18 @@ desktop_blacklist: xfce-desktop: # Incompatible with ostree for various reasons - abrt-desktop + - dnfdragora-updater # Non-critical apps -> Flatpak - Thunar - - alsa-utils - - dnfdragora-updater - fros-recordmydesktop - thunar-archive-plugin - thunar-media-tags-plugin - thunar-volman - tumbler - - vim-enhanced # Misc - - openssh-askpass + - alsa-utils - firewall-config + - openssh-askpass + - vim-enhanced # ? - rodent-icon-theme From 61d907b88b9c334a6f8fd36bd61dda6e70b68adc Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 07 2018 19:00:00 +0000 Subject: [PATCH 4/7] Move repos, automatic_version_prefix & mutate-os-release to common treefile --- diff --git a/fedora-common-ostree.json b/fedora-common-ostree.json index 952635e..2801e84 100644 --- a/fedora-common-ostree.json +++ b/fedora-common-ostree.json @@ -1,6 +1,9 @@ { "ref": "fedora/rawhide/${basearch}/ostree-base", - "repos": [], + "repos": ["fedora-rawhide"], + + "automatic_version_prefix": "29", + "mutate-os-release": "29", "include": "fedora-common-ostree-pkgs.json", diff --git a/fedora-xfce.json b/fedora-xfce.json index 5d5e94c..fc0306a 100644 --- a/fedora-xfce.json +++ b/fedora-xfce.json @@ -1,8 +1,5 @@ { "ref": "fedora/rawhide/${basearch}/xfce", - "repos": ["fedora-rawhide"], - "automatic_version_prefix": "29", - "mutate-os-release": "29", "include": "xfce-desktop-pkgs.json", diff --git a/kinoite.json b/kinoite.json index db35bb4..295feec 100644 --- a/kinoite.json +++ b/kinoite.json @@ -1,8 +1,5 @@ { "ref": "fedora/rawhide/${basearch}/kinoite", - "repos": ["fedora-rawhide"], - "automatic_version_prefix": "29", - "mutate-os-release": "29", "include": "kde-desktop-pkgs.json", diff --git a/silverblue.json b/silverblue.json index 4231847..596f9c8 100644 --- a/silverblue.json +++ b/silverblue.json @@ -1,8 +1,5 @@ { "ref": "fedora/rawhide/${basearch}/workstation", - "repos": ["fedora-rawhide"], - "automatic_version_prefix": "29", - "mutate-os-release": "29", "include": "gnome-desktop-pkgs.json", From 7ab8d493db9fcdb96079665ae6497ec972ff0b21 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 07 2018 19:04:56 +0000 Subject: [PATCH 5/7] Remove unused ref & repos from *-desktop-pkgs.json treefiles --- diff --git a/gnome-desktop-pkgs.json b/gnome-desktop-pkgs.json index 57dc86c..23f287b 100644 --- a/gnome-desktop-pkgs.json +++ b/gnome-desktop-pkgs.json @@ -58,7 +58,5 @@ "xdg-desktop-portal", "xdg-desktop-portal-gtk", "xdg-user-dirs-gtk" - ], - "ref": "fedora/rawhide/x86_64/gnome-desktop", - "repos": [] + ] } diff --git a/kde-desktop-pkgs.json b/kde-desktop-pkgs.json index bdcd860..9374b4a 100644 --- a/kde-desktop-pkgs.json +++ b/kde-desktop-pkgs.json @@ -41,7 +41,5 @@ "sddm-breeze", "sddm-kcm", "xorg-x11-drv-libinput" - ], - "ref": "fedora/rawhide/x86_64/kde-desktop", - "repos": [] + ] } diff --git a/xfce-desktop-pkgs.json b/xfce-desktop-pkgs.json index ef63e92..8848843 100644 --- a/xfce-desktop-pkgs.json +++ b/xfce-desktop-pkgs.json @@ -56,7 +56,5 @@ "xfwm4-theme-nodoka", "xfwm4-themes", "xscreensaver-base" - ], - "ref": "fedora/rawhide/x86_64/xfce-desktop", - "repos": [] + ] } From 0f7891cfdc199f4101c3385a347c6ba789c54959 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 07 2018 19:12:25 +0000 Subject: [PATCH 6/7] silverblue: re-add GNOME specific packages that were blacklisted for common treefile --- diff --git a/silverblue.json b/silverblue.json index 596f9c8..2cf254d 100644 --- a/silverblue.json +++ b/silverblue.json @@ -4,6 +4,10 @@ "include": "gnome-desktop-pkgs.json", "packages": [ + "desktop-backgrounds-gnome", + "gnome-shell-extension-background-logo", + "pinentry-gnome3", + "qgnomeplatform", "xdg-desktop-portal-gtk" ] } From f2a3641d22ef5162141a21d68c5f4e836d3c6438 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 07 2018 19:12:54 +0000 Subject: [PATCH 7/7] silverblue: xdg-desktop-portal-gtk is already in gnome-desktop-pkgs --- diff --git a/silverblue.json b/silverblue.json index 2cf254d..b7217e6 100644 --- a/silverblue.json +++ b/silverblue.json @@ -7,7 +7,6 @@ "desktop-backgrounds-gnome", "gnome-shell-extension-background-logo", "pinentry-gnome3", - "qgnomeplatform", - "xdg-desktop-portal-gtk" + "qgnomeplatform" ] }