config/apparmor/abstractions: Fix meson build generation of container-base

Previously, abstractions/container-base was a hand-generated concatenation of
two different files, abstractions/container-base.in and container-rules. This
was confusing, since the meson configuration didn't actually create
abstractions/container-base from abstractions/container-base.in. Now, the
previously manual step of creating abstractions/container-base is part of the
meson configure step.

Signed-off-by: Mathias Gibbens <gibmat@debian.org>

diff --git a/config/apparmor/README b/config/apparmor/README
index 432956b9ae9eba4d85ac523496ec875d6491c0d2..76031601ad4851ffb57fcb37ac166124fbaf65d6 100644 (file)
--- a/config/apparmor/README
+++ b/config/apparmor/README
@@ -1,12 +1,6 @@
-The abstractions/container-base file is partially automatically
-generated.  The two source files are container-rules.base and
-abstractions/container-base.in.  If these file are updated,
-then
-
-1. Generate a new container-rules file using
+The abstractions/container-base file installed is automatically
+generated.  Its two source files are container-rules.base and
+abstractions/container-base.in.  If container-rules.base is updated,
+generate a new container-rules file using
 
 ./lxc-generate-aa-rules.py container-rules.base > container-rules
-
-2. Concatenate container-base.in with container-rules using
-
-cat abstractions/container-base.in container-rules > abstractions/container-base

diff --git a/config/apparmor/abstractions/meson.build b/config/apparmor/abstractions/meson.build
index b8a8e403398b26fe85d93db2a9f3d804e8b65612..8424c38b0b7d7f00742ea836d8fd3a1fefa90fcf 100644 (file)
--- a/config/apparmor/abstractions/meson.build
+++ b/config/apparmor/abstractions/meson.build
@@ -2,8 +2,9 @@
 
 if libapparmor.found()
     configure_file(
-        configuration: conf,
-        input: 'container-base',
+        command: ['cat', '@INPUT@'],
+        capture: true,
+        input: ['container-base.in', '../container-rules'],
         output: 'container-base',
         install: true,
         install_dir: join_paths(sysconfdir, 'apparmor.d', 'abstractions', 'lxc'))