#86 Sync Silverblue with Workstation
Merged 2 months ago by sgallagh. Opened 2 months ago by walters.
rpms/ walters/fedora-release sb-presets  into  master

Sync Silverblue with Workstation
Colin Walters • 2 months ago  
file modified
+11 -2

@@ -14,7 +14,7 @@ 

  Summary:        Fedora release files

  Name:           fedora-release

  Version:        31

- Release:        0.7

+ Release:        0.8

  License:        MIT

  URL:            https://fedoraproject.org/

  

@@ -612,7 +612,10 @@ 

  %files silverblue

  %{_prefix}/lib/os-release.silverblue

  %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.silverblue

- 

+ # Keep this in sync with workstation below

Do we want to make the effort of keeping these in sync or would it make more sense to produce a common subpackage that they both depend on and only need to modify one place? Workstation and Silverblue basically differ only by the /etc/os-release and swidtag files, so probably we should have the release packages just represent that.

+ %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.override

+ %{_prefix}/lib/systemd/system-preset/80-workstation.preset

+ %attr(0644,root,root) %{_prefix}/share/polkit-1/rules.d/org.projectatomic.rpmostree1.rules

  

  %files snappy

  %{_prefix}/lib/os-release.snappy

@@ -627,6 +630,7 @@ 

  %files workstation

  %{_prefix}/lib/os-release.workstation

  %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.workstation

+ # Keep this in sync with silverblue above

  %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.override

  %{_prefix}/lib/systemd/system-preset/80-workstation.preset

  %attr(0644,root,root) %{_prefix}/share/polkit-1/rules.d/org.projectatomic.rpmostree1.rules

@@ -638,6 +642,11 @@ 

  

  

  %changelog

+ * Sat Jul 13 2019 Colin Walters <walters@verbum.org> - 31-0.8

+ - Sync Silverblue with Workstation

+   In particular, it should have the same "ssh disabled by default" etc.

+   https://discussion.fedoraproject.org/t/strange-etc-os-release-contents-on-silverblue/2024/2

+ 

  * Thu Jun 06 2019 Stephen Gallagher <sgallagh@redhat.com> - 31-0.7

  - Work around upgrade bug

  - Resolves: rhbz#1710543

Do we want to make the effort of keeping these in sync or would it make more sense to produce a common subpackage that they both depend on and only need to modify one place? Workstation and Silverblue basically differ only by the /etc/os-release and swidtag files, so probably we should have the release packages just represent that.

Doesn't seem like these change that often, common subpackage feels a bit overkill? Dunno. We could make a macro too I guess. I don't have a strong opinion to be honest.

@walters I don't feel too strongly either, I guess. I just have a natural resistance to copy-pasted code :)

We can go with this for now and revisit it in the future if needed.

Sorry, thought I'd hit the merge button a few days ago.

Pull-Request has been merged by sgallagh

2 months ago
Metadata