public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Debarshi Ray <rishi@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/fedora-release] f45: Add Toolbx subpackages
Date: Mon, 10 Aug 2026 09:36:26 GMT	[thread overview]
Message-ID: <178635458678.1.1945683360206108140.rpms-fedora-release-6bb4b2c9bc44@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 6bb4b2c9bc4427f63a140c1cfa7e0f8c752be52a
            Author : Debarshi Ray <rishi@fedoraproject.org>
            Date   : 2024-02-06T16:53:19+01:00
            Stats  : +57/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/6bb4b2c9bc4427f63a140c1cfa7e0f8c752be52a?branch=f45

            Log:
            Add Toolbx subpackages

These are meant to distinguish OCI containers and images that are
designed specifically for Toolbx from others.  Toolbx containers are
long-lasting pet containers for interactive command line use, which
makes them substantially different from short-lived containers running
services.

Therefore, it can be useful to be able to identify Toolbx containers and
images when generating statistics about Fedora usage.

https://pagure.io/Fedora-Council/tickets/issue/449
https://src.fedoraproject.org/rpms/fedora-release/pull-request/301

---
diff --git a/fedora-release.spec b/fedora-release.spec
index 98febcb..0e8c4a3 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -1,3 +1,4 @@
+
 %define release_name Rawhide
 %define is_rawhide 1
 
@@ -37,6 +38,7 @@
 %bcond_with kinoite
 %bcond_with snappy
 %bcond_with soas
+%bcond_with toolbx
 %bcond_with workstation
 %bcond_with xfce
 %bcond_with i3
@@ -63,6 +65,7 @@
 %bcond_without kinoite
 %bcond_without snappy
 %bcond_without soas
+%bcond_without toolbx
 %bcond_without workstation
 %bcond_without xfce
 %bcond_without i3
@@ -827,6 +830,42 @@ itself as Fedora Sugar on a Stick.
 %endif
 
 
+%if %{with toolbx}
+%package toolbx
+Summary:        Base package for Fedora Toolbx container specific default configurations
+
+RemovePathPostfixes: .toolbx
+Provides:       fedora-release = %{version}-%{release}
+Provides:       fedora-release-variant = %{version}-%{release}
+Provides:       system-release
+Provides:       system-release(%{version})
+Requires:       fedora-release-common = %{version}-%{release}
+
+# fedora-release-common Requires: fedora-release-identity, so at least one
+# package must provide it. This Recommends: pulls in
+# fedora-release-identity-toolbx if nothing else is already doing so.
+Recommends:     fedora-release-identity-toolbx
+
+
+%description toolbx
+Provides a base package for Fedora Toolbx container specific configuration files to
+depend on as well as Toolbx container system defaults.
+
+
+%package identity-toolbx
+Summary:        Package providing the identity for Fedora Toolbx container image
+
+RemovePathPostfixes: .toolbx
+Provides:       fedora-release-identity = %{version}-%{release}
+Conflicts:      fedora-release-identity
+Requires(meta): fedora-release-toolbx = %{version}-%{release}
+
+
+%description identity-toolbx
+Provides the necessary files for a Fedora installation that is identifying
+itself as the Fedora Toolbx container image.
+%endif
+
 %if %{with workstation}
 %package workstation
 Summary:        Base package for Fedora Workstation-specific default configurations
@@ -1444,6 +1483,16 @@ sed -i -e "s|(%{release_name}%{?prerelease})|(Sugar on a Stick%{?prerelease})|g"
 sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Sugar/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.soas
 %endif
 
+%if %{with toolbx}
+# Toolbx
+cp -p os-release \
+      %{buildroot}%{_prefix}/lib/os-release.toolbx
+echo "VARIANT=\"Toolbx Container Image\"" >> %{buildroot}%{_prefix}/lib/os-release.toolbx
+echo "VARIANT_ID=toolbx" >> %{buildroot}%{_prefix}/lib/os-release.toolbx
+sed -i -e "s|(%{release_name}%{?prerelease})|(Toolbx Container Image%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.toolbx
+sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Toolbx/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.toolbx
+%endif
+
 %if %{with workstation}
 # Workstation
 cp -p os-release \
@@ -1778,6 +1827,14 @@ ln -s --relative %{buildroot}%{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swid
 %endif
 
 
+%if %{with toolbx}
+%files toolbx
+%files identity-toolbx
+%{_prefix}/lib/os-release.toolbx
+%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.toolbx
+%endif
+
+
 %if %{with workstation}
 %files workstation
 %files identity-workstation

                 reply	other threads:[~2026-08-10  9:36 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178635458678.1.1945683360206108140.rpms-fedora-release-6bb4b2c9bc44@fedoraproject.org \
    --to=rishi@fedoraproject.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox