Skip to content

Commit 4f784de

Browse files
committed
fix: install apparmor parser require config files
New package structure: ``` drwxr-xr-x 0/0 0 2019-06-02 01:34 etc drwxr-xr-x 0/0 0 2019-06-02 01:34 etc/apparmor -rw-r--r-- 0/0 2270 2019-06-02 01:34 etc/apparmor/parser.conf drwxr-xr-x 0/0 0 2019-06-02 01:34 etc/apparmor.d drwxr-xr-x 0/0 0 2019-06-02 01:34 etc/apparmor.d/abi -rw-r--r-- 0/0 1925 2019-06-02 01:34 etc/apparmor.d/abi/3.0 drwxr-xr-x 0/0 0 2019-06-02 01:34 etc/apparmor.d/disable drwxr-xr-x 0/0 0 2019-06-02 01:34 usr drwxr-xr-x 0/0 0 2019-06-02 01:34 usr/bin -rwxr-xr-x 0/0 1044984 2019-06-02 01:34 usr/bin/apparmor_parser drwxr-xr-x 0/0 0 2019-06-02 01:34 usr/share drwxr-xr-x 0/0 0 2019-06-02 01:34 usr/share/spdx -rw-r--r-- 0/0 2875 2019-06-02 01:34 usr/share/spdx/apparmor.spdx.json ``` This fixes an error like: ``` parser error(\"Warning from stdin (line 1): config file '/etc/apparmor/parser.conf' not found\\nAppArmor parser error for /run/cri-containerd.apparmor.d2733786676 in profile /run/cri-containerd.apparmor.d2733786676 at line 2: Could not open 'abi/3.0': No error information\") ``` Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent 559b1be commit 4f784de

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

apparmor/pkg.yaml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,27 @@ steps:
2626
- |
2727
cd libraries/libapparmor
2828
make -j $(nproc)
29-
30-
cd ../../parser
29+
- |
30+
cd parser
3131
make arch -j $(nproc)
3232
install:
3333
- |
3434
cd parser
3535
DISTRO=unknown make install-arch DESTDIR=/rootfs SBINDIR=/rootfs/usr/bin
36+
37+
INSTALL_CONFDIR=/rootfs/etc/apparmor
38+
install -m 755 -d ${INSTALL_CONFDIR}
39+
install -m 644 parser.conf ${INSTALL_CONFDIR}
40+
- |
41+
cd profiles
42+
43+
PROFILES_DEST=/rootfs/etc/apparmor.d
44+
45+
install -m 755 -d ${PROFILES_DEST}
46+
install -m 755 -d ${PROFILES_DEST}/disable
47+
48+
install -m 755 -d "${PROFILES_DEST}/abi"
49+
install -m 644 ./apparmor.d/abi/3.0 ${PROFILES_DEST}/abi/3.0
3650
test:
3751
- |
3852
fhs-validator /rootfs

0 commit comments

Comments
 (0)