diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-11-19 20:03:20 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-11-19 20:03:20 +0300 |
commit | 8c67d863a9d60f8e2d563477ba2fd664122e0aae (patch) | |
tree | 7fe6620111a914c0087d60602898d26d9220cabd /scripts | |
parent | 926028aaa3827554096d42ffb0c2973bc7f5e80f (diff) | |
parent | 5db8face97f81c9342458c052572e19ac6bd8e52 (diff) | |
download | linux-8c67d863a9d60f8e2d563477ba2fd664122e0aae.tar.xz |
Merge tag 'kbuild-fixes-v6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Update MAINTAINERS with Nathan and Nicolas as new Kbuild reviewers
- Increment the debian revision for deb-pkg builds
* tag 'kbuild-fixes-v6.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: Restore .version auto-increment behaviour for Debian packages
MAINTAINERS: Add linux-kbuild's patchwork
MAINTAINERS: Remove Michal Marek from Kbuild maintainers
MAINTAINERS: Add Nathan and Nicolas to Kbuild reviewers
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/package/mkdebian | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 60a2a63a5e90..a3ac5a716e9f 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -90,7 +90,7 @@ if [ -n "$KDEB_PKGVERSION" ]; then packageversion=$KDEB_PKGVERSION revision=${packageversion##*-} else - revision=$(cat .version 2>/dev/null||echo 1) + revision=$($srctree/init/build-version) packageversion=$version-$revision fi sourcename=$KDEB_SOURCENAME |