Package: alljoyn-services-1504
Version: 15.04-1
Severity: important
Tags: patch
User: [email protected]
Usertags: origin-ubuntu yakkety ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Set CPU to x86 when dpkg-architecture -qDEB_HOST_GNU_CPU reports i?86
* Drop build_core/conf/linux/arm to stop misconfiguration on arm{el,hf}
The arm target in the upstream source has no relevance at all to the
arm ports in Debian (not only does it require cross-compiling, but it
also targets the raspberry pi specifically). Given that, it's not
reasonable to even ship those bits in Debian, so I took a different
approach than you did in fixing this in Ubuntu.
My fix depends on the same fix being made to alljoyn-core first, which
I will submit as another bug and reference this one.
... Adam
-- System Information:
Debian Release: stretch/sid
APT prefers yakkety
APT policy: (500, 'yakkety')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.4.0-21-lowlatency (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru alljoyn-services-1504-15.04/debian/rules alljoyn-services-1504-15.04/debian/rules
--- alljoyn-services-1504-15.04/debian/rules 2016-06-04 14:46:12.000000000 -0600
+++ alljoyn-services-1504-15.04/debian/rules 2016-06-07 09:14:40.000000000 -0600
@@ -10,7 +10,7 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU | sed -e 's/i.86/x86/')
OS=linux
export VERSION := 15.04b
@@ -59,6 +59,7 @@
dh_auto_build
override_dh_auto_clean:
+ rm -rf build_core/conf/linux/arm
rm -f sample_apps/.sconsign.dblite
rm -rf sample_apps/.sconf_temp
rm -f services_common/.sconsign.dblite
