On 12/6/19 1:32 AM, akuster808 wrote: > > > On 12/5/19 12:05 PM, Niko Mauno wrote: >> Introduce cosmetic changes to recipe content, most notably >> - Change indentation style to four spaces in task statements >> - Reorder several entries according to oe-stylize.py suggestions >> >> (From OE-Core rev: c1d162b6165f11b7b5ae5c6066e7683d5e1379fc) >> >> Signed-off-by: Niko Mauno <niko.ma...@iki.fi> >> Signed-off-by: Ross Burton <ross.bur...@intel.com> >> Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> > > These changes do not pass the 'stable' bar for backporting. Unless a > more compelling reason is give, this series is being "NACKed" at this time. > > - armin
Thanks for checking Armin. For the record, proposed mainly for complementing the existing systemd-specific automatic ipv4 rules loading functionality with ipv6, particularly since both 'ipv4' and 'ipv6' are enabled in DISTRO_FEATURES by default. -Niko >> --- >> .../iptables/iptables_1.8.3.bb | 60 +++++++++---------- >> 1 file changed, 29 insertions(+), 31 deletions(-) >> >> diff --git a/meta/recipes-extended/iptables/iptables_1.8.3.bb >> b/meta/recipes-extended/iptables/iptables_1.8.3.bb >> index ff9fcb1b53..563c8ae354 100644 >> --- a/meta/recipes-extended/iptables/iptables_1.8.3.bb >> +++ b/meta/recipes-extended/iptables/iptables_1.8.3.bb >> @@ -4,8 +4,9 @@ filtering code in Linux." >> HOMEPAGE = "http://www.netfilter.org/"; >> BUGTRACKER = "http://bugzilla.netfilter.org/"; >> LICENSE = "GPLv2+" >> -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263\ >> - >> file://iptables/iptables.c;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc" >> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ >> + >> file://iptables/iptables.c;beginline=13;endline=25;md5=c5cffd09974558cf27d0f763df2a12dc >> \ >> +" >> >> SRC_URI = >> "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ >> >> file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ >> @@ -13,16 +14,16 @@ SRC_URI = >> "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ >> file://iptables.service \ >> file://iptables.rules \ >> " >> - >> SRC_URI[md5sum] = "29de711d15c040c402cf3038c69ff513" >> SRC_URI[sha256sum] = >> "a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80" >> >> +SYSTEMD_SERVICE_${PN} = "iptables.service" >> + >> inherit autotools pkgconfig systemd >> >> EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR}" >> >> PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" >> - >> PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," >> >> # libnfnetlink recipe is in meta-networking layer >> @@ -32,9 +33,19 @@ PACKAGECONFIG[libnfnetlink] = >> "--enable-libnfnetlink,--disable-libnfnetlink,libn >> PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl" >> >> do_configure_prepend() { >> - # Remove some libtool m4 files >> - # Keep ax_check_linker_flags.m4 which belongs to autoconf-archive. >> - rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 >> + # Remove some libtool m4 files >> + # Keep ax_check_linker_flags.m4 which belongs to autoconf-archive. >> + rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 >> +} >> + >> +do_install_append() { >> + install -d ${D}${sysconfdir}/iptables >> + install -m 0644 ${WORKDIR}/iptables.rules ${D}${sysconfdir}/iptables >> + >> + install -d ${D}${systemd_system_unitdir} >> + install -m 0644 ${WORKDIR}/iptables.service >> ${D}${systemd_system_unitdir} >> + >> + sed -i -e 's,@SBINDIR@,${sbindir},g' >> ${D}${systemd_system_unitdir}/iptables.service >> } >> >> PACKAGES += "${PN}-modules" >> @@ -47,30 +58,6 @@ python populate_packages_prepend() { >> d.appendVar('RDEPENDS_' + metapkg, ' ' + ' '.join(modules)) >> } >> >> -FILES_${PN} += "${datadir}/xtables" >> - >> -# Include the symlinks as well in respective packages >> -FILES_${PN}-module-xt-conntrack += "${libdir}/xtables/libxt_state.so" >> -FILES_${PN}-module-xt-ct += "${libdir}/xtables/libxt_NOTRACK.so" >> - >> -INSANE_SKIP_${PN}-module-xt-conntrack = "dev-so" >> -INSANE_SKIP_${PN}-module-xt-ct = "dev-so" >> - >> -ALLOW_EMPTY_${PN}-modules = "1" >> - >> -do_install_append() { >> - >> - install -d ${D}${sysconfdir}/iptables >> - install -m 0644 ${WORKDIR}/iptables.rules ${D}${sysconfdir}/iptables >> - >> - install -d ${D}${systemd_system_unitdir} >> - install -m 0644 ${WORKDIR}/iptables.service >> ${D}${systemd_system_unitdir} >> - >> - sed -i -e 's,@SBINDIR@,${sbindir},g' >> ${D}${systemd_system_unitdir}/iptables.service >> -} >> - >> -SYSTEMD_SERVICE_${PN} = "iptables.service" >> - >> RDEPENDS_${PN} = "${PN}-module-xt-standard" >> RRECOMMENDS_${PN} = " \ >> ${PN}-modules \ >> @@ -84,3 +71,14 @@ RRECOMMENDS_${PN} = " \ >> kernel-module-nf-nat \ >> kernel-module-ipt-masquerade \ >> " >> + >> +FILES_${PN} += "${datadir}/xtables" >> + >> +# Include the symlinks as well in respective packages >> +FILES_${PN}-module-xt-conntrack += "${libdir}/xtables/libxt_state.so" >> +FILES_${PN}-module-xt-ct += "${libdir}/xtables/libxt_NOTRACK.so" >> + >> +ALLOW_EMPTY_${PN}-modules = "1" >> + >> +INSANE_SKIP_${PN}-module-xt-conntrack = "dev-so" >> +INSANE_SKIP_${PN}-module-xt-ct = "dev-so" > -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
