From patchwork Thu Feb 21 16:57:36 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: 1046294 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 4450yk5R6pz9sBr; Fri, 22 Feb 2019 03:57:50 +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 1gwrfK-0005zM-FA; Thu, 21 Feb 2019 16:57:42 +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 1gwrfH-0005xZ-By for kernel-team@lists.ubuntu.com; Thu, 21 Feb 2019 16:57:39 +0000 Received: from [194.204.107.10] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gwrfG-0001iD-UV for kernel-team@lists.ubuntu.com; Thu, 21 Feb 2019 16:57:39 +0000 From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [trusty/lts-xenial 2/2] UBUNTU: Packaging: Make update-from-*master call copy-files Date: Thu, 21 Feb 2019 13:57:36 -0300 Message-Id: <20190221165736.4788-3-cascardo@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221165736.4788-1-cascardo@canonical.com> References: <20190221165736.4788-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/1786013 Now that copy-files and local-magle 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 --- debian.xenial/etc/update-from-xenial-master | 39 +-------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/debian.xenial/etc/update-from-xenial-master b/debian.xenial/etc/update-from-xenial-master index c1d137e29e05..46dbdb74bb91 100755 --- a/debian.xenial/etc/update-from-xenial-master +++ b/debian.xenial/etc/update-from-xenial-master @@ -94,43 +94,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 - -# -# Turn off strong stack protection as it requires gcc 4.9+ -# -sed -i -e 's/^.*CONFIG_CC_STACKPROTECTOR_REGULAR.*$/CONFIG_CC_STACKPROTECTOR_REGULAR=y/' -e 's/^CONFIG_CC_STACKPROTECTOR_STRONG.*$/# CONFIG_CC_STACKPROTECTOR_STRONG is not set/' ${DEBIAN_TARGET}/config/config.common.ubuntu -sed -i 's/CONFIG_CC_STACKPROTECTOR_STRONG/CONFIG_CC_STACKPROTECTOR_REGULAR/' ${DEBIAN_TARGET}/config/annotations - -# -# Update package and DTB settings from master. -# -rsync -av ${DEBIAN_SOURCE}/rules.d/*.mk ${DEBIAN_TARGET}/rules.d/ -# Remove the .mk files from the arch's that are not supported -for i in ${FOREIGN_ARCHES} -do - rm -f ${DEBIAN_TARGET}/rules.d/${i}.mk - git rm -f ${DEBIAN_TARGET}/rules.d/${i}.mk || true -done -# Disable ZFS as we have no tooling in trusty to mount these. -sed -i -e 's/^\(do_zfs[ \t]*=[ \t]\)true\(.*\)$/\1false\2/' debian.xenial/rules.d/*.mk - -# -# 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 @@ -150,7 +114,6 @@ if [ -z "$SKIP_REBASE_IF_UPTODATE" ]; then fi # Stage the bits we changed. -rm -f ${DEBIAN_TARGET}/d-i/kernel-versions git add ${DEBIAN_TARGET}/d-i ${DEBIAN_TARGET}/config \ ${DEBIAN_TARGET}/rules.d/*.mk ${DEBIAN_TARGET}/reconstruct \ ${DEBIAN_TARGET}/modprobe.d