From patchwork Mon Nov 16 17:47:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 545101 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 654B4141448; Tue, 17 Nov 2015 04:48:16 +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 1ZyNt0-0000JT-0X; Mon, 16 Nov 2015 17:48:14 +0000 Received: from mail-wm0-f46.google.com ([74.125.82.46]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZyNsV-00005P-5c for kernel-team@lists.ubuntu.com; Mon, 16 Nov 2015 17:47:43 +0000 Received: by wmww144 with SMTP id w144so121010151wmw.1 for ; Mon, 16 Nov 2015 09:47:43 -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=FR3V6rmGlg0rNnWQ1dUHSOml8XvjzZrDQMn0op4Dr6k=; b=dZbbtoarhdvuZsfczZUemagg5vXh/KkPg5bpR1GvETsHKqvmD3ckte9EEx7p+PQax6 8tQkpCUJNLs6wmBlmSbA3DPA3uDjdmEzjX8+46zTz5munHRGxevj+WVuhpXS4ScTSedv 9ngnnteDqeEFekB74uIswWozHeeBhw/iZFT//3AceI5M1Y8LtKeCTH45JcyaN1V8bGDj EBA/yLM3vpSv5VPtScoPYBwpSMbdb6O5hMfZo4ZBixoHofAskcZtVJKkwLiFTeWMOtl+ 2XmCCJPNjsbD7kt/DhDNJqYFRFs5nF6gNYQm5BgBPcdquIpckAlSIbxO0wwgS1k2ETwO 8Imw== X-Gm-Message-State: ALoCoQnCrINPsYBDoPyHAWOBQk4RoXQrgNq2KkYk+VHFbd/ud4TJPALT/tUFHe4dZ4LIOiFNaufC X-Received: by 10.194.10.68 with SMTP id g4mr31587138wjb.151.1447696063004; Mon, 16 Nov 2015 09:47:43 -0800 (PST) Received: from localhost ([2001:470:6973:2:7530:aa29:ad:1068]) by smtp.gmail.com with ESMTPSA id c13sm19642384wmd.14.2015.11.16.09.47.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Nov 2015 09:47:42 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [trusty/master-next 2/4] UBUNTU: [Packaging] control -- prepare for new kernel-wedge semantics Date: Mon, 16 Nov 2015 17:47:26 +0000 Message-Id: <1447696050-21914-8-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 We have been carrying a nastly little patch for kernel-wedge to cope with the fact we use control.stub. But it is simpler to just go with the flow and emit the stub by hand. Do this in such a way we keep a fake debian/control.stub such that we will work with either Debian or Ubuntu kernel-wedge. BugLink: http://bugs.launchpad.net/bugs/1516686 Signed-off-by: Andy Whitcroft --- debian/rules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index f792050..ef8256d 100755 --- a/debian/rules +++ b/debian/rules @@ -84,14 +84,14 @@ clean: debian/control rm -rf $(DEBIAN)/linux-* # This gets rid of the d-i packages in control - cp -f $(DEBIAN)/control.stub $(DEBIAN)/control + cp -f $(DEBIAN)/control.stub $(DROOT)/control cp $(DEBIAN)/changelog debian/changelog # Install the copyright information. cp $(DEBIAN)/copyright debian/copyright distclean: clean - rm -rf $(DEBIAN)/control $(DEBIAN)/control.stub \ + rm -rf $(DROOT)/control $(DROOT)/control.stub $(DEBIAN)/control.stub \ $(DEBIAN)/d-i/kernel-versions debian/changelog \ debian/control debian/control.stub debian/copyright @@ -131,7 +131,6 @@ $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in \ -e 's/=HUMAN=/$(human_arch)/g' \ >> $(DEBIAN)/control.stub; \ done - cp $(DEBIAN)/control.stub $(DEBIAN)/control .PHONY: debian/control debian/control: $(DEBIAN)/control.stub @@ -260,5 +259,6 @@ debian/control: $(DEBIAN)/control.stub $(builddir)/firmware/$(build_arch); \ fi - cp $(DEBIAN)/control.stub debian/control.stub - cd $(builddir) && LANG=C kernel-wedge gen-control > $(CURDIR)/debian/control + echo "# placebo control.stub for kernel-wedge flow change" >debian/control.stub + cp $(DEBIAN)/control.stub debian/control + cd $(builddir) && LANG=C kernel-wedge gen-control >> $(CURDIR)/debian/control