From patchwork Fri Mar 1 23:56:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 1050523 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44B5tf4QG8z9s70; Sat, 2 Mar 2019 10:56:58 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gzs1M-0008Rc-7k; Fri, 01 Mar 2019 23:56:52 +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 1gzs1K-0008RI-PC for kernel-team@lists.ubuntu.com; Fri, 01 Mar 2019 23:56:50 +0000 Received: from 1.general.cascardo.us.vpn ([10.172.70.58] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gzs1J-0001CD-Vp for kernel-team@lists.ubuntu.com; Fri, 01 Mar 2019 23:56:50 +0000 From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: Packaging: Make update-from-*master call copy-files Date: Fri, 1 Mar 2019 20:56:34 -0300 Message-Id: <20190301235634.9551-2-cascardo@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190301235634.9551-1-cascardo@canonical.com> References: <20190221163637.1651-1-cascardo@canonical.com> <20190301235634.9551-1-cascardo@canonical.com> MIME-Version: 1.0 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1817734 Now that copy-files (and optionally local-mangle) are introduced, update-from-*master may make use of them, instead of doing the copies and mangles itself. That makes it easier to replace update-from-*master with a single script version for all trees in the future. Signed-off-by: Thadeu Lima de Souza Cascardo Acked-by: Stefan Bader Acked-by: Marcelo Henrique Cerri Signed-off-by: Khalid Elmously --- .../etc/update-from-azure-cosmic-master | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/debian.azure-bionic/etc/update-from-azure-cosmic-master b/debian.azure-bionic/etc/update-from-azure-cosmic-master index 1955e3dbe361..fbd8d0fc350c 100755 --- a/debian.azure-bionic/etc/update-from-azure-cosmic-master +++ b/debian.azure-bionic/etc/update-from-azure-cosmic-master @@ -96,29 +96,7 @@ then exit 1 fi -# -# Pick up any master branch changes to udeb modules or firmware. -# -rsync -av --delete ${DEBIAN_SOURCE}/d-i/ ${DEBIAN_TARGET}/d-i - -# -# Update configs from master -# -rsync -av --delete ${DEBIAN_SOURCE}/config/ ${DEBIAN_TARGET}/config - -# -# Update package and DTB settings from master. -# -rsync -av --delete ${DEBIAN_SOURCE}/rules.d/*.mk ${DEBIAN_TARGET}/rules.d/ - -# -# Update modprobe.d from master -# -rsync -av --delete ${DEBIAN_SOURCE}/modprobe.d/ ${DEBIAN_TARGET}/modprobe.d - -cp -p ${DEBIAN_SOURCE}/control.d/*.inclusion-list ${DEBIAN_TARGET}/control.d - -cp -p ${DEBIAN_SOURCE}/reconstruct ${DEBIAN_TARGET}/reconstruct +"./${DEBIAN_TARGET}/scripts/helpers/copy-files" fakeroot debian/rules clean updateconfigs