summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-connectivity/firewalld/firewalld_0.7.5.bb (renamed from meta-networking/recipes-connectivity/firewalld/firewalld_0.7.3.bb)11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.3.bb b/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.5.bb
index 4dea848f4b..fbf586f769 100644
--- a/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.3.bb
+++ b/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.5.bb
@@ -8,16 +8,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
8SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ 8SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
9 file://firewalld.init \ 9 file://firewalld.init \
10" 10"
11SRC_URI[md5sum] = "05ec772cbdc0a2b3df081e4beca5599d" 11SRC_URI[md5sum] = "b1aeede85a72adcf4f79d98019811244"
12SRC_URI[sha256sum] = "414c46202c12334cd5c986214e5e2575d18e743c5531a97ace1c0cd94341c60d" 12SRC_URI[sha256sum] = "45a8a7dbc084ef56ce306154d3834922e7f1fc2bf11b6c821f579cad51313226"
13 13
14# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 14# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4
15DEPENDS = "intltool-native glib-2.0-native libxslt-native docbook-xsl-stylesheets-native" 15DEPENDS = "intltool-native glib-2.0-native"
16 16
17inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d 17inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d
18 18
19PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 19PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
20PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" 20PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd"
21PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native"
21 22
22PACKAGES += "${PN}-zsh-completion" 23PACKAGES += "${PN}-zsh-completion"
23 24
@@ -37,7 +38,6 @@ EXTRA_OECONF = "\
37 --without-ebtables \ 38 --without-ebtables \
38 --without-ebtables-restore \ 39 --without-ebtables-restore \
39 --disable-sysconfig \ 40 --disable-sysconfig \
40 --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog \
41" 41"
42 42
43INITSCRIPT_NAME = "firewalld" 43INITSCRIPT_NAME = "firewalld"
@@ -62,6 +62,9 @@ do_install_append() {
62 fi 62 fi
63 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ 63 sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \
64 ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml 64 ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml
65
66 # This file contains Red Hat-isms. Modules get loaded without it.
67 rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf
65} 68}
66 69
67FILES_${PN} += "\ 70FILES_${PN} += "\