From patchwork Mon Nov 16 17:47:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 545097 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 B710A141449; Tue, 17 Nov 2015 04:47:57 +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 1ZyNsh-0000Bg-HB; Mon, 16 Nov 2015 17:47:55 +0000 Received: from mail-wm0-f43.google.com ([74.125.82.43]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ZyNsZ-00007S-MO for kernel-team@lists.ubuntu.com; Mon, 16 Nov 2015 17:47:47 +0000 Received: by wmdw130 with SMTP id w130so121921756wmd.0 for ; Mon, 16 Nov 2015 09:47:47 -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=4UTis2rcFiD3hlMPh3IbTjGltXRqBxFEemQz1OC64Vg=; b=hN6j/q2MSEgjfU7qipri4ORPxeEZ7po6SYsz30rYLPOSrMxlU7DW2cXqH2Z4Oy+wbK tZMUkkxDhYyazZbj3fV0BjmVE10Qbq3W4jHAe7MeoE4BcK2Nvkkq30F/ReyI+bihGrIP wb/SMTtQgzMtDq+htutzVlyM0tCFop3hueVH9hLKJjsf3H9+PhnhSzaeFUV23yFQkLMc X9B9O0lk3qKyDNuH+k5YTZGebIZQZGB7uoTYyxybg9+9XsMJB1c5PTf8hO4d8eYTkcOZ LqVP9q9Q1dF9C1vdT+g7DW4mpwc0ICTV7xbr/Gi4LGpidrEBn60ZNQHACE4IJ9WoQKAs LkYw== X-Gm-Message-State: ALoCoQkhDMTfRP81Ln7IiIrh3X+4d4muorZhjirbcqpP1Tm5qak2kiZuf4ISdcu5i3KtDr74dNKB X-Received: by 10.194.95.202 with SMTP id dm10mr39002702wjb.56.1447696067509; Mon, 16 Nov 2015 09:47:47 -0800 (PST) Received: from localhost ([2001:470:6973:2:7530:aa29:ad:1068]) by smtp.gmail.com with ESMTPSA id c13sm19642658wmd.14.2015.11.16.09.47.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Nov 2015 09:47:47 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [vivid/master-next 1/2] UBUNTU: [Packaging] control -- prepare for new kernel-wedge semantics Date: Mon, 16 Nov 2015 17:47:29 +0000 Message-Id: <1447696050-21914-11-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 18af5a0..4a7f5d0 100755 --- a/debian/rules +++ b/debian/rules @@ -95,7 +95,7 @@ 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. @@ -105,7 +105,7 @@ clean: debian/control [ -f $(DEBIAN)/reconstruct ] && bash -x $(DEBIAN)/reconstruct 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 @@ -145,7 +145,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 @@ -274,5 +273,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