Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'kbuild-fixes-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Fix broken BuildID
- Add srcrpm-pkg to the help message
- Fix the option order for modpost built with musl libc
- Fix the build dependency of rpm-pkg for openSUSE
* tag 'kbuild-fixes-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
fixdep: remove unneeded <stdarg.h> inclusion
kbuild: sort single-targets alphabetically again
kbuild: rpm-pkg: add libelf-devel as alternative for BuildRequires
kbuild: Fix running modpost with musl libc
kbuild: add a missing line for help message
.gitignore: ignore *.rpm
arch: fix broken BuildID for arm64 and riscv
kconfig: Add static text for search information in help menu
+27
-14
+1
.gitignore
+1
.gitignore
+1
-1
Makefile
+1
-1
Makefile
···
297
297
headers_install modules_install kernelrelease image_name
298
298
no-sync-config-targets := $(no-dot-config-targets) %install kernelrelease \
299
299
image_name
300
-
single-targets := %.a %.i %.rsi %.ko %.lds %.ll %.lst %.mod %.o %.s %.symtypes %/
300
+
single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.rsi %.s %.symtypes %/
301
301
302
302
config-build :=
303
303
mixed-build :=
+5
include/asm-generic/vmlinux.lds.h
+5
include/asm-generic/vmlinux.lds.h
···
891
891
#define PRINTK_INDEX
892
892
#endif
893
893
894
+
/*
895
+
* Discard .note.GNU-stack, which is emitted as PROGBITS by the compiler.
896
+
* Otherwise, the type of .notes section would become PROGBITS instead of NOTES.
897
+
*/
894
898
#define NOTES \
899
+
/DISCARD/ : { *(.note.GNU-stack) } \
895
900
.notes : AT(ADDR(.notes) - LOAD_OFFSET) { \
896
901
BOUNDED_SECTION_BY(.note.*, _notes) \
897
902
} NOTES_HEADERS \
+11
-11
scripts/Makefile.modpost
+11
-11
scripts/Makefile.modpost
···
55
55
modpost-args += -n
56
56
endif
57
57
58
+
ifneq ($(KBUILD_MODPOST_WARN)$(missing-input),)
59
+
modpost-args += -w
60
+
endif
61
+
62
+
# Read out modules.order to pass in modpost.
63
+
# Otherwise, allmodconfig would fail with "Argument list too long".
64
+
ifdef KBUILD_MODULES
65
+
modpost-args += -T $(MODORDER)
66
+
modpost-deps += $(MODORDER)
67
+
endif
68
+
58
69
ifeq ($(KBUILD_EXTMOD),)
59
70
60
71
# Generate the list of in-tree objects in vmlinux
···
124
113
125
114
endif # ($(KBUILD_EXTMOD),)
126
115
127
-
ifneq ($(KBUILD_MODPOST_WARN)$(missing-input),)
128
-
modpost-args += -w
129
-
endif
130
-
131
-
ifdef KBUILD_MODULES
132
-
modpost-args += -T $(MODORDER)
133
-
modpost-deps += $(MODORDER)
134
-
endif
135
-
136
-
# Read out modules.order to pass in modpost.
137
-
# Otherwise, allmodconfig would fail with "Argument list too long".
138
116
quiet_cmd_modpost = MODPOST $@
139
117
cmd_modpost = \
140
118
$(if $(missing-input), \
+1
scripts/Makefile.package
+1
scripts/Makefile.package
···
158
158
PHONY += help
159
159
help:
160
160
@echo ' rpm-pkg - Build both source and binary RPM kernel packages'
161
+
@echo ' srcrpm-pkg - Build only the source kernel RPM package'
161
162
@echo ' binrpm-pkg - Build only the binary kernel RPM package'
162
163
@echo ' deb-pkg - Build both source and binary deb kernel packages'
163
164
@echo ' bindeb-pkg - Build only the binary kernel deb package'
-1
scripts/basic/fixdep.c
-1
scripts/basic/fixdep.c
+6
scripts/kconfig/mconf.c
+6
scripts/kconfig/mconf.c
···
161
161
"(especially with a larger number of unrolled categories) than the\n"
162
162
"default mode.\n"
163
163
"\n"
164
+
165
+
"Search\n"
166
+
"-------\n"
167
+
"Pressing the forward-slash (/) anywhere brings up a search dialog box.\n"
168
+
"\n"
169
+
164
170
"Different color themes available\n"
165
171
"--------------------------------\n"
166
172
"It is possible to select different color themes using the variable\n"
+2
-1
scripts/package/mkspec
+2
-1
scripts/package/mkspec
···
51
51
URL: https://www.kernel.org
52
52
$S Source: kernel-$__KERNELRELEASE.tar.gz
53
53
Provides: $PROVIDES
54
-
$S BuildRequires: bc binutils bison dwarves elfutils-libelf-devel flex
54
+
$S BuildRequires: bc binutils bison dwarves
55
+
$S BuildRequires: (elfutils-libelf-devel or libelf-devel) flex
55
56
$S BuildRequires: gcc make openssl openssl-devel perl python3 rsync
56
57
57
58
# $UTS_MACHINE as a fallback of _arch in case