Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spec: remove the dirs creations #672

Merged
merged 3 commits into from
Dec 5, 2024
Merged

spec: remove the dirs creations #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b907fc
spec: remove the dirs creations
dougsland Dec 4, 2024
637417e
github actions: remove drop-in target build
dougsland Dec 4, 2024
4551d9b
qm.spec: use mkdir -p in the buildroot
dougsland Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions .github/workflows/drop-in-target-build-only.yml
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions rpm/qm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,6 @@ sed -i 's/^install: man all/install:/' Makefile
%install
# Create the directory for drop-in configurations
install -d %{buildroot}%{_sysconfdir}/containers/containers.conf.d
install -d %{buildroot}%{rootfs_qm}%{_sysconfdir}/containers/systemd
install -d %{buildroot}%{_sysconfdir}/qm/containers/containers.conf.d
install -d %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d

####################################################################
################# QM Window Manager ################################
Expand Down Expand Up @@ -224,6 +221,7 @@ install -d %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d
# START - qm dropin sub-package - mount kvm #
########################################################
%if %{enable_qm_mount_bind_kvm}
mkdir -p %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d
# Add config for qm only - add drop-in file in /etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_kvm.conf
# to nested containers in QM env mount bind it in /dev/kvm
install -m 644 %{_builddir}/qm-%{version}/etc/containers/systemd/qm.container.d/qm_dropin_mount_bind_kvm.conf %{buildroot}%{_sysconfdir}/containers/systemd/qm.container.d/qm_dropin_mount_bind_kvm.conf
Expand Down Expand Up @@ -365,7 +363,6 @@ fi
%license LICENSE
%doc CODE-OF-CONDUCT.md NOTICE README.md SECURITY.md
%dir %{_datadir}/selinux
%dir %{_sysconfdir}/qm/containers/containers.conf.d
%{_datadir}/selinux/*
%dir %{_datadir}/qm
%{_datadir}/qm/containers.conf
Expand Down
Loading