Pull Kbuild updates from Masahiro Yamada: - detect missing include guard in UAPI headers - do not create orphan built-in.a or obj-y objects - generate modules.builtin more simply, and drop tristate.conf - simplify built-in initramfs creation - make linux-headers deb package thinner - optimize the deb package build script - misc cleanups * tag 'kbuild-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (34 commits) builddeb: split libc headers deployment out into a function builddeb: split kernel headers deployment out into a function builddeb: remove redundant make for ARCH=um builddeb: avoid invoking sub-shells where possible builddeb: remove redundant $objtree/ builddeb: match temporary directory name to the package name builddeb: remove unneeded files in hdrobjfiles for headers package kbuild: use -S instead of -E for precise cc-option test in Kconfig builddeb: allow selection of .deb compressor kbuild: remove 'Building modules, stage 2.' log kbuild: remove *.tmp file when filechk fails kbuild: remove PYTHON2 variable modpost: assume STT_SPARC_REGISTER is defined gen_initramfs.sh: remove intermediate cpio_list on errors initramfs: refactor the initramfs build rules gen_initramfs.sh: always output cpio even without -o option initramfs: add default_cpio_list, and delete -d option support initramfs: generate dependency list and cpio at the same time initramfs: specify $(src)/gen_initramfs.sh as a prerequisite in Makefile initramfs: make initramfs compression choice non-optional ...
Showing the changes to include/linux (1 of 20 files). Show all
Unified · Split
| @@ -169,6 +169,16 @@ extern void cleanup_module(void); · 168 unmodified lines | ||
| 169 | 169 | */ |
| 170 | 170 | #define MODULE_SOFTDEP(_softdep) MODULE_INFO(softdep, _softdep) |
| 171 | 171 | |
| 172 | +/* | |
| 173 | + * MODULE_FILE is used for generating modules.builtin | |
| 174 | + * So, make it no-op when this is being built as a module | |
| 175 | + */ | |
| 176 | +#ifdef MODULE | |
| 177 | +#define MODULE_FILE | |
| 178 | +#else | |
| 179 | +#define MODULE_FILE MODULE_INFO(file, KBUILD_MODFILE); | |
| 180 | +#endif | |
| 181 | + | |
| 172 | 182 | /* |
| 173 | 183 | * The following license idents are currently accepted as indicating free |
| 174 | 184 | * software modules |
| @@ -213,7 +223,7 @@ extern void cleanup_module(void); · 38 unmodified lines | ||
| 213 | 223 | * 2. So the community can ignore bug reports including proprietary modules |
| 214 | 224 | * 3. So vendors can do likewise based on their own policies |
| 215 | 225 | */ |
| 216 | −#define MODULE_LICENSE(_license) MODULE_INFO(license, _license) | |
| 226 | +#define MODULE_LICENSE(_license) MODULE_FILE MODULE_INFO(license, _license) | |
| 217 | 227 | |
| 218 | 228 | /* |
| 219 | 229 | * Author(s), use "Name <email>" or just "Name", for multiple |