diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-15 20:21:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-15 20:21:30 -0400 |
commit | ca71b3ba4c78c2c05b44be9b257a4127223f0b0c (patch) | |
tree | e2f6fb5d512bfbde346359307d135adfbd35a494 /.gitignore | |
parent | 9fb71c2f230df44bdd237e9a4457849a3909017d (diff) | |
parent | 17baab68d337a0bf4654091e2b4cd67c3fdb44d8 (diff) |
Merge tag 'kbuild-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- pass HOSTLDFLAGS when compiling single .c host programs
- build genksyms lexer and parser files instead of using shipped
versions
- rename *-asn1.[ch] to *.asn1.[ch] for suffix consistency
- let the top .gitignore globally ignore artifacts generated by flex,
bison, and asn1_compiler
- let the top Makefile globally clean artifacts generated by flex,
bison, and asn1_compiler
- use safer .SECONDARY marker instead of .PRECIOUS to prevent
intermediate files from being removed
- support -fmacro-prefix-map option to make __FILE__ a relative path
- fix # escaping to prepare for the future GNU Make release
- clean up deb-pkg by using debian tools instead of handrolled
source/changes generation
- improve rpm-pkg portability by supporting kernel-install as a
fallback of new-kernel-pkg
- extend Kconfig listnewconfig target to provide more information
* tag 'kbuild-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kconfig: extend output of 'listnewconfig'
kbuild: rpm-pkg: use kernel-install as a fallback for new-kernel-pkg
Kbuild: fix # escaping in .cmd files for future Make
kbuild: deb-pkg: split generating packaging and build
kbuild: use -fmacro-prefix-map to make __FILE__ a relative path
kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers
kbuild: rename *-asn1.[ch] to *.asn1.[ch]
kbuild: clean up *-asn1.[ch] patterns from top-level Makefile
.gitignore: move *-asn1.[ch] patterns to the top-level .gitignore
kbuild: add %.dtb.S and %.dtb to 'targets' automatically
kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically
genksyms: generate lexer and parser during build instead of shipping
kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile
.gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore
kbuild: use HOSTLDFLAGS for single .c executables
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index a1dfd2acd9c3..97ba6b79834c 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -11,6 +11,7 @@ | |||
11 | # | 11 | # |
12 | .* | 12 | .* |
13 | *.a | 13 | *.a |
14 | *.asn1.[ch] | ||
14 | *.bin | 15 | *.bin |
15 | *.bz2 | 16 | *.bz2 |
16 | *.c.[012]*.* | 17 | *.c.[012]*.* |
@@ -22,6 +23,7 @@ | |||
22 | *.gz | 23 | *.gz |
23 | *.i | 24 | *.i |
24 | *.ko | 25 | *.ko |
26 | *.lex.c | ||
25 | *.ll | 27 | *.ll |
26 | *.lst | 28 | *.lst |
27 | *.lz4 | 29 | *.lz4 |
@@ -37,6 +39,7 @@ | |||
37 | *.so.dbg | 39 | *.so.dbg |
38 | *.su | 40 | *.su |
39 | *.symtypes | 41 | *.symtypes |
42 | *.tab.[ch] | ||
40 | *.tar | 43 | *.tar |
41 | *.xz | 44 | *.xz |
42 | Module.symvers | 45 | Module.symvers |
@@ -129,7 +132,3 @@ all.config | |||
129 | 132 | ||
130 | # Kdevelop4 | 133 | # Kdevelop4 |
131 | *.kdev4 | 134 | *.kdev4 |
132 | |||
133 | #Automatically generated by ASN.1 compiler | ||
134 | net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c | ||
135 | net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h | ||