diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-31 21:21:47 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-31 21:21:47 +0300 |
| commit | e4cf7c25bae5c3b5089a3c23a897f450149caef2 (patch) | |
| tree | d29f4ee3c29a16940f3a06aa6c7d1877523067e9 /scripts/package | |
| parent | e39d9b9f89f2efd653212064f941de6f53c3c060 (diff) | |
| parent | 6a5e25fc3e0b94301734e8abb1d311a1e02d360d (diff) | |
| download | linux-e4cf7c25bae5c3b5089a3c23a897f450149caef2.tar.xz | |
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
Diffstat (limited to 'scripts/package')
| -rwxr-xr-x | scripts/package/mkspec | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/package/mkspec b/scripts/package/mkspec index dda00a948a01..adab28fa7f89 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -51,7 +51,8 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF URL: https://www.kernel.org $S Source: kernel-$__KERNELRELEASE.tar.gz Provides: $PROVIDES -$S BuildRequires: bc binutils bison dwarves elfutils-libelf-devel flex +$S BuildRequires: bc binutils bison dwarves +$S BuildRequires: (elfutils-libelf-devel or libelf-devel) flex $S BuildRequires: gcc make openssl openssl-devel perl python3 rsync # $UTS_MACHINE as a fallback of _arch in case |