[trusty/lts-backport-utopic-next,1/3] UBUNTU: [Packaging] control -- make element ordering deterministic
diff mbox

Message ID 1447696050-21914-4-git-send-email-apw@canonical.com
State New
Headers show

Commit Message

Andy Whitcroft Nov. 16, 2015, 5:47 p.m. UTC
BugLink: http://bugs.launchpad.net/bugs/1516686
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox

diff --git a/debian/rules b/debian/rules
index 171b352..fb3210f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,7 +132,7 @@  $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in	\
 		-e 's/=HUMAN=/$(human_arch)/g'                                    \
 	  > $$new;								\
 	done
-	flavours="$(wildcard $(DEBIAN)/control.d/vars.* $(DEBIAN)/sub-flavours/*.vars)";\
+	flavours="$(sort $(wildcard $(DEBIAN)/control.d/vars.* $(DEBIAN)/sub-flavours/*.vars))";\
 	for i in $$flavours; do							\
 	  $(SHELL) $(DROOT)/scripts/control-create $$i |				\
 		sed -e 's/PKGVER/$(release)/g'                                  \
@@ -271,4 +271,4 @@  debian/control: $(DEBIAN)/control.stub
 	fi
 
 	cp $(DEBIAN)/control.stub debian/control.stub
-	cd $(builddir) && kernel-wedge gen-control > $(CURDIR)/debian/control
+	cd $(builddir) && LANG=C kernel-wedge gen-control > $(CURDIR)/debian/control