On 2025-02-25, at 18:21:03 +0100, Andreas Beckmann wrote:
> Source: xtables-addons
> Version: 3.27-3
> Severity: serious
> Tags: patch
> Justification: -source is currently unable to build modules
> 
> Hi,
> 
> I have a few updates for the dkms and module-assistant support of this
> package. The -source package currently fails to build module packages.
> This is fixed and an autopkgtest is added to automatically detect
> breakage in the future.
> 
> To simplify packaging modules depending on xtables-addons (e.g.
> west-chamber), let's ship the compat_*.h headers in the -common package.
> That way we can simply depend on that package and set a static include
> path instead of doing funny 'find, ln, cp, tar xf, echo' dances to get
> to the headers from the -dkms or -source package.
> 
> 
> Thanks for considering.
> 
> 
> Andreas

> From 2c9f312ec07859876d071164b412d75a93877768 Mon Sep 17 00:00:00 2001
> From: Andreas Beckmann <a...@debian.org>
> Date: Wed, 19 Feb 2025 21:51:16 +0100
> Subject: [PATCH 1/6] dkms.conf: Declare BUILD_EXCLUSIVE_KERNEL_MIN="4.20" for
>  using HASH_MAX_DESCSIZE

Applied.

> From ccbcdbccc6313d3acc3d630b107b8c59c6527655 Mon Sep 17 00:00:00 2001
> From: Andreas Beckmann <a...@debian.org>
> Date: Wed, 19 Feb 2025 21:54:35 +0100
> Subject: [PATCH 2/6] xtables-addons-source: Promote module-assistant to a
>  dependency
> 
> This is nowadays the only supported way to build modules from the
> -source package.

Applied.

> From 90a54b56a5ea0b36a600c1eca1680dc91ccfe078 Mon Sep 17 00:00:00 2001
> From: Andreas Beckmann <a...@debian.org>
> Date: Wed, 19 Feb 2025 21:58:03 +0100
> Subject: [PATCH 3/6] Add autopkgtest for the -source package

Applied.

> From 8abc78fcab6c128da8cb53510bd8c149a40137cd Mon Sep 17 00:00:00 2001
> From: Andreas Beckmann <a...@debian.org>
> Date: Wed, 19 Feb 2025 22:06:29 +0100
> Subject: [PATCH 4/6] Fix building twice in a row

This shouldn't have been necessary.  The .oo.d files are listed in
d/s/options in the current release:

        #
        # Ignore CPP dependency files (cf. `AM_DEPFLAGS` in 
Makefile.iptrules.in)
        #
        extend-diff-ignore = "^extensions(?:/[^/]+)?/\.libxt_\w+\.oo\.d$"

which was introduced to fix `(dpkg-buildpackage ; dpkg-buildpackage -S)`
failures reported in https://bugs.debian.org/1047926.  What did you see?

In any case, it has since occurred to me that fixing the upstream
build-system is the better solution, so I'm going to add the following
patch:

        --- a/Makefile.iptrules.in
        +++ b/Makefile.iptrules.in
        @@ -47,7 +47,7 @@
         
         clean:
                @for i in ${subdirs_list}; do ${MAKE} -C $$i $@ || exit $$?; 
done;
        -       rm -f *.oo *.so;
        +       rm -f *.oo .*.oo.d *.so;
         
         lib%.so: lib%.oo
                ${AM_V_CCLD}${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< 
${libxtables_LIBS} ${LDLIBS};

> From 8c4062d330833640dc561d0dac70716834ce124d Mon Sep 17 00:00:00 2001
> From: Andreas Beckmann <a...@debian.org>
> Date: Wed, 19 Feb 2025 22:50:52 +0100
> Subject: [PATCH 5/6] xtables-addons-source: Generate debian/control on the fly

Applied.

> From 1251dfa059736a01738614702d76f7d8436b7be5 Mon Sep 17 00:00:00 2001
> From: Andreas Beckmann <a...@debian.org>
> Date: Mon, 24 Feb 2025 10:51:34 +0100
> Subject: [PATCH 6/6] xtables-addons-common: Ship compat_*.h for use by
>  dependent modules

Applied.

J.

Attachment: signature.asc
Description: PGP signature

Reply via email to