From patchwork Fri Sep 26 17:43:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 393882 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 1D4C0140143; Sat, 27 Sep 2014 03:44:21 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XXZYz-0005AV-5s; Fri, 26 Sep 2014 17:44:13 +0000 Received: from complete.lackof.org ([198.49.126.79]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XXZYu-00058c-6J for kernel-team@lists.ubuntu.com; Fri, 26 Sep 2014 17:44:08 +0000 Received: from localhost (c-50-170-238-85.hsd1.co.comcast.net [50.170.238.85]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client did not present a certificate) by complete.lackof.org (Postfix) with ESMTPSA id 7331C33E00A9 for ; Fri, 26 Sep 2014 11:44:05 -0600 (MDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH] [Utopic] UBUNTU: [Packaging] Don't fail if linux-tools symlinks already exist Date: Fri, 26 Sep 2014 11:43:51 -0600 Message-Id: <1411753431-17507-1-git-send-email-dann.frazier@canonical.com> X-Mailer: git-send-email 2.1.1 X-Virus-Scanned: clamav-milter 0.98.1 at complete.lackof.org X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on complete.lackof.org 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 A restarted build (dpkg-buildpackage -nc) currently fails if the linux-tools symlinks remain from a previous build. Use ln -sf to allow the build to continue by overwriting any existing links. Signed-off-by: dann frazier --- debian/rules.d/2-binary-arch.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index fe2bd68..e4e323e 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -301,27 +301,27 @@ ifeq ($(do_linux_tools),true) # Create the linux-tools tool links install -d $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* ifeq ($(do_tools_usbip),true) - ln -s ../../$(src_pkg_name)-tools-$(abi_release)/usbip $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* - ln -s ../../$(src_pkg_name)-tools-$(abi_release)/usbipd $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* + ln -sf ../../$(src_pkg_name)-tools-$(abi_release)/usbip $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* + ln -sf ../../$(src_pkg_name)-tools-$(abi_release)/usbipd $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* endif ifeq ($(do_tools_cpupower),true) - ln -s ../../$(src_pkg_name)-tools-$(abi_release)/cpupower $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* + ln -sf ../../$(src_pkg_name)-tools-$(abi_release)/cpupower $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* endif ifeq ($(do_tools_perf),true) - ln -s ../../$(src_pkg_name)-tools-$(abi_release)/perf $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* + ln -sf ../../$(src_pkg_name)-tools-$(abi_release)/perf $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* endif ifeq ($(do_tools_x86),true) - ln -s ../../$(src_pkg_name)-tools-$(abi_release)/x86_energy_perf_policy $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* - ln -s ../../$(src_pkg_name)-tools-$(abi_release)/turbostat $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* + ln -sf ../../$(src_pkg_name)-tools-$(abi_release)/x86_energy_perf_policy $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* + ln -sf ../../$(src_pkg_name)-tools-$(abi_release)/turbostat $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* endif endif ifeq ($(do_cloud_tools),true) ifeq ($(do_tools_hyperv),true) # Create the linux-hyperv tool links install -d $(cloudpkgdir)/usr/lib/linux-tools/$(abi_release)-$* - ln -s ../../$(src_pkg_name)-tools-$(abi_release)/hv_kvp_daemon $(cloudpkgdir)/usr/lib/linux-tools/$(abi_release)-$* - ln -s ../../$(src_pkg_name)-tools-$(abi_release)/hv_vss_daemon $(cloudpkgdir)/usr/lib/linux-tools/$(abi_release)-$* - ln -s ../../$(src_pkg_name)-tools-$(abi_release)/hv_fcopy_daemon $(cloudpkgdir)/usr/lib/linux-tools/$(abi_release)-$* + ln -sf ../../$(src_pkg_name)-tools-$(abi_release)/hv_kvp_daemon $(cloudpkgdir)/usr/lib/linux-tools/$(abi_release)-$* + ln -sf ../../$(src_pkg_name)-tools-$(abi_release)/hv_vss_daemon $(cloudpkgdir)/usr/lib/linux-tools/$(abi_release)-$* + ln -sf ../../$(src_pkg_name)-tools-$(abi_release)/hv_fcopy_daemon $(cloudpkgdir)/usr/lib/linux-tools/$(abi_release)-$* endif endif