[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1014324: bullseye-pu: package rustc-mozilla/1.59.0+dfsg1-1~deb11u1



On 04/07/2022 10:51, Emilio Pozuelo Monfort wrote:
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: pkg-rust-maintainers@alioth-lists.debian.net

Hi,

This updates rustc-mozilla in bullseye from 1.51 to 1.59. I disabled the
new binary packages in src:rustc_1.59, there are more packages that we
don't really need and could disable but since they are already present
I left them be.

I'm attaching two diffs for the debian/ dir, one from rustc-mozilla 1.51,
and one from rustc 1.59.

I have uploaded deb11u2 with the missing binaries for mips(el). Only mipsel is needed here, but the same tarball will be reused in a buster update where those will be used.

I'm adding a diff of the debian dirs. The additional diff would be the stage0-mips tarball, which includes these new binaries:

cargo-1.58.0-mipsel-unknown-linux-gnu.tar.xz
cargo-1.58.0-mips-unknown-linux-gnu.tar.xz
rustc-1.58.0-mipsel-unknown-linux-gnu.tar.xz
rustc-1.58.0-mips-unknown-linux-gnu.tar.xz
rust-std-1.58.0-mipsel-unknown-linux-gnu.tar.xz
rust-std-1.58.0-mips-unknown-linux-gnu.tar.xz

Cheers,
Emilio
diff -ruNp debian.old/changelog debian/changelog
--- debian.old/changelog	2022-07-03 11:51:30.000000000 +0200
+++ debian/changelog	2022-08-03 12:44:23.000000000 +0200
@@ -1,3 +1,9 @@
+rustc-mozilla (1.59.0+dfsg1-1~deb11u2) bullseye; urgency=medium
+
+  * Include mips(el) stage0 binaries.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Wed, 03 Aug 2022 12:44:23 +0200
+
 rustc-mozilla (1.59.0+dfsg1-1~deb11u1) bullseye; urgency=medium
 
   * Non-maintainer upload.
diff -ruNp debian.old/rules debian/rules
--- debian.old/rules	2022-06-18 11:55:15.000000000 +0200
+++ debian/rules	2022-08-03 12:44:23.000000000 +0200
@@ -65,7 +65,7 @@ update-version:
 # README.Debian for more details of the cases described below.
 #
 PRECONFIGURE_CHECK = :
-HAVE_BINARY_TARBALL := $(shell ls -1 stage0/*/*$(DEB_HOST_RUST_TYPE)* 2>/dev/null | wc -l)
+HAVE_BINARY_TARBALL := $(shell ls -1 stage0*/*/*$(DEB_HOST_RUST_TYPE)* 2>/dev/null | wc -l)
 DOWNLOAD_BOOTSTRAP := false
 # allow not using the binary tarball although it exists
 #ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 powerpc ppc64el s390x))
@@ -180,11 +180,17 @@ endif
 
 .PHONY: build
 build:
+	for fmips in stage0-mips/*/*; do \
+		f0="`echo $$fmips | sed 's/stage0-mips/stage0/'`"; \
+		# we use a hardlink here, for some reason bootstrap.py doesn't like symlinks \
+		ln $$fmips $$f0; \
+	done
 	$(SYSTEM_WORKAROUNDS) dh $@ --parallel
 
 override_dh_clean:
 	# Upstream contains a lot of these
 	dh_clean -XCargo.toml.orig
+	rm -f stage0/*/*-mips-* stage0/*/*-mipsel-*
 
 debian/config.toml: debian/config.toml.in debian/rules
 	u="$(DEB_VERSION_UPSTREAM)"; \

Reply to: