71dd2d48f9
From man dpkg-buildpackage:
> -j, --jobs[=jobs|auto]
> Specifies the number of jobs allowed to be run simultaneously (since
> dpkg 1.14.7, long option since dpkg 1.18.8). The number of jobs
> matching the number of online processors if auto is specified (since
> dpkg 1.17.10), or unlimited number if jobs is not specified. The
> default behavior is auto (since dpkg 1.18.11) in non-forced mode
> (since dpkg 1.21.10), and as such it is always safer to use with any
> package including those that are not parallel-build safe.
The option was added in the Makefile by commit 4ba321f ("build qemu
multithreaded") which states:
> same as in pve-kernel where we have --jobs=auto
But according to the man page, -j without an argument is not the same
and means unlimited. Using the number of online cores seems more
sensible and was the original intention. Again, according to the man
page, the default is auto since dpkg 1.18.11 (or Debian Stretch), so
just drop the option.
The motivation to look into this was that after the recent upstream
commit d1ce2cc95b ("Makefile: preserve --jobserver-auth argument when
calling ninja") having -j as the make flag would be broken as it was
mistakenly passed to ninja (for which the argument for -j is not
optional). Should get fixed soon [0].
[0]: https://lore.kernel.org/qemu-devel/20240412100401.20047-2-pbonzini@redhat.com/T/#u
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
90 lines
2.3 KiB
Makefile
90 lines
2.3 KiB
Makefile
include /usr/share/dpkg/default.mk
|
|
|
|
PACKAGE = pve-qemu-kvm
|
|
|
|
SRCDIR := qemu
|
|
BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
|
|
ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
|
|
|
|
GITVERSION := $(shell git rev-parse HEAD)
|
|
|
|
DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
|
|
DEB = $(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
|
|
DEB_DBG = $(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
|
|
DEBS = $(DEB) $(DEB_DBG)
|
|
|
|
all: $(DEBS)
|
|
|
|
.PHONY: submodule
|
|
submodule:
|
|
ifeq ($(shell test -f "$(SRCDIR)/configure" && echo 1 || echo 0), 0)
|
|
git submodule update --init --recursive
|
|
cd $(SRCDIR); meson subprojects download
|
|
endif
|
|
|
|
PC_BIOS_FW_PURGE_LIST_IN = \
|
|
hppa-firmware.img \
|
|
openbios-ppc \
|
|
openbios-sparc32 \
|
|
openbios-sparc64 \
|
|
palcode-clipper \
|
|
s390-ccw.img \
|
|
s390-netboot.img \
|
|
u-boot.e500 \
|
|
.*\.dtb \
|
|
qemu_vga.ndrv \
|
|
slof.bin \
|
|
opensbi-riscv.*-generic-fw_dynamic.bin \
|
|
|
|
BLOB_PURGE_SED_CMDS = $(foreach FILE,$(PC_BIOS_FW_PURGE_LIST_IN),-e "/$(FILE)/d")
|
|
BLOB_PURGE_FILTER = $(foreach FILE,$(PC_BIOS_FW_PURGE_LIST_IN),-e "$(FILE)")
|
|
|
|
$(BUILDDIR): submodule
|
|
# check if qemu/ was used for a build
|
|
# if so, please run 'make distclean' in the submodule and try again
|
|
test ! -f $(SRCDIR)/build/config.status
|
|
rm -rf $@.tmp $@
|
|
cp -a $(SRCDIR) $@.tmp
|
|
cp -a debian $@.tmp/debian
|
|
rm -rf $@.tmp/roms/edk2 # packaged separately
|
|
find $@.tmp/pc-bios -type f | grep $(BLOB_PURGE_FILTER) | xargs rm -f
|
|
sed -i $(BLOB_PURGE_SED_CMDS) $@.tmp/pc-bios/meson.build
|
|
echo "git clone git://git.proxmox.com/git/pve-qemu.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE
|
|
mv $@.tmp $@
|
|
|
|
.PHONY: deb kvm
|
|
deb kvm: $(DEBS)
|
|
$(DEB_DBG): $(DEB)
|
|
$(DEB): $(BUILDDIR)
|
|
cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
|
|
lintian $(DEBS)
|
|
|
|
sbuild: $(DSC)
|
|
sbuild $(DSC)
|
|
|
|
$(ORIG_SRC_TAR): $(BUILDDIR)
|
|
tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
|
|
|
|
.PHONY: dsc
|
|
dsc:
|
|
rm -rf *.dsc $(BUILDDIR)
|
|
$(MAKE) $(DSC)
|
|
lintian $(DSC)
|
|
|
|
$(DSC): $(ORIG_SRC_TAR) $(BUILDDIR)
|
|
cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
|
|
|
|
.PHONY: upload
|
|
upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
|
|
upload: $(DEBS)
|
|
tar cf - $(DEBS) | ssh repoman@repo.proxmox.com upload --product pve --dist $(UPLOAD_DIST)
|
|
|
|
.PHONY: distclean clean
|
|
distclean: clean
|
|
clean:
|
|
rm -rf $(PACKAGE)-[0-9]*/ $(PACKAGE)*.tar* *.deb *.dsc *.build *.buildinfo *.changes
|
|
|
|
.PHONY: dinstall
|
|
dinstall: $(DEBS)
|
|
dpkg -i $(DEBS)
|