[Python-modules-commits] [python-dmidecode] 05/10: merge patched into master

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository python-dmidecode.

commit e0b688623a7e94daffab5f0c61c03ebcbbc0e071
Merge: 40f91df 352feab
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Dec 5 18:45:58 2017 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Don-t-use-unaligned-access-on-ARM.patch   | 27 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 .../patches/tests_inject_correct_build_dir.patch   | 17 --------------
 src/config.h                                       |  2 +-
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --cc debian/.git-dpm
index 9f0a6ef,0000000..f23feae
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 0616e96b759829b4c4095ee4c38c80836e2d9c06
- 0616e96b759829b4c4095ee4c38c80836e2d9c06
++352feab1a5753c19d3d661c2000d793f75160858
++352feab1a5753c19d3d661c2000d793f75160858
 +0616e96b759829b4c4095ee4c38c80836e2d9c06
 +0616e96b759829b4c4095ee4c38c80836e2d9c06
 +python-dmidecode_3.12.2.orig.tar.gz
 +e0a5f9bca278b1a6eb3e899b32e181c9eb5eabbd
 +147096
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Don-t-use-unaligned-access-on-ARM.patch
index 0000000,0000000..ddef39e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Don-t-use-unaligned-access-on-ARM.patch
@@@ -1,0 -1,0 +1,27 @@@
++From 352feab1a5753c19d3d661c2000d793f75160858 Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Tue, 5 Dec 2017 18:45:36 -0500
++Subject: Don't use unaligned access on ARM
++
++Depending on CPU and kernel config, unaligned access may raise SIGBUS on
++ARM.  Use the slower, but safe, implementation instead.
++
++Author: Steve Langasek <steve.langasek at ubuntu.com>
++Last-Update: 2017-06-18
++---
++ src/config.h | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/src/config.h b/src/config.h
++index 4fb28df..ac3c942 100644
++--- a/src/config.h
+++++ b/src/config.h
++@@ -53,7 +53,7 @@
++ #endif
++ 
++ /* Use memory alignment workaround or not */
++-#ifdef __ia64__
+++#if defined(__ia64__) || defined(__arm__)
++ #define ALIGNMENT_WORKAROUND
++ #endif
++ 
diff --cc debian/patches/series
index 593c060,0000000..b872117
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- tests_inject_correct_build_dir.patch
++0001-Don-t-use-unaligned-access-on-ARM.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-dmidecode.git