diff -Nru rustc-1.22.1+dfsg1/debian/architecture.mk rustc-1.22.1+dfsg1/debian/architecture.mk --- rustc-1.22.1+dfsg1/debian/architecture.mk 2017-04-05 14:31:40.000000000 +0000 +++ rustc-1.22.1+dfsg1/debian/architecture.mk 2017-12-27 23:41:09.000000000 +0000 @@ -2,7 +2,7 @@ include /usr/share/dpkg/architecture.mk -rust_cpu = $(subst i586,i686,$(if $(findstring -armhf-,-$(2)-),$(subst arm,armv7,$(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.22.1+dfsg1/debian/changelog rustc-1.22.1+dfsg1/debian/changelog --- rustc-1.22.1+dfsg1/debian/changelog 2017-12-18 18:46:25.000000000 +0000 +++ rustc-1.22.1+dfsg1/debian/changelog 2017-12-27 23:41:13.000000000 +0000 @@ -1,3 +1,13 @@ +rustc (1.22.1+dfsg1-1+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] + * Fix clean target. + * Build for armv6. + [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green] + * Disable testsuite. + + -- Raspbian forward porter Wed, 27 Dec 2017 23:41:13 +0000 + rustc (1.22.1+dfsg1-1) unstable; urgency=medium [ Ximin Luo ] diff -Nru rustc-1.22.1+dfsg1/debian/rules rustc-1.22.1+dfsg1/debian/rules --- rustc-1.22.1+dfsg1/debian/rules 2017-12-18 18:25:13.000000000 +0000 +++ rustc-1.22.1+dfsg1/debian/rules 2017-12-27 23:41:12.000000000 +0000 @@ -227,7 +227,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) | tee $(TEST_LOG) test -f $(TEST_LOG) echo "Summary of specific test failures:"; \ @@ -241,6 +241,7 @@ echo "Check the logs further above for details."; \ false; \ fi +>>>>>>> debpsuedomerge # don't continue if RUSTBUILD_TEST_FLAGS is non-empty test -z "$(RUSTBUILD_TEST_FLAGS)" endif