Merge tag 'block-6.6-2023-10-20' of git://git.kernel.dk/linux

[platform/kernel/linux-rpi.git] / scripts / Makefile.package

diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index 0ace397..2bcab02 100644 (file)
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -92,7 +92,8 @@ rpm-pkg srcrpm-pkg binrpm-pkg: kernel.spec
        +$(strip rpmbuild -b$(build-type) kernel.spec \
        --define='_topdir $(abspath rpmbuild)' \
        $(if $(filter a b, $(build-type)), \
-               --target $(UTS_MACHINE)-linux --build-in-place --noprep --define='_smp_mflags %{nil}') \
+               --target $(UTS_MACHINE)-linux --build-in-place --noprep --define='_smp_mflags %{nil}' \
+               $$(rpm -q rpm >/dev/null 2>&1 || echo --nodeps)) \
        $(if $(filter b, $(build-type)), \
                --without devel) \
        $(RPMOPTS))
@@ -147,7 +148,7 @@ deb-pkg srcdeb-pkg bindeb-pkg:
        $(if $(findstring source, $(build-type)), \
                --unsigned-source --compression=$(KDEB_SOURCE_COMPRESS)) \
        $(if $(findstring binary, $(build-type)), \
-               -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \
+               --rules-file='$(MAKE) -f debian/rules' --jobs=1 -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \
                --no-check-builddeps) \
        $(DPKG_FLAGS))