On 3/8/25 21:07, Jeremy Sowden wrote:
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?
Just retried in my branch with that patch reverted:
dpkg-source: info: local changes detected, the modified files are:
xtables-addons-3.27/extensions/.libxt_CHAOS.oo.d
xtables-addons-3.27/extensions/.libxt_DELUDE.oo.d
xtables-addons-3.27/extensions/.libxt_DHCPMAC.oo.d
xtables-addons-3.27/extensions/.libxt_DNETMAP.oo.d
xtables-addons-3.27/extensions/.libxt_ECHO.oo.d
xtables-addons-3.27/extensions/.libxt_IPMARK.oo.d
xtables-addons-3.27/extensions/.libxt_LOGMARK.oo.d
xtables-addons-3.27/extensions/.libxt_PROTO.oo.d
xtables-addons-3.27/extensions/.libxt_SYSRQ.oo.d
xtables-addons-3.27/extensions/.libxt_TARPIT.oo.d
xtables-addons-3.27/extensions/.libxt_asn.oo.d
xtables-addons-3.27/extensions/.libxt_condition.oo.d
xtables-addons-3.27/extensions/.libxt_dhcpmac.oo.d
xtables-addons-3.27/extensions/.libxt_fuzzy.oo.d
xtables-addons-3.27/extensions/.libxt_geoip.oo.d
xtables-addons-3.27/extensions/.libxt_gradm.oo.d
xtables-addons-3.27/extensions/.libxt_iface.oo.d
xtables-addons-3.27/extensions/.libxt_ipp2p.oo.d
xtables-addons-3.27/extensions/.libxt_ipv4options.oo.d
xtables-addons-3.27/extensions/.libxt_length2.oo.d
xtables-addons-3.27/extensions/.libxt_lscan.oo.d
xtables-addons-3.27/extensions/.libxt_psd.oo.d
xtables-addons-3.27/extensions/.libxt_quota2.oo.d
xtables-addons-3.27/extensions/ACCOUNT/.libxt_ACCOUNT.oo.d
xtables-addons-3.27/extensions/pknock/.libxt_pknock.oo.d
dpkg-source: error: aborting due to unexpected upstream changes, see
/tmp/xtables-addons_3.27-3.1.diff.1ekyj_
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};
Does this also cover the two files in subdirectories?
PS: I tested with gbp buildpackage ... calling pbuilder ... --twice
(wrapped in some local set of scripts)
Andreas
