From patchwork Wed Apr 4 20:15:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 895142 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 40Gcdh55xgz9s1j; Thu, 5 Apr 2018 06:15:20 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1f3ooL-0000zj-IR; Wed, 04 Apr 2018 20:15:13 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1f3ooK-0000zY-40 for kernel-team@lists.ubuntu.com; Wed, 04 Apr 2018 20:15:12 +0000 Received: from mail-qk0-f200.google.com ([209.85.220.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1f3ooJ-00009s-QW for kernel-team@lists.ubuntu.com; Wed, 04 Apr 2018 20:15:11 +0000 Received: by mail-qk0-f200.google.com with SMTP id d205so12139531qkg.14 for ; Wed, 04 Apr 2018 13:15:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=qZup/MFOn243NgljnhcmljxQrBUq9XneOyTtOPJNqb4=; b=ubX/OlrdvT0bokO2z2x6QyfmXhaK1tvWQjzPd064c8q94e7mlrhsWNzD7XLwg8nVx/ EcFYSPaFlFlhU1YKALdXU29CwF421NTn52zo7hB7KZzSsCu1zdQh0l/ZA2riu0A1nglH OBW51Fmfikv3XbLfcOKtPe3lMV9cOf/D3hb1JNE0z1Ngy/CHxSWW27dQMDg1KjEo7gBu NgHwcfLdFLCawy4nfJBK66zZrLbZnEGdZdeZKuVY3Y6WSf6tEt7R2Tg7ggZb4neTeaYT 2HgbBIvNLaD2xl/AKdvwHpxuNbRcwOa0G2bZ7kQH7Vn5ORY9hSaUrqI/276cCbpfcRMz 6/Lg== X-Gm-Message-State: ALQs6tCycwS1knp9Oid1d4YvQvK7gW2Pgfg9Xo9VzXDaMxhTJAjdRWZL sqZNRMpQiQ3G1LbADcOYPOzZOmSy7xVNNLFwaQCjSDlVYDnOta6ztDsjEQNozMoWiGRwOPXLi3f foWfDkRTt85/eo3UMvIEvzib4FX81KvISpoT+WTF7 X-Received: by 10.233.225.10 with SMTP id g10mr15389748qkm.263.1522872910569; Wed, 04 Apr 2018 13:15:10 -0700 (PDT) X-Google-Smtp-Source: AIpwx49n6ADufQ/HFDHJXXHD8AwgDNIusKUWgPmdsqyJsg/K7og6o3uiokDaxX5d8v6T/DK0XVGNpA== X-Received: by 10.233.225.10 with SMTP id g10mr15389685qkm.263.1522872909697; Wed, 04 Apr 2018 13:15:09 -0700 (PDT) Received: from localhost.localdomain ([191.255.48.253]) by smtp.gmail.com with ESMTPSA id x31sm5002473qtc.55.2018.04.04.13.15.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Apr 2018 13:15:08 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [bionic][PATCH] UBUNTU: [Packaging] Only install cloud init files when do_tools_common=true Date: Wed, 4 Apr 2018 17:15:01 -0300 Message-Id: <1522872901-24519-1-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 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" Skip the inclusion of init file into the -cloud-tools-common package when do_tools_common is false. That's necessary in order to support linux-azure, that ships hyper-v tools but does not ship the common bits. Signed-off-by: Marcelo Henrique Cerri --- debian/rules.d/3-binary-indep.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index 4d9125a47407..f41da6dffd0a 100644 --- a/debian/rules.d/3-binary-indep.mk +++ b/debian/rules.d/3-binary-indep.mk @@ -168,6 +168,7 @@ binary-indep: install-indep dh_installdocs -i dh_compress -i dh_fixperms -i +ifeq ($(do_tools_common),true) ifeq ($(do_cloud_tools),true) ifeq ($(do_tools_hyperv),true) dh_installinit -p$(cloudpkg) -n --name hv-kvp-daemon @@ -180,6 +181,7 @@ ifeq ($(do_tools_hyperv),true) dh_systemd_start -p$(cloudpkg) endif endif +endif dh_installdeb -i $(lockme) dh_gencontrol -i dh_md5sums -i