On Fri, Apr 05, 2013 at 01:20:49PM +0400, Alexander Shiyan wrote:
> > 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@xxxxxxx>
> > > ---
> > > 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.
It creates a arch/$arch/$board/config.h, so we get the following:
# git checkout for-next/remove-config-h
...
# make pcm038_defconfig && make
...
# git checkout master
error: The following untracked working tree files would be overwritten by checkout:
arch/arm/boards/pcm038/config.h
Please move or remove them before you can switch branches.
Aborting
So this patch forces us to manually remove arch/$arch/$board/config.h
or to use git checkout -f
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
