rpm: fix missing directory ownership

OpenSUSE enforce it. QubesOS/qubes-issues#6567
QubesOS · Nov 4, 2023 · bc62e92 · bc62e92
1 parent 96698e2
commit bc62e92
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/rpm_spec/qubes-kernel-vm-support.spec.in b/rpm_spec/qubes-kernel-vm-support.spec.in
@@ -38,6 +38,10 @@ Requires:       e2fsprogs
 BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  e2fsprogs-devel
+%if 0%{?is_opensuse}
+# for directory ownership
+BuildRequires: dracut
+%endif
 
 %description
 This package contains:
@@ -55,6 +59,7 @@ make -C kernel-modules all
 make install-fedora-kernel-support DESTDIR=%{buildroot}
 
 %files
+%dir %{_prefix}/lib/qubes
 /usr/lib/dracut/modules.d/90qubes-vm
 /usr/lib/dracut/modules.d/90qubes-vm-modules
 /usr/lib/dracut/modules.d/90qubes-vm-simple

diff --git a/rpm_spec/qubes-utils.spec.in b/rpm_spec/qubes-utils.spec.in
@@ -21,6 +21,10 @@ BuildRequires:  python3-rpm-macros
 BuildRequires:  xen-devel
 BuildRequires:	gcc
 BuildRequires:  selinux-policy-devel
+%if 0%{?is_opensuse}
+# for directory ownership
+BuildRequires: xen-tools
+%endif
 
 %description
 Common Linux files for Qubes Dom0 and VM
@@ -119,13 +123,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %_udevrulesdir/*-qubes-*.rules
 %_tmpfilesdir/xen-devices-qubes.conf
+%dir %{_prefix}/lib/qubes
 %{_prefix}/lib/qubes/udev-*
 %{_sbindir}/meminfo-writer
 %{_unitdir}/qubes-meminfo-writer.service
 %{_unitdir}/qubes-meminfo-writer-dom0.service
+%dir %_includedir/qubes
 /etc/xen/scripts/qubes-block
 
 %files -n python%{python3_pkgversion}-qubesimgconverter
+%dir %{python3_sitelib}/qubesimgconverter
 %{python3_sitelib}/qubesimgconverter/__init__.py
 %{python3_sitelib}/qubesimgconverter/imggen.py
 %{python3_sitelib}/qubesimgconverter/test.py
@@ -140,6 +147,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %_includedir/libqubes-rpc-filecopy.h
+%dir %_includedir/qubes
 %_includedir/qubes/pure.h
 %{_libdir}/libqubes-rpc-filecopy.so
 %{_libdir}/libqubes-pure.so