From b0de8002f7fccca9917e70d4c0de54b5eca2663e Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Oct 31 2017 16:31:29 +0000 Subject: Add system profile Signed-off-by: Stephen Gallagher --- diff --git a/fedora-modular-release.spec b/fedora-modular-release.spec index 8d39669..6167ed3 100644 --- a/fedora-modular-release.spec +++ b/fedora-modular-release.spec @@ -5,7 +5,7 @@ Summary: Fedora Modular release files Name: fedora-modular-release Version: %{dist_version} -Release: 8%{?dist} +Release: 9%{?dist} License: MIT # This package has no separate upstream; it is maintained entirely within @@ -14,11 +14,14 @@ URL: https://apps.fedoraproject.org/packages/fedora-modular-release # Keep presets in sync with fedora-release with # `./sync-presets.sh` +# Keep system profile in sync with +# `./sync-system-profile.sh` Source0: 90-default.preset Source1: 99-default-disable.preset Source2: LICENSE Source3: Fedora-Legal-README.txt Source4: 80-server.preset +Source5: fedora-modular.defaults BuildRequires: coreutils @@ -114,6 +117,9 @@ install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ +# Create the system profile +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dnf/modules.defaults.d/ +install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/dnf/modules.defaults.d/ %files %license LICENSE Fedora-Legal-README.txt @@ -124,6 +130,9 @@ install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ %{_sysconfdir}/redhat-release %{_sysconfdir}/system-release %{_sysconfdir}/system-release-cpe +%dir %{_sysconfdir}/dnf +%dir %{_sysconfdir}/dnf/modules.defaults.d +%config(noreplace) %{_sysconfdir}/dnf/modules.defaults.d/fedora-modular.defaults %{_prefix}/lib/fedora-release %{_prefix}/lib/issue %{_prefix}/lib/issue.net @@ -136,8 +145,10 @@ install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ %{_prefix}/lib/systemd/system-preset/99-default-disable.preset %{_prefix}/lib/systemd/system-preset/80-server.preset - %changelog +* Tue Oct 31 2017 Stephen Gallagher - 27-9 +- Add system profile + * Fri Oct 27 2017 Stephen Gallagher - 27-8 - Add /etc/issue snippet to display Cockpit address - Identify as "Fedora Server Edition" @@ -155,7 +166,7 @@ install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/ * Mon Jun 05 2017 Petr Šabata - 27-4 - Define the commonly used %%fedora and %%fcN macros -* Tue Jun 05 2017 Troy Dawson - 27-3 +* Mon Jun 05 2017 Troy Dawson - 27-3 - Requires fedora-modular-repos * Tue Mar 07 2017 Stephen Gallagher - 27-2 diff --git a/fedora-modular.defaults b/fedora-modular.defaults new file mode 100644 index 0000000..ed88dfd --- /dev/null +++ b/fedora-modular.defaults @@ -0,0 +1,172 @@ +[389-ds] +name=389-ds +stream=1.2 +profiles=default + +[X11-base] +name=X11-base +stream=f27 +profiles=default + +[apache-commons] +name=apache-commons +stream=f27 +profiles=default + +[autotools] +name=autotools +stream=f27 +profiles=default + +[bind] +name=bind +stream=9 +profiles=default + +[cloud-init] +name=cloud-init +stream=f27 +profiles=default + +[fonts] +name=fonts +stream=f27 +profiles=default + +[freeipa] +name=freeipa +stream=master +profiles=default + +[hardware-support] +name=hardware-support +stream=f27 + +[help2man] +name=help2man +stream=master +profiles=default + +[host] +name=host +stream=f27 + +[httpd] +name=httpd +stream=2.4 +profiles=default + +[installer] +name=installer +stream=f27 +profiles=default + +[java] +name=java +stream=8 +profiles=default + +[krb5] +name=krb5 +stream=1 +profiles=default + +[mariadb] +name=mariadb +stream=10.2 +profiles=default + +[maven] +name=maven +stream=master +profiles=default + +[meson] +name=meson +stream=master +profiles=default + +[mysql] +name=mysql +stream=master +profiles=default + +[networking-base] +name=networking-base +stream=f27 +profiles=default + +[ninja] +name=ninja +stream=master +profiles=default + +[nodejs] +name=nodejs +stream=6 +profiles=default + +[perl] +name=perl +stream=master +profiles=default + +[pki] +name=pki +stream=master +profiles=default + +[platform] +name=platform +stream=f27 +profiles=buildroot + +[postgresql] +name=postgresql +stream=9.6 +profiles=default + +[python2] +name=python2 +stream=master +profiles=default + +[python2-ecosystem] +name=python2-ecosystem +stream=master +profiles=default + +[python3] +name=python3 +stream=master +profiles=default + +[python3-ecosystem] +name=python3-ecosystem +stream=master +profiles=default + +[resteasy] +name=resteasy +stream=master +profiles=default + +[samba] +name=samba +stream=master +profiles=default + +[sssd] +name=sssd +stream=master +profiles=default + +[tomcat] +name=tomcat +stream=master +profiles=default + +[udisks2] +name=udisks2 +stream=2 +profiles=default diff --git a/sync-system-profile.sh b/sync-system-profile.sh new file mode 100755 index 0000000..bcc861f --- /dev/null +++ b/sync-system-profile.sh @@ -0,0 +1,12 @@ +#!/usr/bin/bash + +GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` + +echo "Updating fedora-modular.defaults" +if [ $GIT_BRANCH == "master" ]; then + curl -sSo fedora-modular.defaults \ + https://raw.githubusercontent.com/container-images/boltron-27/master/bikeshed.defaults +else + curl -sSo fedora-modular.defaults \ + https://raw.githubusercontent.com/container-images/boltron-27/master/base-${GIT_BRANCH:1}.defaults +fi