diff -Nru rustc-1.28.0+dfsg1/debian/architecture.mk rustc-1.28.0+dfsg1/debian/architecture.mk --- rustc-1.28.0+dfsg1/debian/architecture.mk 2018-03-03 11:23:04.000000000 +0000 +++ rustc-1.28.0+dfsg1/debian/architecture.mk 2018-08-26 13:36:11.000000000 +0000 @@ -2,10 +2,7 @@ include /usr/share/dpkg/architecture.mk -rust_cpu = $(subst i586,i686,\ -$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(1)),\ -$(if $(findstring -armel-,-$(2)-),$(subst arm,armv5te,$(1)),\ -$(1)))) +rust_cpu = $(subst i586,i686,$(1)) rust_type_setvar = $(1)_RUST_TYPE ?= $(call rust_cpu,$($(1)_GNU_CPU),$($(1)_ARCH))-unknown-$($(1)_GNU_SYSTEM) $(foreach machine,BUILD HOST TARGET,\ diff -Nru rustc-1.28.0+dfsg1/debian/changelog rustc-1.28.0+dfsg1/debian/changelog --- rustc-1.28.0+dfsg1/debian/changelog 2018-08-05 09:18:10.000000000 +0000 +++ rustc-1.28.0+dfsg1/debian/changelog 2018-08-26 13:36:11.000000000 +0000 @@ -1,3 +1,12 @@ +rustc (1.28.0+dfsg1-2+rpi1) buster-staging; urgency=medium + + [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green at Wed, 15 Mar 2017 10:16:18 +0000] + * Build for armv6. + [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green] + * Disable testsuite. + + -- Raspbian forward porter Sun, 26 Aug 2018 13:36:11 +0000 + rustc (1.28.0+dfsg1-2) unstable; urgency=medium * Switch on verbose-tests to restore the old pre-1.28 behaviour, and restore diff -Nru rustc-1.28.0+dfsg1/debian/rules rustc-1.28.0+dfsg1/debian/rules --- rustc-1.28.0+dfsg1/debian/rules 2018-08-05 09:14:45.000000000 +0000 +++ rustc-1.28.0+dfsg1/debian/rules 2018-08-26 13:36:11.000000000 +0000 @@ -228,7 +228,7 @@ test "$$(stat -c %s "$$x")" -lt 6000000; \ done ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES))) -ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (testsuitedisabled, $(filter nocheck,$(DEB_BUILD_OPTIONS))) { $(RUSTBUILD_TEST) --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS); echo $$?; } | tee -a $(TEST_LOG) test -f $(TEST_LOG) echo "==== Debian rustc test report ===="; \