add ignition-edge subpackage

Resolves: rhbz#2144789

Signed-off-by: Antonio Murdaca <antoniomurdaca@gmail.com>

.gitignore

@@ -56,3 +56,4 @@
 /ignition-2.12.0.tar.gz
 /ignition-2.13.0.tar.gz
 /ignition-2.14.0.tar.gz
+/ignition-edge-a3a8f0a.tar.gz

ignition.spec

@@ -7,6 +7,9 @@
 %bcond_with check
 %endif
 
+%global ignedgecommit a3a8f0abb2a1c7fc1c9e5d0e7a3e8830b2e2d766
+%global ignedgeshortcommit %(c=%{ignedgecommit}; echo ${c:0:7})
+
 # https://github.com/coreos/ignition
 %global goipath         github.com/coreos/ignition
 %global gomodulesmode   GO111MODULE=on
@@ -19,13 +22,14 @@ Version:                2.14.0
 %global dracutlibdir %{_prefix}/lib/dracut
 
 Name:           ignition
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        First boot installer and configuration tool (RHEL CoreOS only)
 
 # Upstream license specification: Apache-2.0
 License:        ASL 2.0
 URL:            %{gourl}
 Source0:        %{gosource}
+Source1:        https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecommit}/ignition-edge-%{ignedgeshortcommit}.tar.gz
 
 BuildRequires: libblkid-devel
 BuildRequires: systemd-rpm-macros
@@ -241,12 +245,26 @@ It is only used for building release binaries to be signed by Fedora release
 engineering and uploaded to the Ignition GitHub releases page.
 %endif
 
+############## ignition-edge subpackage ##############
+
+%if 0%{?rhel} && !0%{?eln}
+%package edge
+
+Summary:  Enablement glue for Ignition on ostree systems
+License:  ASL 2.0
+
+%description edge
+This package contains dracut modules, services and binaries needed to enable
+Ignition on ostree systems.
+%endif
+
 %prep
 %if 0%{?fedora}
 %goprep -k
 %autopatch -p1
 %else
 %forgeautosetup -p1
+tar xvf %{SOURCE1}
 %endif
 
 %build
@@ -310,6 +328,10 @@ install -p -m 0644 ./ignition-validate-x86_64-unknown-linux-gnu-static %{buildro
 # the command line.  Install directly into the dracut module dir.
 install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition
 
+%if 0%{?rhel} && !0%{?eln}
+%make_install -C ignition-edge-%{ignedgecommit}
+%endif
+
 %if %{with check}
 %check
 # Exclude the blackbox tests
@@ -319,8 +341,8 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition
 %files
 %license %{golicenses}
 %doc %{godocs}
-%{dracutlibdir}/modules.d/*
-%{_unitdir}/*.service
+%{dracutlibdir}/modules.d/30ignition/*
+%{_unitdir}/ignition-delete-config.service
 %{_libexecdir}/ignition-apply
 %{_libexecdir}/ignition-rmcfg
 
@@ -341,7 +363,25 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition
 %{_datadir}/ignition/ignition-validate-x86_64-unknown-linux-gnu-static
 %endif
 
+%if 0%{?rhel} && !0%{?eln}
+%files edge
+%license %{golicenses}
+%doc %{godocs}
+%{dracutlibdir}/modules.d/35ignition-edge/*
+%{dracutlibdir}/modules.d/10coreos-sysctl/*
+%{dracutlibdir}/modules.d/99emergency-shell-setup/*
+%{dracutlibdir}/modules.d/99journal-conf/*
+%{_unitdir}/coreos-check-ssh-keys.service
+%{_unitdir}/coreos-ignition-write-issues.service
+%{_unitdir}/ignition-firstboot-complete.service
+%{_libexecdir}/coreos-ignition-write-issues
+%{_libexecdir}/coreos-check-ssh-keys
+%endif
+
 %changelog
+* Tue Nov 22 2022 Antonio Murdaca <antoniomurdaca@gmail.com> - 2.14.0-4
+- Rebuild to include ignition-edge subpackage (#2144789)
+
 * Mon Oct 10 2022 Benjamin Gilbert <bgilbert@redhat.com> - 2.14.0-3
 - Rebuild for unblocking ignition-validate subpackage (#2121002)
 

sources

@@ -1 +1,2 @@
 SHA512 (ignition-2.14.0.tar.gz) = e66d42bcfc516055f61abd1808e7ed1bdb4bf4e99b69c16ab9031be173a709c5864e74f23033cb33288e758b2f98a1dd878ef1aa802220afa504997fc3440af3
+SHA512 (ignition-edge-a3a8f0a.tar.gz) = ef04cd411752f1b48fdb64ae8e45a2234b635a19ead82483cb33e246697e6ae639f6036030e7647913f5f589532f3d015bcc81848db50ebe8800242f6f23230a