From c9e6dc3fecfcc004c3c4b03a2caa323a74fe1cf4 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Fri, 9 Feb 2024 22:59:39 -0500 Subject: [PATCH] clean up after running make_orig-stage0_tarball.sh Without this, the build/ directory will stick around after having run make_orig-stage0_tarball.sh. When you then run the suggested command 'dpkg-source -b .', you'll get tons of these types of errors: dpkg-source: error: cannot represent change to build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-89bc084783fdc439.rlib: binary file contents changed --- debian/changelog | 2 ++ debian/rules | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0a6ecbae79..0dc0fb3533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ rustc (1.70.0+dfsg1-6) UNRELEASED; urgency=medium [ Andres Salomon ] * Fix source_orig-stage0 bootstrapping process to actually include all architectures (closes: #1021711). + * Run 'd/rules clean' after running make_orig-stage0_tarball.sh so that the + suggestion to rebuild the .dsc actually works. -- Fabian Grünbichler Mon, 15 Jan 2024 08:16:35 +0100 diff --git a/debian/rules b/debian/rules index 03e5b6fc36..f6d227913c 100755 --- a/debian/rules +++ b/debian/rules @@ -491,6 +491,7 @@ source_orig-stage0: QUILT_PATCHES=debian/patches quilt push -aq; $(QUILT_SPECIAL_SNOWFLAKE_RETURN_CODE) $(MAKE) -f debian/rules clean debian/make_orig-stage0_tarball.sh + $(MAKE) -f debian/rules clean QUILT_PATCHES=debian/patches quilt pop -aq; $(QUILT_SPECIAL_SNOWFLAKE_RETURN_CODE) rm -rf .pc