From patchwork Wed Mar 21 10:44:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 147961 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id A67A4B6F13 for ; Wed, 21 Mar 2012 21:44:33 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2CB41100387; Wed, 21 Mar 2012 10:44:32 +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 i4bbOWk9qflv; Wed, 21 Mar 2012 10:44:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D6659FFBAE; Wed, 21 Mar 2012 10:44:29 +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 735358F75B for ; Wed, 21 Mar 2012 10:44:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6947FFFBAE for ; Wed, 21 Mar 2012 10:44:28 +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 KpDmP3YnK-fL for ; Wed, 21 Mar 2012 10:44:27 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by fraxinus.osuosl.org (Postfix) with ESMTP id C240EFF999 for ; Wed, 21 Mar 2012 10:44:27 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id BCE6B953FB; Wed, 21 Mar 2012 10:44:27 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Wed, 21 Mar 2012 11:44:22 +0100 X-Git-Refname: refs/heads/master X-Git-Oldrev: 23d73ece1f04eaf633b45da5ffc42fe7e706e049 X-Git-Newrev: c9ccdf877a6a5af54ac8b6d2809361ed1ddcc221 Message-Id: <20120321104427.BCE6B953FB@busybox.osuosl.org> Subject: [Buildroot] [git commit] linux.mk: .ub-File copying after building initramfs X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net commit: http://git.buildroot.net/buildroot/commit/?id=c9ccdf877a6a5af54ac8b6d2809361ed1ddcc221 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master test should exit with Exit-Code 0 if no .ub-File present and copy the file if Exit-Code 1, otherwise make fails Signed-off-by: Markus Kaindl Signed-off-by: Peter Korsgaard --- linux/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index c0334d2..6cb1efc 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -230,7 +230,7 @@ $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LI # Copy the kernel image to its final destination cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR) # If there is a .ub file copy it to the final destination - test -f $(LINUX_IMAGE_PATH).ub && cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR) + test ! -f $(LINUX_IMAGE_PATH).ub || cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR) $(Q)touch $@ # The initramfs building code must make sure this target gets called