Bug#1114863: src:linux: test-patches fails because quilt returns 2 when all the patches are already applied
Control: forwarded -1 https://salsa.debian.org/kernel-team/linux/-/merge_requests/1636
Control: tags -1 + confirmed
On Wed, Sep 10, 2025 at 10:52:18PM +0200, Laurent Bigonville wrote:
> Source: linux
> Version: 6.16.5-1
> Severity: normal
>
> Hello,
>
> It seems that debian/bin/test-patches is not working properly anymore as
> quilt is returning 2 when there is nothing else to apply:
>
> bigon@eriador:/tmp/linux-6.16.5$ debian/bin/test-patches /tmp/0001-drm-i915-dp-Fix-resetting-DSC-capability-during-dete.patch
> mkdir -p debian/build
> printf >debian/build/version-info 'Source: %s\nVersion: %s\nDistribution: %s\n' linux 6.16.5-1a~test UNRELEASED
> PYTHONHASHSEED=0 debian/bin/gencontrol.py
> md5sum debian/bin/gencontrol.py debian/build/version-info debian/config/alpha/defines.toml debian/config/amd64/defines.toml debian/config/arm64/defines.toml debian/config/armel/defines.toml debian/config/armhf/defines.toml debian/config/defines.toml debian/config/hppa/defines.toml debian/config/loong64/defines.toml debian/config/m68k/defines.toml debian/config/mips/defines.toml debian/config/mips64/defines.toml debian/config/mips64el/defines.toml debian/config/mips64r6el/defines.toml debian/config/mipsel/defines.toml debian/config/powerpc/defines.toml debian/config/ppc64/defines.toml debian/config/ppc64el/defines.toml debian/config/riscv64/defines.toml debian/config/s390x/defines.toml debian/config/sh4/defines.toml debian/config/sparc64/defines.toml debian/installer/package-list debian/templates/config.control.in debian/templates/docs.control.in debian/templates/docs.meta.control.in debian/templates/docs.meta.maintscript.in debian/templates/extra.control.in debian/templates/headers.control.in debian/templates/headers.featureset.control.in debian/templates/headers.meta.control.in debian/templates/headers.meta.maintscript.in debian/templates/headers.postinst.in debian/templates/headers.tests-control.in debian/templates/image-dbg.control.in debian/templates/image-dbg.meta.control.in debian/templates/image-dbg.meta.maintscript.in debian/templates/image-extra-dev.control.in debian/templates/image-unsigned.control.in debian/templates/image-unsigned.postinst.in debian/templates/image-unsigned.postrm.in debian/templates/image-unsigned.preinst.in debian/templates/image-unsigned.prerm.in debian/templates/image.control.in debian/templates/image.meta.bug-presubj.in debian/templates/image.meta.control.in debian/templates/image.meta.maintscript.in debian/templates/image.postinst.in debian/templates/image.postrm.in debian/templates/image.preinst.in debian/templates/image.prerm.in debian/templates/image.tests-control.in debian/templates/libc-dev.control.in debian/templates/main.control.in debian/templates/main.tests-control.in debian/templates/signed-template.control.in debian/templates/signed-template.lintian-overrides.in debian/templates/signed.headers.meta.control.in debian/templates/signed.headers.meta.lintian-overrides.in debian/templates/signed.headers.meta.maintscript.in debian/templates/signed.image.control.in debian/templates/signed.image.postinst.in debian/templates/signed.image.postrm.in debian/templates/signed.image.preinst.in debian/templates/signed.image.prerm.in debian/templates/signed.source.control.in debian/templates/signed.source.lintian-overrides.in debian/templates/source.control.in debian/templates/sourcebin.control.in debian/templates/sourcebin.meta.control.in debian/templates/sourcebin.meta.maintscript.in debian/templates/tools-unversioned.control.in debian/templates/tools-versioned.control.in > debian/control.md5sum
>
> This target is made to fail intentionally, to make sure
> that it is NEVER run during the automated build. Please
> ignore the following error, the debian/control file has
> been generated SUCCESSFULLY.
>
> exit 1
> make: *** [debian/rules:156: debian/control-real] Error 1
> dh_testdir
> rm -rf debian/build debian/stamps debian/lib/python/debian_linux/*.pyc debian/lib/python/debian_linux/__pycache__ $(find debian -maxdepth 1 -type d -name 'linux-*') debian/*-modules-*-di* debian/kernel-image-*-di* debian/*-tmp debian/*.substvars
> dh_clean
> mkdir -p debian/build
> printf >debian/build/version-info 'Source: %s\nVersion: %s\nDistribution: %s\n' linux 6.16.5-1a~test UNRELEASED
> md5sum --check debian/control.md5sum --status || \
> /usr/bin/make -f debian/rules debian/control-real
> dh_testdir
> /usr/bin/make -f debian/rules.gen source
> make[1] : on entre dans le répertoire « /tmp/linux-6.16.5 »
> /usr/bin/make -f debian/rules.real source ABINAME='6.16+unreleased' FEATURESET='none' SOURCEVERSION='6.16.5-1a~test' SOURCE_BASENAME='linux' SOURCE_SUFFIX='' UPSTREAMVERSION='6.16' VERSION='6.16'
> make[2] : on entre dans le répertoire « /tmp/linux-6.16.5 »
> test -d .pc
> set +e; QUILT_PC=.pc quilt unapplied --quiltrc - >/dev/null && echo 'Patch series not fully applied'; test $? -eq 1
> File series fully applied, ends at patch bugfix/all/bootconfig-fix-negative-seeks-on-32-bit-with-lfs-ena.patch
> mkdir -p 'debian/build'
> rm -f 'debian/build/source_none'
> ln -s '/tmp/linux-6.16.5' 'debian/build/source_none'
> make[2] : on quitte le répertoire « /tmp/linux-6.16.5 »
> /usr/bin/make -f debian/rules.real source ABINAME='6.16+unreleased' FEATURESET='rt' SOURCEVERSION='6.16.5-1a~test' SOURCE_BASENAME='linux' SOURCE_SUFFIX='' UPSTREAMVERSION='6.16' VERSION='6.16'
> make[2] : on entre dans le répertoire « /tmp/linux-6.16.5 »
> mkdir -p 'debian/build'
> rm -rf 'debian/build/source_rt'
> mkdir -p 'debian/build/source_rt'
> cp -al arch block certs COPYING CREDITS crypto Documentation drivers fs include init io_uring ipc Kbuild Kconfig kernel lib LICENSES MAINTAINERS Makefile mm net README rust samples scripts security sound tools usr virt .clang-format .clippy.toml .cocciconfig .editorconfig .get_maintainer.ignore .gitattributes .gitignore .mailmap .pylintrc .rustfmt.toml 'debian/build/source_rt'
> cd 'debian/build/source_rt' && QUILT_PATCHES='/tmp/linux-6.16.5/debian/patches-rt' QUILT_PC=.pc quilt push --quiltrc - -a -q --fuzz=0
> File series fully applied, ends at patch bugfix/all/bootconfig-fix-negative-seeks-on-32-bit-with-lfs-ena.patch
> make[2]: *** [debian/rules.real:120: debian/stamps/source_rt] Error 2
> make[2] : on quitte le répertoire « /tmp/linux-6.16.5 »
> make[1]: *** [debian/rules.gen:3196: source_rt] Error 2
> make[1] : on quitte le répertoire « /tmp/linux-6.16.5 »
> make: *** [debian/rules:28: source] Error 2
Yes, we are aware of that due to an earlier report. WIP:
https://salsa.debian.org/kernel-team/linux/-/merge_requests/1636
Regards,
Salvatore
Reply to: