Revert "apparmor: Allow version-specific bits in abstractions too"

This reverts commit 63a312fa2d3be0e34a8989deddd39792fc9badf6.

There is no longer any need to dynamically generate version specific
rules. This revert can be reverted, if the need ever arises again
in the future.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/security/apparmor/libvirt-lxc.in b/src/security/apparmor/libvirt-lxc
similarity index 100%
rename from src/security/apparmor/libvirt-lxc.in
rename to src/security/apparmor/libvirt-lxc

diff --git a/src/security/apparmor/libvirt-qemu.in b/src/security/apparmor/libvirt-qemu
similarity index 100%
rename from src/security/apparmor/libvirt-qemu.in
rename to src/security/apparmor/libvirt-qemu

diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
index b9257c816d1eff33a9d478253cd5848f232e397e..356951c7f1cfcc191aacbaa494139c27af1e42d1 100644 (file)
--- a/src/security/apparmor/meson.build
+++ b/src/security/apparmor/meson.build
@@ -5,11 +5,6 @@ apparmor_gen_profiles = [
   'usr.sbin.virtxend',
 ]
 
-apparmor_gen_abstractions = [
-  'libvirt-qemu',
-  'libvirt-lxc',
-]
-
 apparmor_gen_profiles_conf = configuration_data({
   'sysconfdir': sysconfdir,
   'sbindir': sbindir,
@@ -61,16 +56,10 @@ foreach name : apparmor_gen_profiles
   )
 endforeach
 
-foreach name : apparmor_gen_abstractions
-  configure_file(
-    input: '@0@.in'.format(name),
-    output: name,
-    command: apparmor_gen_cmd,
-    capture: true,
-    install: true,
-    install_dir: apparmor_dir / 'abstractions',
-  )
-endforeach
+install_data(
+  [ 'libvirt-qemu', 'libvirt-lxc' ],
+  install_dir: apparmor_dir / 'abstractions',
+)
 
 install_data(
   [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],