From patchwork Thu Nov 27 04:48:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Kehn X-Patchwork-Id: 415368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 777951401EF for ; Thu, 27 Nov 2014 15:49:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7117291CF1; Thu, 27 Nov 2014 04:49:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SLQG06J4+j1I; Thu, 27 Nov 2014 04:49:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1B35D91D05; Thu, 27 Nov 2014 04:49:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 01FC01C0BCD for ; Thu, 27 Nov 2014 04:49:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F3292A1BDC for ; Thu, 27 Nov 2014 04:49:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1OYydmyHwigl for ; Thu, 27 Nov 2014 04:49:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from nm29-vm4.bullet.mail.ne1.yahoo.com (nm29-vm4.bullet.mail.ne1.yahoo.com [98.138.91.189]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 34065A1BCE for ; Thu, 27 Nov 2014 04:49:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1417063776; bh=9uXv6rvkL1kM5vYhzckRqxH3R8QSq3MnVEmDKgJ7Od4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=Xjp8nfiiyQozH3UqtsG67T6rmF2Oxyyno7iQMRbObyQBumwzC6MBrz5kXdv5ukiPD/CaxFEhPPSIZTimKrtTxmbHxHtMIrzOsJasixdQxCINoy68jiX0ADcKAkPdn7hXD9qhGhcYmKSAZTeh2Qv933HXi2pGBXUP9iPIPCk9Cz3oF8VK+fHPalMPhSB5Ls03vzoWfg+4VSQU9rOdzEz3jBOZ4Lrvv7FdbcyPfQEsKNNQzFC7NwNrjAIudPAs/g0CSsKzx11JE66BCsmh4DbW/RSVagGJTn79926s4d02ZNYTAAjk0BwM9XgI9hImUsTFcBB5xh1atG7+ZA1zV+NgAw== DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s2048; d=yahoo.com; b=BHCXoKsdPdVVKEgFvmCXWc3bEnjhNCnjHh2vzQY91kQMfKsDNxizjzRVLiTLY8ju1k5StFEcUJno9v0M+wrOqpSOJeyuoL1ZFk22dhXN448TcVTFIhwmm2WSBRfKyecopPOfVs20rJeqr1EnGmAaLo2RrkZHWoRw+4RYQqbcqy7rp+MTUcXRGFWgRNRRgKhVQT2sKRk1TigpOeS/5e8GmvpyoLbOQ7/hKpCrDaYAUnkf9r5N81QskPTt/U5DtQQXUePjpFMoqdLtLlVOhvbE28JlznxG2NC3fD9f12YhGzSzQ/61bXMox14D55pp9O4VuyRN/S4ZncTg4HcmJz+vDQ==; Received: from [98.138.100.111] by nm29.bullet.mail.ne1.yahoo.com with NNFMP; 27 Nov 2014 04:49:36 -0000 Received: from [98.138.226.124] by tm100.bullet.mail.ne1.yahoo.com with NNFMP; 27 Nov 2014 04:49:36 -0000 Received: from [127.0.0.1] by smtp203.mail.ne1.yahoo.com with NNFMP; 27 Nov 2014 04:49:36 -0000 X-Yahoo-Newman-Id: 230470.30307.bm@smtp203.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: jo5sSv0VM1l7q2cgsG7J7R1XxX5hTrsk.dcYXf6e1Q3bYPz 54IeFsr_eKa7Gor5.P2TYoFwU19Do._JnINh7mwEDn_IX_LqGVKtrS1bGUkO zgJwd5mb0ByIlwDhjxESF6jv8iZLhjgMvv6DWP8Z.xzIc0BB6RaHe3JeyjxV .rg1hwmeHpQ8K4vFO4NkD4xoJF6DYzuv.QKAfKROf_gIYI7GwEr9qhcqM6yL aAkPs1Vz2gE3hAG4U4KT8iFQSD_4UVVYSYOVFxwRHxkfKXEqd6nmW2m2CXWi 4bZ.tB3QQ.aMG0pnsshGjW86bAo1wC.WmxE0FGTBujcgO4La60MoRtrtcBHq aHz9.R79zLiQXSKnQDCNBmr3Y1sUtwHHBqySKG7nRcGznkn1scnqSFsdIdHW vwO.21SzzHDNSzViMXpq_j7Fq1c_7gAj0OwXrLl8R9GSezvoq99scYRfIl2R 1eCfiG797nxG2Y7sS_exq3_OKrIMp3OQE_lju0XIQCR3gWwd4z61GQcnjyuy e0J3Ao1UOlIEaRSbMpQnS0uTSD3xelg3Mqhq8adaFCc_fK94X86avY6wUb.5 UnKqn898fvztY8D7kOJz1UvssYrGBgPw- X-Yahoo-SMTP: tVp.douswBADms9I1_pvnFcs0w-- From: Doug Kehn To: buildroot@buildroot.org Date: Wed, 26 Nov 2014 22:48:46 -0600 Message-Id: <1417063727-4420-2-git-send-email-rdkehn@yahoo.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417063727-4420-1-git-send-email-rdkehn@yahoo.com> References: <1417063727-4420-1-git-send-email-rdkehn@yahoo.com> Subject: [Buildroot] [PATCH v2 1/2] pkg-generic.mk: reinstall targets X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add reinstall targets for host, target, staging, and images variants. clean-for-reinstall targets added to remove package .stamp_target_install file to allow package install. Additionally, when OVERRIDE_SRCDIR is provided, .stamp_rsynced is removed to ensure pakcage is up to date before reinstalling. Signed-off-by: Doug Kehn --- package/pkg-generic.mk | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 9643a30..3c25778 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -480,34 +480,51 @@ $(1): $(1)-install ifeq ($$($(2)_TYPE),host) $(1)-install: $(1)-install-host +$(1)-reinstall: $(1)-reinstall-host else $(1)-install: $(1)-install-staging $(1)-install-target $(1)-install-images +$(1)-reinstall: $(1)-reinstall-staging $(1)-reinstall-target $(1)-reinstall-images endif ifeq ($$($(2)_INSTALL_TARGET),YES) -$(1)-install-target: $$($(2)_TARGET_INSTALL_TARGET) +$(1)-install-target: $$($(2)_TARGET_INSTALL_TARGET) +$(1)-reinstall-target: $(1)-clean-for-reinstall-target $$($(2)_TARGET_INSTALL_TARGET) +$(1)-clean-for-reinstall-target: $(1)-clean-for-reinstall + rm -f $$($(2)_TARGET_INSTALL_TARGET) $$($(2)_TARGET_INSTALL_TARGET): $$($(2)_TARGET_BUILD) else $(1)-install-target: +$(1)-reinstall-target: endif ifeq ($$($(2)_INSTALL_STAGING),YES) $(1)-install-staging: $$($(2)_TARGET_INSTALL_STAGING) +$(1)-reinstall-staging: $(1)-clean-for-reinstall-staging $$($(2)_TARGET_INSTALL_STAGING) +$(1)-clean-for-reinstall-staging: $(1)-clean-for-reinstall + rm -f $$($(2)_TARGET_INSTALL_STAGING) $$($(2)_TARGET_INSTALL_STAGING): $$($(2)_TARGET_BUILD) # Some packages use install-staging stuff for install-target $$($(2)_TARGET_INSTALL_TARGET): $$($(2)_TARGET_INSTALL_STAGING) else $(1)-install-staging: +$(1)-reinstall-staging: endif ifeq ($$($(2)_INSTALL_IMAGES),YES) -$(1)-install-images: $$($(2)_TARGET_INSTALL_IMAGES) -$$($(2)_TARGET_INSTALL_IMAGES): $$($(2)_TARGET_BUILD) +$(1)-install-images: $$($(2)_TARGET_INSTALL_IMAGES) +$(1)-reinstall-images: $(1)-clean-for-reinstall-images $$($(2)_TARGET_INSTALL_IMAGES) +$(1)-clean-for-reinstall-images: $(1)-clean-for-reinstall + rm -f $$($(2)_TARGET_INSTALL_IMAGES) +$$($(2)_TARGET_INSTALL_IMAGES): $$($(2)_TARGET_BUILD) else $(1)-install-images: +$(1)-reinstall-images: endif $(1)-install-host: $$($(2)_TARGET_INSTALL_HOST) +$(1)-reinstall-host: $(1)-clean-for-reinstall-host $$($(2)_TARGET_INSTALL_HOST) +$(1)-clean-for-reinstall-host: $(1)-clean-for-reinstall + rm -f $$($(2)_TARGET_INSTALL_HOST) $$($(2)_TARGET_INSTALL_HOST): $$($(2)_TARGET_BUILD) $(1)-build: $$($(2)_TARGET_BUILD) @@ -545,6 +562,8 @@ $$($(2)_TARGET_EXTRACT): $$($(2)_TARGET_SOURCE) $(1)-depends: $$($(2)_FINAL_DEPENDENCIES) $(1)-source: $$($(2)_TARGET_SOURCE) + +$(1)-clean-for-reinstall: else # In the package override case, the sequence of steps # source, by rsyncing @@ -563,6 +582,9 @@ $(1)-extract: $(1)-rsync $(1)-rsync: $$($(2)_TARGET_RSYNC) $(1)-source: $$($(2)_TARGET_RSYNC_SOURCE) + +$(1)-clean-for-reinstall: + rm -f $$($(2)_TARGET_RSYNC) endif $(1)-show-depends: