From patchwork Mon Nov 16 17:47:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 545100 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 117BE141449; Tue, 17 Nov 2015 04:48:13 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZyNsw-0000I0-TI; Mon, 16 Nov 2015 17:48:10 +0000 Received: from mail-wm0-f50.google.com ([74.125.82.50]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZyNsT-00004v-KW for kernel-team@lists.ubuntu.com; Mon, 16 Nov 2015 17:47:41 +0000 Received: by wmdw130 with SMTP id w130so121917937wmd.0 for ; Mon, 16 Nov 2015 09:47:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+ev4LZpbSgaivQSxEg+0EeCwrKuGHodS80bTcCq0pRU=; b=g0nHhCbLzqEOabTlmmdqZCLebxumljWNeP9MEOsGDMhriFlqMbXlNMuKMHiMlI6xIT f+K8oafWrS4UEzxMjlaSlm43ZkbEXPyD7vnlD4k9utRljd2SLq5pkAou0bMHUrqzC/UV Sw/T9XJc9Wsdgs+yZ3Er/PnKDpm0FfCSVbmMDU6nB9/KwaPv9fprguqgmyKDKbqMb2+g o/8DrpAIXGaV63YaXhizdR5i1ic+HmdxgB+ji/eEf2uPOqVmM7GlQgg2q3GPdGHuj0Cs jpuFiZF1llGWCj+9PEPcBpR//79Fou78vJ5jm2iKwGFCSowHx1DUYZRtj8atVpWwweIk 2GmQ== X-Gm-Message-State: ALoCoQkPOuDaV9X/pTyux5zj0G9ywpFVTi7POydaYW9QcJrNtMuGCNuji2STxvt0YBf3l/Kj8sna X-Received: by 10.194.58.142 with SMTP id r14mr45499664wjq.37.1447696061469; Mon, 16 Nov 2015 09:47:41 -0800 (PST) Received: from localhost ([2001:470:6973:2:7530:aa29:ad:1068]) by smtp.gmail.com with ESMTPSA id b84sm17900331wmh.15.2015.11.16.09.47.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Nov 2015 09:47:40 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [trusty/master-next 1/4] UBUNTU: [Packaging] control -- make element ordering deterministic Date: Mon, 16 Nov 2015 17:47:25 +0000 Message-Id: <1447696050-21914-7-git-send-email-apw@canonical.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1447696050-21914-1-git-send-email-apw@canonical.com> References: <1447696050-21914-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1516686 Signed-off-by: Andy Whitcroft --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 4b93862..f792050 100755 --- a/debian/rules +++ b/debian/rules @@ -122,7 +122,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' \ @@ -261,4 +261,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