From owner-freebsd-embedded@FreeBSD.ORG Tue Apr 14 08:04:00 2015 Return-Path: Delivered-To: freebsd-embedded@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 58A60B06 for ; Tue, 14 Apr 2015 08:04:00 +0000 (UTC) Received: from mail-qk0-x22e.google.com (mail-qk0-x22e.google.com [IPv6:2607:f8b0:400d:c09::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1154C7E5 for ; Tue, 14 Apr 2015 08:04:00 +0000 (UTC) Received: by qkgx75 with SMTP id x75so4425621qkg.1 for ; Tue, 14 Apr 2015 01:03:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=QZKNP6erv1h9IV6nT7MLnMpX8GWhW1rLRn4k0uPP8Ok=; b=TnrYoPVzrcMyWhdr6WVo73DMdggUxrpjDDy7HjbQsBmB2gl5+m6V49ZYaCj8PRB+5F yzWtDs1ccMdq+fvMiE5GO3t8gGJiNaYQdmvub/1yFcybApqqL8IEXeNySIC+LOuPJviA +2wXT0UUv6wLHSsKgGtpjEjDUkMgvSNF0jgULlkLQ+tkuS8f6P2y+XM+FKYp/OnobM8d +TUv7SAEC/It2uH7qXexxTJ/ugaH8Pt85m+ybWDoFvAB7ykZpcQAjjh7jYGrsVv3RM00 GtpUN3VsW+/gieI7YAAPcPridXLwwdL386trhfEon9ug/CubYjrzwtLHrLOwuWz17wT2 UPug== MIME-Version: 1.0 X-Received: by 10.182.60.197 with SMTP id j5mr15199279obr.85.1428998638864; Tue, 14 Apr 2015 01:03:58 -0700 (PDT) Received: by 10.76.36.67 with HTTP; Tue, 14 Apr 2015 01:03:58 -0700 (PDT) Date: Tue, 14 Apr 2015 01:03:58 -0700 Message-ID: Subject: Crochet Patch Files From: Reza Nikoopour To: "freebsd-embedded@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: freebsd-embedded@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Dedicated and Embedded Systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2015 08:04:00 -0000 Hey guys, I'm trying to make some patch files for Crochet so I can have it build the latest version of U-Boot. I cloned my git repository of U-Boot then I changed the files I needed. After that I ran < git diff > and created three different files containing the patches ( https://github.com/rnikoopour/crochet/tree/Crochet-RPI-UBoot2015/board/RaspberryPi/files). Then I put the files into < boards/RaspberryPI/files >. When I attempt to build it fails on the patch files and I get the following error message in _.uboot.patch.log: Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff --git a/Makefile b/Makefile > |index 36a9a28..0f53d64 100644 > |--- a/Makefile > |+++ b/Makefile > -------------------------- > Patching file Makefile using Plan A... > Hunk #1 failed at 666. > 1 out of 1 hunks failed--saving rejects to Makefile.rej > done > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff --git a/Makefile b/Makefile > |index 36a9a28..0f53d64 100644 > |--- a/Makefile > |+++ b/Makefile > -------------------------- > Patching file Makefile using Plan A... > Hunk #1 failed at 666. > 1 out of 1 hunks failed--saving rejects to Makefile.rej > done > Would anyone be able to point me in the right direction for generating the patch files? Thanks, Reza