[linux] 01/01: debian/rules.real: Include rules.defs before using architecture variables

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch sid
in repository linux.

commit ab537b5c46416276a4e2042dff3dd71c04f93cf3
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Jun 10 21:53:27 2017 +0100

    debian/rules.real: Include rules.defs before using architecture variables
    
    Closes: #862842
---
 debian/changelog  | 2 ++
 debian/rules.real | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e3fefc..9f2e101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ linux (4.11.4-1) UNRELEASED; urgency=medium
   * Set ABI to 1
   * ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()
   * ipv6: Fix leak in ipv6_gso_segment().
+  * debian/rules.real: Include rules.defs before using architecture variables
+    (Closes: #862842)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 06 Jun 2017 20:43:11 +0100
 
diff --git a/debian/rules.real b/debian/rules.real
index b1e3fac..2d53121 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -17,6 +17,8 @@ ifeq ($(DISTRIBUTOR),)
 DISTRIBUTOR := Debian
 endif
 
+include debian/rules.defs
+
 ifdef OVERRIDE_HOST_TYPE
   CROSS_COMPILE := $(OVERRIDE_HOST_TYPE)-
 else ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
@@ -33,8 +35,6 @@ export DEB_BUILD_PATH = $(CURDIR)  # for dpkg-buildflags
 export LC_ALL = C.UTF-8
 undefine LANGUAGE
 
-include debian/rules.defs
-
 stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
 
 setup_env := env -u ABINAME -u ARCH -u FEATURESET -u FLAVOUR -u VERSION -u LOCALVERSION

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git