On Sat, Mar 21, 2020 at 09:38:27AM +0000, Kevin 'ldir' Darbyshire-Bryant wrote: > Hi Sebastian, > > I’ve just done a fix for this. Just waiting for a build to complete > before I push it. > > In essence, the kernel hack patches for 4.19 were copied to 5.4. The > patch in 4.19 was fixed but the one in 5.4 got forgotten about, since > no one was actually building with a 5.4 kernel till now.
Thanks for looking into this! > What I really don’t understand as the author of the patch is quite how > the old header syntax still exists, since the version of patches I > sent upstream has the fix….and in theory I backported those updates to > openwrt. > > If you can’t wait then tweak > hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch: No need, I was just seeing the failures on the build bots in the past weeks and thought I should highlight them. Thanks! > diff --git > a/target/linux/generic/hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch > > b/target/linux/generic/hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch > index f5ca1bef6e..2d3fe01a75 100644 > --- > a/target/linux/generic/hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch > +++ > b/target/linux/generic/hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch > @@ -87,8 +87,8 @@ Signed-off-by: Kevin Darbyshire-Bryant > <[email protected]> > }; > > enum { > -+ XT_CONNMARK_VALUE = BIT(0), > -+ XT_CONNMARK_DSCP = BIT(1) > ++ XT_CONNMARK_VALUE = (1 << 0), > ++ XT_CONNMARK_DSCP = (1 << 1) > +}; > + > +enum { > > Apologies for the inconvenience. > > Kevin > > > On 21 Mar 2020, at 09:13, Sebastian Kemper <[email protected]> wrote: > > > > Hi all, > > > > strongswan fails to compile since many weeks: > > > > In file included from > > /builder/shared-workdir/build/sdk/staging_dir/toolchain-aarch64_cortex-a53_gcc-8.4.0_musl/include/linux/netfilter/xt_CONNMARK.h:5, > > from connmark_listener.c:30: > > /builder/shared-workdir/build/sdk/staging_dir/toolchain-aarch64_cortex-a53_gcc-8.4.0_musl/include/linux/netfilter/xt_connmark.h:23:2: > > error: enumerator value for 'XT_CONNMARK_VALUE' is not an integer constant > > XT_CONNMARK_VALUE = BIT(0), > > ^~~~~~~~~~~~~~~~~ > > /builder/shared-workdir/build/sdk/staging_dir/toolchain-aarch64_cortex-a53_gcc-8.4.0_musl/include/linux/netfilter/xt_connmark.h:25:1: > > error: enumerator value for 'XT_CONNMARK_DSCP' is not an integer constant > > }; > > ^ > > > > Full log example: > > > > https://downloads.openwrt.org/snapshots/faillogs/aarch64_cortex-a53/packages/strongswan/compile.txt > > > > I think that this build failure is related to one of the following commits: > > > > https://github.com/openwrt/openwrt/commit/e481df07fa6599e18a0570acb4dadabc56299b7b > > https://github.com/openwrt/openwrt/commit/a1cfe0dcbb242ab440af6801e223ebde540ed90f > > > > (probably the second one) > > > > Maybe anybody can take a look at this? > > > > If you want me to raise an issue in Flyspray let me know. > > > > Kind regards, > > Seb > > > Cheers, > > Kevin D-B > > gpg: 012C ACB2 28C6 C53E 9775 9123 B3A2 389B 9DE2 334A > _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
