mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Alexander Shiyan" <shc_work@mail.ru>
To: "Sascha Hauer" <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re[2]: [PATCH 1/2] Makefile: Create empty <config.h> if this header file is not needed by board
Date: Fri, 05 Apr 2013 13:20:49 +0400	[thread overview]
Message-ID: <1365153649.537566045@f429.i.mail.ru> (raw)
In-Reply-To: <20130405091250.GF20989@pengutronix.de>

> On Mon, Mar 11, 2013 at 08:10:49PM +0400, Alexander Shiyan wrote:
> > Patch creates empty <config.h> if this header is not needed by board.
> > This will allow to remove many empty config.h files from boards.
> > 
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> > ---
> >  Makefile | 17 +++++++++++------
> >  1 file changed, 11 insertions(+), 6 deletions(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index b5819fc..e8d9984 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -898,13 +898,18 @@ include/asm:
> >  	$(Q)$(check-symlink)
> >  	$(Q)$(create-symlink)
> >  
> > +define symlink-config-h
> > +	if [ -f $(srctree)/$(BOARD)/config.h ]; then		\
> > +		$(kecho) '  SYMLINK $@ -> $(BOARD)/config.h';	\
> > +		ln -fsn $(srctree)/$(BOARD)/config.h $@;	\
> > +	else							\
> > +		$(kecho) '  CREATE  $@';			\
> > +		echo -n > $@;					\
> > +	fi
> > +endef
> 
> I dropped this patch because it autogenerates files which were
> previously part of the repository. This causes git checkout to
> complain about overwriting existing files when we want to checkout
> earlier versions.

Patch creates include/config.h (which is in .gitignore) only
or makes symlink to board/config.h. So all already as you say below.

> 
> How about creating this patch like this:
> 
> - create (and commit) a include/config-empty.h
> - link to the board specific config.h if it exists or to
>   config-empty.h if it doesn't exist.


---
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2013-04-05  9:20 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-11 16:10 Alexander Shiyan
2013-03-11 16:10 ` [PATCH 2/2] Remove unused config.h Alexander Shiyan
2013-04-05  9:12 ` [PATCH 1/2] Makefile: Create empty <config.h> if this header file is not needed by board Sascha Hauer
2013-04-05  9:20   ` Alexander Shiyan [this message]
2013-04-05  9:36     ` Sascha Hauer
2013-04-05 10:07       ` Re[2]: " Alexander Shiyan
2013-04-05 10:18         ` Sascha Hauer
2013-04-05 10:37           ` Re[2]: " Alexander Shiyan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1365153649.537566045@f429.i.mail.ru \
    --to=shc_work@mail.ru \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox