From patchwork Tue Feb 26 14:59:58 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: 1048404 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 44828q3r5xz9sCH; Wed, 27 Feb 2019 02:02:03 +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 1gyeF4-00028P-7w; Tue, 26 Feb 2019 15:01:58 +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 1gyeF2-00027y-Th for kernel-team@lists.ubuntu.com; Tue, 26 Feb 2019 15:01:56 +0000 Received: from 200-160-95-202.static-user.ajato.com.br ([200.160.95.202] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gyeF2-0003IQ-7w for kernel-team@lists.ubuntu.com; Tue, 26 Feb 2019 15:01:56 +0000 From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [precise/lts-trusty v2 2/2] UBUNTU: Packaging: Make update-from-*master call copy-files Date: Tue, 26 Feb 2019 11:59:58 -0300 Message-Id: <20190226145958.19872-3-cascardo@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190226145958.19872-1-cascardo@canonical.com> References: <20190221165933.5616-1-cascardo@canonical.com> <20190226145958.19872-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-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.trusty/etc/update-from-trusty-master | 33 +-------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/debian.trusty/etc/update-from-trusty-master b/debian.trusty/etc/update-from-trusty-master index 931435bd092a..62192d7dbf43 100755 --- a/debian.trusty/etc/update-from-trusty-master +++ b/debian.trusty/etc/update-from-trusty-master @@ -98,38 +98,7 @@ else fi 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 - -# -# Make sure signed module enforcement stays off until user space is ready. -# -sed -i 's/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=y/CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE=n/' ${DEBIAN_TARGET}/config/config.common.ubuntu - -# -# Build in these 2 modules for arm in order to avoid -# a missing __aeabi_uldivmod symbol. -# -for i in CONFIG_MEGARAID_LEGACY CONFIG_MEGARAID_MAILBOX CONFIG_MEGARAID_MM CONFIG_MEGARAID_NEWGEN CONFIG_MEGARAID_SAS -do - echo "$i=n" >> ${DEBIAN_TARGET}/config/armhf/config.common.armhf -done -# Drop lowlatency -sed -i 's/lowlatency//g' ${DEBIAN_TARGET}/rules.d/*.mk -for i in lowlatency -do - find ${DEBIAN_TARGET}/config | grep $i | xargs rm -f - find ${DEBIAN_TARGET}/control.d | grep $i | xargs rm -f -done -# Make sure CONFIG_SECURITY_APPARMOR_AA3_SEMANTICS=n -sed -i 's/CONFIG_SECURITY_APPARMOR_AA3_SEMANTICS=y/CONFIG_SECURITY_APPARMOR_AA3_SEMANTICS=n/' ${DEBIAN_TARGET}/config/config.* ${DEBIAN_TARGET}/config/*/config.* +"./${DEBIAN_TARGET}/scripts/helpers/copy-files" fakeroot debian/rules clean updateconfigs || exit 1