summaryrefslogtreecommitdiffstats
path: root/recipes-mac
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-mac')
-rw-r--r--recipes-mac/AppArmor/apparmor_2.13.3.bb8
1 files changed, 6 insertions, 2 deletions
diff --git a/recipes-mac/AppArmor/apparmor_2.13.3.bb b/recipes-mac/AppArmor/apparmor_2.13.3.bb
index 990d870..6183064 100644
--- a/recipes-mac/AppArmor/apparmor_2.13.3.bb
+++ b/recipes-mac/AppArmor/apparmor_2.13.3.bb
@@ -32,11 +32,12 @@ PARALLEL_MAKE = ""
32 32
33inherit pkgconfig autotools-brokensep update-rc.d python3native perlnative ptest cpan manpages systemd 33inherit pkgconfig autotools-brokensep update-rc.d python3native perlnative ptest cpan manpages systemd
34 34
35PACKAGECONFIG ??= "python perl" 35PACKAGECONFIG ??= "python perl aa-decode"
36PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages" 36PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages"
37PACKAGECONFIG[python] = "--with-python, --without-python, python3 swig-native" 37PACKAGECONFIG[python] = "--with-python, --without-python, python3 swig-native"
38PACKAGECONFIG[perl] = "--with-perl, --without-perl, perl perl-native swig-native" 38PACKAGECONFIG[perl] = "--with-perl, --without-perl, perl perl-native swig-native"
39PACKAGECONFIG[apache2] = ",,apache2," 39PACKAGECONFIG[apache2] = ",,apache2,"
40PACKAGECONFIG[aa-decode] = ",,,bash"
40 41
41PAMLIB="${@bb.utils.contains('DISTRO_FEATURES', 'pam', '1', '0', d)}" 42PAMLIB="${@bb.utils.contains('DISTRO_FEATURES', 'pam', '1', '0', d)}"
42HTTPD="${@bb.utils.contains('PACKAGECONFIG', 'apache2', '1', '0', d)}" 43HTTPD="${@bb.utils.contains('PACKAGECONFIG', 'apache2', '1', '0', d)}"
@@ -97,6 +98,10 @@ do_install () {
97 rm -f ${D}${sbindir}/aa-notify 98 rm -f ${D}${sbindir}/aa-notify
98 fi 99 fi
99 100
101 if ! ${@bb.utils.contains('PACKAGECONFIG','aa-decode','true','false', d)}; then
102 rm -f ${D}${sbindir}/aa-decode
103 fi
104
100 if test -z "${HTTPD}" ; then 105 if test -z "${HTTPD}" ; then
101 oe_runmake -C ${B}/changehat/mod_apparmor DESTDIR="${D}" install 106 oe_runmake -C ${B}/changehat/mod_apparmor DESTDIR="${D}" install
102 fi 107 fi
@@ -161,7 +166,6 @@ PACKAGES += "mod-${PN}"
161FILES_${PN} += "/lib/apparmor/ ${sysconfdir}/apparmor ${PYTHON_SITEPACKAGES_DIR}" 166FILES_${PN} += "/lib/apparmor/ ${sysconfdir}/apparmor ${PYTHON_SITEPACKAGES_DIR}"
162FILES_mod-${PN} = "${libdir}/apache2/modules/*" 167FILES_mod-${PN} = "${libdir}/apache2/modules/*"
163 168
164RDEPENDS_${PN} += "bash"
165RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','python','python3-core python3-modules','', d)}" 169RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','python','python3-core python3-modules','', d)}"
166RDEPENDS_${PN}_remove += "${@bb.utils.contains('PACKAGECONFIG','perl','','perl', d)}" 170RDEPENDS_${PN}_remove += "${@bb.utils.contains('PACKAGECONFIG','perl','','perl', d)}"
167RDEPENDS_${PN}-ptest += "perl coreutils dbus-lib bash" 171RDEPENDS_${PN}-ptest += "perl coreutils dbus-lib bash"