diff options
| author | Richard Tollerton <rich.tollerton@ni.com> | 2024-09-13 00:11:13 -0500 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-10-07 14:15:09 -0700 |
| commit | 14c7d65643d9da0fdb0e96583961983c45d2e0c8 (patch) | |
| tree | a83b10a1e571bb878e18bc77767cce2d5b2c8352 /meta-networking/dynamic-layers | |
| parent | 7fe2259571003a56b9339fd8d0a2d89ff6e56e18 (diff) | |
| download | meta-openembedded-14c7d65643d9da0fdb0e96583961983c45d2e0c8.tar.gz | |
firewalld: upgrade 1.3.2 -> 2.2.1
Major/minor release changelogs:
- https://firewalld.org/2023/06/firewalld-2-0-0-release
- https://firewalld.org/2024/01/firewalld-2-1-0-release
- https://github.com/firewalld/firewalld/releases/tag/v2.2.0 (dunno why the
website wasn't updated)
Stop trying to rewrite /etc/firewalld/*.xml. It appears to be for the sake of
/etc/firewalld/lockdown-whitelist.xml, which is not being installed anymore.
Add RDEPENDS+=bash. Used by /usr/lib/firewalld/xmlschema/check.sh; adding to
avoid a QA failure.
Signed-off-by: Rich Tollerton <rich.tollerton@ni.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/dynamic-layers')
| -rw-r--r-- | meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_2.2.1.bb (renamed from meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb) | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_2.2.1.bb index 12cc6645b5..0c670a2caa 100644 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_2.2.1.bb | |||
| @@ -10,7 +10,7 @@ SRC_URI = "\ | |||
| 10 | file://firewalld.init \ | 10 | file://firewalld.init \ |
| 11 | file://run-ptest \ | 11 | file://run-ptest \ |
| 12 | " | 12 | " |
| 13 | SRC_URI[sha256sum] = "aba0d8ce9617b906ea4866bf0bdfb2c2d5312f53b8e9e8e9e4d49bf330da5b5e" | 13 | SRC_URI[sha256sum] = "5215ba30236ee1e3df2c2292465a9ff605b9c445dcab2e37da4961cb27c7f36e" |
| 14 | 14 | ||
| 15 | # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 | 15 | # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 |
| 16 | DEPENDS = "intltool-native glib-2.0-native nftables" | 16 | DEPENDS = "intltool-native glib-2.0-native nftables" |
| @@ -159,10 +159,10 @@ do_install:append() { | |||
| 159 | # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. | 159 | # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. |
| 160 | if [ ${PN} != "${BPN}-native" ]; then | 160 | if [ ${PN} != "${BPN}-native" ]; then |
| 161 | sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ | 161 | sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ |
| 162 | ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml | 162 | ${D}${bindir}/* ${D}${sbindir}/* |
| 163 | fi | 163 | fi |
| 164 | sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ | 164 | sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ |
| 165 | ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml | 165 | ${D}${bindir}/* ${D}${sbindir}/* |
| 166 | 166 | ||
| 167 | # This file contains Red Hat-isms. Modules get loaded without it. | 167 | # This file contains Red Hat-isms. Modules get loaded without it. |
| 168 | rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf | 168 | rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf |
| @@ -274,6 +274,7 @@ FILES:${PN} += "\ | |||
| 274 | ${datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml \ | 274 | ${datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml \ |
| 275 | " | 275 | " |
| 276 | RDEPENDS:${PN} += "\ | 276 | RDEPENDS:${PN} += "\ |
| 277 | bash \ | ||
| 277 | python3-firewall \ | 278 | python3-firewall \ |
| 278 | iptables \ | 279 | iptables \ |
| 279 | python3-core \ | 280 | python3-core \ |