Patchwork [U-Boot] ignore soc asm-offsets.s

login
register
mail settings
Submitter Mike Frysinger
Date Sept. 12, 2011, 4:47 a.m.
Message ID <1315802844-24604-1-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/114291/
State Accepted
Commit fc77086cf2976eaf73f5b9fe35a55293572428f2
Delegated to: Wolfgang Denk
Headers show

Comments

Mike Frysinger - Sept. 12, 2011, 4:47 a.m.
Recent commit a4814a69d3bca6ee05f4bfc4 cleaned up generation of
asm-offsets.s for SoC dirs, but missed adding it to the ignore
list which makes it show up in `git status`.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Wolfgang Denk - Sept. 21, 2011, 9:02 p.m.
Dear Mike Frysinger,

In message <1315802844-24604-1-git-send-email-vapier@gentoo.org> you wrote:
> Recent commit a4814a69d3bca6ee05f4bfc4 cleaned up generation of
> asm-offsets.s for SoC dirs, but missed adding it to the ignore
> list which makes it show up in `git status`.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  .gitignore |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
Laurence Withers - Sept. 29, 2011, 12:40 p.m.
On Mon, Sep 12, 2011 at 12:47:24AM -0400, Mike Frysinger wrote:
> Recent commit a4814a69d3bca6ee05f4bfc4 cleaned up generation of
> asm-offsets.s for SoC dirs, but missed adding it to the ignore
> list which makes it show up in `git status`.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  .gitignore |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index dbf545f..2a82cd9 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -46,6 +46,7 @@
>  
>  /include/generated/
>  /lib/asm-offsets.s
> +/arch/*/cpu/asm-offsets.s
>  
>  # stgit generated dirs
>  patches-*

Dear Mike,

There appear to be some SoCs which have further subdirectories, e.g.:

lwithers@rhodium u-boot $ git status
# On branch lw-diamond
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       arch/arm/cpu/arm926ejs/davinci/asm-offsets.s
nothing added to commit but untracked files present (use "git add" to track)

We could ignore all files named asm-offsets.s , or perhaps all files under
arch ?

Bye for now,
Mike Frysinger - Sept. 29, 2011, 2:30 p.m.
On Thursday, September 29, 2011 08:40:33 Laurence Withers wrote:
> On Mon, Sep 12, 2011 at 12:47:24AM -0400, Mike Frysinger wrote:
> > Recent commit a4814a69d3bca6ee05f4bfc4 cleaned up generation of
> > asm-offsets.s for SoC dirs, but missed adding it to the ignore
> > list which makes it show up in `git status`.
> > 
> > --- a/.gitignore
> > +++ b/.gitignore
> > 
> >  /lib/asm-offsets.s
> > +/arch/*/cpu/asm-offsets.s
> 
> There appear to be some SoCs which have further subdirectories, e.g.:
> 
> lwithers@rhodium u-boot $ git status
> # On branch lw-diamond
> # Untracked files:
> #   (use "git add <file>..." to include in what will be committed)
> #
> #       arch/arm/cpu/arm926ejs/davinci/asm-offsets.s
> nothing added to commit but untracked files present (use "git add" to
> track)
> 
> We could ignore all files named asm-offsets.s , or perhaps all files under
> arch ?

off the top of my head, i can't see a problem with ignoring asm-offsets.s in 
the whole tree.  want to send a patch and see what Wolfgang says ?
-mike

Patch

diff --git a/.gitignore b/.gitignore
index dbf545f..2a82cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ 
 
 /include/generated/
 /lib/asm-offsets.s
+/arch/*/cpu/asm-offsets.s
 
 # stgit generated dirs
 patches-*