From patchwork Mon Nov 16 17:47:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 545094 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 73719141449; Tue, 17 Nov 2015 04:47:46 +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-00005k-5p; Mon, 16 Nov 2015 17:47:44 +0000 Received: from mail-wm0-f44.google.com ([74.125.82.44]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZyNsP-0008Vg-J9 for kernel-team@lists.ubuntu.com; Mon, 16 Nov 2015 17:47:37 +0000 Received: by wmvv187 with SMTP id v187so189122408wmv.1 for ; Mon, 16 Nov 2015 09:47:37 -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=6tZd1goi9x0em5xojjxI4atarXljuIzbztAfWieoSnY=; b=OHNMxj4UAyY9z52bFmDEjAeByl6jekb2ukPjl597fFAKJdWl1QWnXty+mJ9cKSHVlS KeoInG1Qx/hghefzma2VN2rDpqua9wzLcLV5eeJW/qToF/sp5IeP2WQ3BWEIN3LviSps wbz50H0rBZ0pEIpL67jFvg587iZPfC1KlZ/e/5QKYjkI2jgUtmpA3dNEUaXG6oZlnikv b2iJG6aV7D0UGmetOBzLx0gQ3uN291XDwTgJ1IVzFV+CMpG1tdzFkjwn1tSpkqua+1fT GiJgOqSli4SDys5PKa9i2fW9nbxZoiRhCIJXPD9Of45Lte3LR4n2oM+ihym1xGw6rzVq t3xA== X-Gm-Message-State: ALoCoQk7aM4XA/wjAXMNnxb1YkxbKgQjDx5sccAa9SLEgKCAVqAZ/TayzG0QRQJ9opZgWsVjOKbd X-Received: by 10.194.82.99 with SMTP id h3mr33949047wjy.41.1447696057381; Mon, 16 Nov 2015 09:47:37 -0800 (PST) Received: from localhost ([2001:470:6973:2:7530:aa29:ad:1068]) by smtp.gmail.com with ESMTPSA id h7sm35637381wjz.7.2015.11.16.09.47.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Nov 2015 09:47:36 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [trusty/lts-backport-utopic-next 1/3] UBUNTU: [Packaging] control -- make element ordering deterministic Date: Mon, 16 Nov 2015 17:47:22 +0000 Message-Id: <1447696050-21914-4-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 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