Add tardev subpackage

Author: miz060

SPECS/kata-containers-cc/kata-containers-cc.spec

@@ -3,7 +3,7 @@
 
 Name:         kata-containers-cc
 Version:      3.2.0.azl4
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      Kata Confidential Containers package developed for Confidential Containers on AKS
 License:      ASL 2.0
 URL:          https://github.com/microsoft/kata-containers
@@ -43,6 +43,12 @@ Summary:        Kata Confidential Containers tools package for building the UVM
 %description tools
 This package contains the scripts and files required to build the UVM
 
+%package tardev
+Summary:        tardev-snapshotter for Kata Containers
+
+%description tardev
+This package contains the tardev-snapshotter service for Kata Containers.
+
 %prep
 %autosetup -p1 -n %{sourceName}-%{version}
 pushd %{_builddir}/%{sourceName}-%{version}
@@ -54,6 +60,11 @@ pushd %{_builddir}/%{sourceName}-%{version}/tools/osbuilder/node-builder/azure-l
 %make_build package-confpods
 popd
 
+%build tardev
+pushd %{_builddir}/%{sourceName}-%{version}/tools/osbuilder/node-builder/azure-linux
+%make_build tardev
+popd
+
 %define kata_path     /opt/confidential-containers
 %define kata_bin      %{kata_path}/bin
 %define kata_shim_bin %{_prefix}/local/bin
@@ -66,13 +77,18 @@ START_SERVICES=no PREFIX=%{buildroot} %make_build deploy-confpods-package
 PREFIX=%{buildroot} %make_build deploy-confpods-package-tools
 popd
 
-%preun
+%install tardev
+pushd %{_builddir}/%{sourceName}-%{version}/tools/osbuilder/node-builder/azure-linux
+PREFIX=%{buildroot} %make_build deploy-tardev
+popd
+
+%preun tardev
 %systemd_preun tardev-snapshotter.service
 
-%postun
+%postun tardev
 %systemd_postun tardev-snapshotter.service
 
-%post
+%post tardev
 %systemd_post tardev-snapshotter.service
 if [ $1 -eq 1 ]; then # Package install
 	systemctl enable tardev-snapshotter.service > /dev/null 2>&1 || :
@@ -82,9 +98,6 @@ fi
 %files
 %{_sbindir}/mount.tar
 %{_bindir}/kata-overlay
-%{_bindir}/tardev-snapshotter
-%{_unitdir}/tardev-snapshotter.service
-
 %{kata_bin}/kata-collect-data.sh
 %{kata_bin}/kata-monitor
 %{kata_bin}/kata-runtime
@@ -98,6 +111,10 @@ fi
 %doc CONTRIBUTING.md
 %doc README.md
 
+%files tardev
+%{_bindir}/tardev-snapshotter
+%{_unitdir}/tardev-snapshotter.service
+
 %files tools
 %dir %{kata_path}
 %dir %{tools_pkg}
@@ -150,6 +167,10 @@ fi
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
 
 %changelog
+* Mon Mar 03 2025 Mitch Zhu <mitchzhu@microsoft.com> 3.2.0.azl4-2
+- Add tardev subpackage
+
+
 * Wed Jan 22 2025 Saul Paredes <saulparedes@microsoft.com> - 3.2.0.azl4-1
 - Upgrade to 3.2.0.azl4 release
 

SPECS/kata-containers/kata-containers.spec

@@ -2,15 +2,14 @@
 
 Name:           kata-containers
 Version:        3.2.0.azl4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Kata Containers package developed for Pod Sandboxing on AKS
 License:        ASL 2.0
 URL:            https://github.com/microsoft/kata-containers
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Source0:        https://github.com/microsoft/kata-containers/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}-cargo.tar.gz
-Patch0:         tardev.patch
 
 ExclusiveArch: x86_64
 
@@ -26,6 +25,7 @@ BuildRequires:  cmake
 BuildRequires:  fuse-devel
 
 Requires:       kernel-uvm
+Requires:       kata-containers-cc-tardev
 # Must match the version specified by the `assets.virtiofsd.version` field in the source's versions.yaml.
 Requires:       virtiofsd = 1.8.0
 
@@ -63,25 +63,9 @@ START_SERVICES=no PREFIX=%{buildroot} %make_build deploy-package
 PREFIX=%{buildroot} %make_build deploy-package-tools
 popd
 
-%preun
-%systemd_preun tardev-snapshotter.service
-
-%postun
-%systemd_postun tardev-snapshotter.service
-
-%post
-%systemd_post tardev-snapshotter.service
-if [ $1 -eq 1 ]; then # Package install
-	systemctl enable tardev-snapshotter.service > /dev/null 2>&1 || :
-	systemctl start tardev-snapshotter.service > /dev/null 2>&1 || :
-fi
-
 %files
 %{_sbindir}/mount.tar
 %{_bindir}/kata-overlay
-%{_bindir}/tardev-snapshotter
-%{_unitdir}/tardev-snapshotter.service
-
 %{kata_bin}/kata-collect-data.sh
 %{kata_bin}/kata-monitor
 %{kata_bin}/kata-runtime
@@ -139,6 +123,9 @@ fi
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
 
 %changelog
+* Mon Mar 03 2025 Mitch Zhu <mitchzhu@microsoft.com> - 3.2.0.azl4-6
+- Move tardev-snapshotter into kata-containers-cc-tardev
+
 * Tue Feb 25 2025 Mitch Zhu <mitchzhu@microsoft.com> - 3.2.0.azl4-5
 - Set AGENT_POLICY=yes