diff --git a/.github/workflows/drop-in-target-build-only.yml b/.github/workflows/drop-in-target-build-only.yml deleted file mode 100644 index 18d3dbb2..00000000 --- a/.github/workflows/drop-in-target-build-only.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Execute make qm_dropin targets - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - run_qm_dropin_targets: - runs-on: ubuntu-latest - - container: - image: fedora:40 # Use Fedora as the container for this job - #options: --privileged # Enable privileged mode for nested containers if necessary (optional) - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Install required tools and Podman - run: | - dnf group install -y "Development Tools" - dnf install -y make bzip2 grep sed podman rpm-build selinux-policy-devel selinux-policy container-selinux golang-github-cpuguy83-md2man - - - name: Get qm_dropin targets - id: get_targets - run: | - # Extract all qm_dropin targets from Makefile - targets=$(grep -oE '^qm_dropin_[a-zA-Z0-9_-]+:' Makefile | sed 's/://g') - if [ -z "$targets" ]; then - echo "No qm_dropin targets found." - exit 0 - fi - # Replace newlines with spaces to create a single-line environment variable - targets=$(echo "$targets" | tr '\n' ' ') - echo "Found qm_dropin targets: $targets" - echo "targets=$targets" >> $GITHUB_ENV - - - name: Run qm_dropin targets - run: | - # Execute all qm_dropin targets - for target in ${{ env.targets }}; do - echo "Running target: $target" - make $target || exit 1 - done - - - name: Notify success - if: success() - run: echo "All qm_dropin targets executed successfully." - - - name: Notify failure - if: failure() - run: echo "One or more qm_dropin targets failed." && exit 1 diff --git a/rpm/qm.spec b/rpm/qm.spec index 7ae103c5..ba62db40 100644 --- a/rpm/qm.spec +++ b/rpm/qm.spec @@ -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 ################################ @@ -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 @@ -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