Skip to contentSkip to conversation

kbuild: deb-pkg: add --source-option=-sP

PATCH New Masahiro Yamada 1 participant 1 message Jan 24, 2023 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

 scripts/Makefile.package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.package +1 -1
index e84c4e8ceb8e..dfbf40454a99 100644
@@ -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:
Signature · 1 line
2.34.1