summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2023-01-24 04:04:16 +0100
committerMasahiro Yamada <masahiroy@kernel.org>2023-02-05 10:51:21 +0100
commit58e0e5c85e31b0b30f16ac835d537ba0b7ff7d37 (patch)
tree16304fdae14ddd7c57f085c0eaf305d9aecc1257
parentkbuild: save overridden KERNELRELEASE in include/config/kernel.release (diff)
downloadlinux-58e0e5c85e31b0b30f16ac835d537ba0b7ff7d37.tar.xz
linux-58e0e5c85e31b0b30f16ac835d537ba0b7ff7d37.zip
kbuild: deb-pkg: add --source-option=-sP
If the source package fails to build, ../linux.orig is left over. In the next run of 'make deb-pkg', you will get the following error: dpkg-source: error: orig directory 'linux.orig' already exists, not overwriting, giving up; use -sA, -sK or -sP to override You can manually remove ../linux.orig, but it is annoying. Pass -sP down to dpkg-source. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-rw-r--r--scripts/Makefile.package2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index e84c4e8ceb8e..dfbf40454a99 100644
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -86,7 +86,7 @@ deb-pkg:
$(call cmd,src_tar,$(KDEB_SOURCENAME))
origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\
mv $(KDEB_SOURCENAME).tar.gz ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz
- +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -i.git -us -uc
+ +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) --source-option=-sP -i.git -us -uc
PHONY += bindeb-pkg
bindeb-pkg: