Source: rsync
Version: 3.1.2-2
Severity: important
User: [email protected]
Usertags: rebootstrap

I noticed that when building rsync, it sometimes ends up with the wrong
Architecture field in the binary package. When I built rsync for arm64,
it could still end up as "Architecture: amd64". It turns out the
debian/rules assigns DEB_HOST_ARCH=$(DEB_BUILD_ARCH). Since
DEB_HOST_ARCH usually is an exported variable, subprocesses (e.g.
dpkg-gencontrol) see the assignment and use the wrong value. Simply
removing that line (as it is otherwise unused) fixes the build. Please
consider applying the attached patch.

Helmut
diff --minimal -Nru rsync-3.1.2/debian/changelog rsync-3.1.2/debian/changelog
--- rsync-3.1.2/debian/changelog        2017-03-17 15:02:00.000000000 +0100
+++ rsync-3.1.2/debian/changelog        2017-06-29 06:30:39.000000000 +0200
@@ -1,3 +1,11 @@
+rsync (3.1.2-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix Architecture field of cross built packages.
+    closes: #-1
+
+ -- Helmut Grohne <[email protected]>  Thu, 29 Jun 2017 06:30:39 +0200
+
 rsync (3.1.2-2) unstable; urgency=medium
 
   * Added patch from upstream git to resolve temporary lines in --progress
diff --minimal -Nru rsync-3.1.2/debian/rules rsync-3.1.2/debian/rules
--- rsync-3.1.2/debian/rules    2016-10-07 15:51:56.000000000 +0200
+++ rsync-3.1.2/debian/rules    2017-06-29 06:30:36.000000000 +0200
@@ -25,21 +25,6 @@
 CFLAGS   := -Wall  $(shell $(dpkg_buildflags) --get CFLAGS)
 LDFLAGS  :=        $(shell $(dpkg_buildflags) --get LDFLAGS)
 
-# backwards compatibility stuff, from dpkg-architecture manpage
-DEB_BUILD_ARCH := $(shell dpkg --print-architecture)
-DEB_BUILD_GNU_CPU := $(patsubst hurd-%,%,$(DEB_BUILD_ARCH))
-ifeq ($(filter-out hurd-%,$(DEB_BUILD_ARCH)),)
-DEB_BUILD_GNU_SYSTEM := gnu
-else
-DEB_BUILD_GNU_SYSTEM := linux
-endif
-DEB_BUILD_GNU_TYPE=$(DEB_BUILD_GNU_CPU)-$(DEB_BUILD_GNU_SYSTEM)
-
-DEB_HOST_ARCH=$(DEB_BUILD_ARCH)
-DEB_HOST_GNU_CPU=$(DEB_BUILD_GNU_CPU)
-DEB_HOST_GNU_SYSTEM=$(DEB_BUILD_GNU_SYSTEM)
-DEB_HOST_GNU_TYPE=$(DEB_BUILD_GNU_TYPE)
-
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 

Reply via email to