Re: distclean removing LICENSES .gitignores

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, May 14, 2019 at 12:05 AM Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> wrote:
>
> Hello Geordan,
>
> On 13/5/19 00:17, Geordan Neukum wrote:
> > When on the master branch, I noticed that running a "make distclean"
> > will remove:
> >
> >     - LICENSES/exceptions/.gitignore
> >
> >     - LICENSES/other/.gitignore
> >
> >
> > It looks like this is due to matching the pattern '-o size 0' in the
> > top-level barebox makefile under the distclean target.
> >
> > Is this the desired behavior?
>
> Nope, this behavior isn't desired. I added the files, to have git
> index the directories. IIRC, otherwise kernel checkpatch.pl laments their
> absence. Maybe we should add a comment describing the purpose and then
> these files aren't totally empty?
>
> > If not, I can go ahead and submit a
> > patch that cleans up that target.
>
> Please go ahead.


The '-o size 0' came from Linux, and it is gone already from Linux.


See this Linux commit:


commit f4b129f519f1bbd191dca2bf17d1137edf941fd1
Author: Michal Marek <mmarek@xxxxxxx>
Date:   Wed Aug 10 13:10:20 2011 +0200

    kbuild: Do not delete empty files in make distclean

    Commit 3d64b44 introduced an empty file under
    arch/arm/mach-zynq/board_dt.c. While this was not intended and the file
    was removed from the tree by a later commit, we really should only match
    junk files by known name patterns and not their size.

    Reported-by: David Howells <dhowells@xxxxxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>




If you touch this hunk, please sync this part with Linux.
In other words, please import the following two commits as well.




commit a03fcb50e816a69acffb13b5e56db75063aeba8a
Author: Masahiro Yamada <yamada.m@xxxxxxxxxxxxxxxx>
Date:   Fri Mar 28 16:36:12 2014 +0900

    kbuild: remove redundant '.*.cmd' pattern from make distclean

    '.*.cmd' files are cleaned-up by "make clean".
    The same pattern in "make distclean" is unnecessary.

    Signed-off-by: Masahiro Yamada <yamada.m@xxxxxxxxxxxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>


commit f78271dfb77353c4d045f9735deebe21839fb2ed
Author: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
Date:   Sun Jan 22 23:02:32 2017 +0900

    kbuild: drop unneeded patterns '.*.orig' and '.*.rej' from distclean

    The patterns '.*.orig' and '.*.rej' are cleaned away by '*.orig' and
    '*.rej' seen two lines above.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>




> Cheers
> Ahmad
>
> >
> > Thanks,
> > Geordan
> >
> > _______________________________________________
> > barebox mailing list
> > barebox@xxxxxxxxxxxxxxxxxxx
> > http://lists.infradead.org/mailman/listinfo/barebox
> >
>
> --
> 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



-- 
Best Regards
Masahiro Yamada

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



[Index of Archives]     [Linux Embedded]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux