Some more cleanups

diff --git a/debian/changelog b/debian/changelog
index ab569bbd33a533411db06aa547a6b2fdb69c6c73..e81f363757f2299325f59a5d4edf2f3b06bdc1d7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+rustc (1.29.0+dfsg1-1) UNRELEASED; urgency=medium
+
+  * Upload to unstable.
+  * Drop d-armel-disable-kernel-helpers.patch as a necessary part of the
+    fix to #906520, so it is actually fixed.
+  * Backport a patch to fix the rand crate on powerpc. (Closes: #909400)
+  * Lower the s390x allowed failures back to 25.
+
+ -- Ximin Luo <infinity0@debian.org>  Sun, 23 Sep 2018 10:13:45 -0700
+
 rustc (1.29.0+dfsg1-1~exp1) experimental; urgency=medium
 
   * New upstream release.

diff --git a/debian/patches/d-armel-disable-kernel-helpers.patch b/debian/patches/d-armel-disable-kernel-helpers.patch
deleted file mode 100644 (file)
index 96005cb..0000000
--- a/debian/patches/d-armel-disable-kernel-helpers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Subject: rustc: Please include patch to disable kernel helpers on armel
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891902
-Forwarded: not-needed
-
---- a/src/libcompiler_builtins/build.rs
-+++ b/src/libcompiler_builtins/build.rs
-@@ -46,9 +46,9 @@
-     }
- 
-     // Only emit the ARM Linux atomic emulation on pre-ARMv6 architectures.
--    if llvm_target[0] == "armv4t" || llvm_target[0] == "armv5te" {
--        println!("cargo:rustc-cfg=kernel_user_helpers")
--    }
-+    // if llvm_target[0] == "armv4t" || llvm_target[0] == "armv5te" {
-+    //     println!("cargo:rustc-cfg=kernel_user_helpers")
-+    // }
- }
- 
- #[cfg(feature = "c")]

diff --git a/debian/patches/series b/debian/patches/series
index fb7b734dc17fdb3cdb27622b276d7bc757612caa..b34749e66bcdf27ad9459bcc190dccb4e8c616af 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,6 +17,7 @@ u-armel-atomics-nand.patch
 #u-ignoretest-ppc64el_02.patch
 
 # not forwarded, or forwarded but unlikely to be merged
+u-vendor-rand-fix-ppc-syscall.patch
 u-reproducible-dl-stage0.patch
 
 gcc-4.8-aarch64-ice.diff
@@ -32,7 +33,6 @@ d-rust-lldb-paths
 d-add-soname.patch
 d-dont-download-stage0.patch
 d-ignore-removed-submodules.patch
-d-armel-disable-kernel-helpers.patch
 d-read-beta-version-from-file.patch
 d-ignore-impl-generic-mismatch-diff.patch
 d-i686-baseline.patch

diff --git a/debian/patches/u-vendor-rand-fix-ppc-syscall.patch b/debian/patches/u-vendor-rand-fix-ppc-syscall.patch
new file mode 100644 (file)
index 0000000..1bcfc2a
--- /dev/null
+++ b/debian/patches/u-vendor-rand-fix-ppc-syscall.patch
@@ -0,0 +1,11 @@
+--- a/src/vendor/rand-0.4.2/src/os.rs
++++ b/src/vendor/rand-0.4.2/src/os.rs
+@@ -102,7 +102,7 @@
+         #[cfg(target_arch = "aarch64")]
+         const NR_GETRANDOM: libc::c_long = 278;
+         #[cfg(target_arch = "powerpc")]
+-        const NR_GETRANDOM: libc::c_long = 384;
++        const NR_GETRANDOM: libc::c_long = 359;
+ 
+         unsafe {
+             syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(), 0)

diff --git a/debian/rules b/debian/rules
index f88190f6b4161f4aa1d7a2f1d954ef98efdd31fa..9d19a3a6afa3599dde3c3786fa35abdd801e3c2c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -213,7 +213,7 @@ ifneq (,$(filter $(DEB_BUILD_ARCH), armel))
   FAILURES_ALLOWED = 36
 endif
 ifneq (,$(filter $(DEB_BUILD_ARCH), s390x))
-  FAILURES_ALLOWED = 50
+  FAILURES_ALLOWED = 25
 endif
 ifneq (,$(filter $(DEB_BUILD_ARCH), powerpc powerpcspe sparc64 x32))
   FAILURES_ALLOWED = 180