buildsys: make pve-rs sbuild compatible

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2023-05-17 09:37:31 +02:00
parent 34a0068618
commit f863004159
4 changed files with 26 additions and 22 deletions

View File

@ -1,5 +1,4 @@
include /usr/share/dpkg/pkg-info.mk include /usr/share/dpkg/pkg-info.mk
include /usr/share/dpkg/default.mk
PACKAGE=libpve-rs-perl PACKAGE=libpve-rs-perl
export PERLMOD_PRODUCT=PVE export PERLMOD_PRODUCT=PVE
@ -10,10 +9,11 @@ export GITVERSION:=$(shell git rev-parse HEAD)
PERL_INSTALLVENDORARCH != perl -MConfig -e 'print $$Config{installvendorarch};' PERL_INSTALLVENDORARCH != perl -MConfig -e 'print $$Config{installvendorarch};'
PERL_INSTALLVENDORLIB != perl -MConfig -e 'print $$Config{installvendorlib};' PERL_INSTALLVENDORLIB != perl -MConfig -e 'print $$Config{installvendorlib};'
MAIN_DEB=${PACKAGE}_${DEB_VERSION}_${ARCH}.deb MAIN_DEB=$(PACKAGE)_$(DEB_VERSION)_$(ARCH).deb
DBGSYM_DEB=${PACKAGE}-dbgsym_${DEB_VERSION}_${ARCH}.deb DBGSYM_DEB=$(PACKAGE)-dbgsym_$(DEB_VERSION)_$(ARCH).deb
DEBS=$(MAIN_DEB) $(DBGSYM_DEB) DEBS=$(MAIN_DEB) $(DBGSYM_DEB)
DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
DESTDIR= DESTDIR=
@ -39,13 +39,11 @@ TARGET_DIR=debug
endif endif
all: PVE all: PVE
ifneq ($(BUILD_MODE), skip)
cargo build $(CARGO_BUILD_ARGS) cargo build $(CARGO_BUILD_ARGS)
mkdir -p test/Proxmox/Lib mkdir -p test/Proxmox/Lib
sed -r -e \ sed -r -e \
's@^sub libdirs.*$$@sub libdirs { return ("../target/$(TARGET_DIR)", "../../target/$(TARGET_DIR)"); }@' \ 's@^sub libdirs.*$$@sub libdirs { return ("./target/$(TARGET_DIR)", "./../target/$(TARGET_DIR)"); }@' \
Proxmox/Lib/PVE.pm >test/Proxmox/Lib/PVE.pm Proxmox/Lib/PVE.pm >test/Proxmox/Lib/PVE.pm
endif
PVE: Proxmox/Lib/PVE.pm PVE: Proxmox/Lib/PVE.pm
Proxmox/Lib/PVE.pm: Proxmox/Lib/PVE.pm:
@ -55,37 +53,44 @@ check: all
$(MAKE) -C test test $(MAKE) -C test test
.PHONY: install .PHONY: install
install: ../target/release/libpve_rs.so Proxmox/Lib/PVE.pm PVE install: target/release/libpve_rs.so Proxmox/Lib/PVE.pm PVE
install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto
install -m644 ../target/release/libpve_rs.so $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto/libpve_rs.so install -m644 target/release/libpve_rs.so $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto/libpve_rs.so
install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB) install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)
install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib
install -m644 Proxmox/Lib/PVE.pm $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib/PVE.pm install -m644 Proxmox/Lib/PVE.pm $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib/PVE.pm
find $(PM_DIR) \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';' find $(PM_DIR) \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';'
distclean: clean
clean: clean:
cargo clean cargo clean
rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes Cargo.lock rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes Cargo.lock *.tar.?z *.build
rm -rf $(PACKAGE)-[0-9]*/
find . -name '*~' -exec rm {} ';' find . -name '*~' -exec rm {} ';'
.PHONY: dinstall .PHONY: dinstall
dinstall: ${DEBS} dinstall: $(DEBS)
dpkg -i ${DEBS} dpkg -i $(DEBS)
.PHONY: upload .PHONY: upload
upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION) upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
upload: ${DEBS} upload: $(DEBS)
# check if working directory is clean # check if working directory is clean
git diff --exit-code --stat && git diff --exit-code --stat --staged git diff --exit-code --stat && git diff --exit-code --stat --staged
tar cf - ${DEBS} | ssh -X repoman@repo.proxmox.com upload --product pve --dist $(DEB_DISTRIBUTION) tar cf - $(DEBS) | ssh -X repoman@repo.proxmox.com upload --product pve --dist $(DEB_DISTRIBUTION)
$(BUILDDIR): src debian test common/src Cargo.toml Makefile .cargo/config
rm -rf $(BUILDDIR) $(BUILDDIR).tmp
mkdir $(BUILDDIR).tmp
mkdir $(BUILDDIR).tmp/common
cp -a -t $(BUILDDIR).tmp src debian test Cargo.toml Makefile .cargo
cp -a -t $(BUILDDIR).tmp/common common/src
mv $(BUILDDIR).tmp $(BUILDDIR)
.PHONY: dsc .PHONY: dsc
dsc: ${DSC} dsc: $(DSC)
${DSC}: ${BUILDDIR} $(DSC): $(BUILDDIR)
cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d cd $(BUILDDIR); PATH="/usr/local/bin:/usr/bin" dpkg-buildpackage -S -us -uc -d
lintian ${DSC} lintian $(DSC)
sbuild: $(DSC) sbuild: $(DSC)
sbuild $(DSC) sbuild $(DSC)

View File

@ -1 +0,0 @@
10

View File

@ -2,7 +2,7 @@ Source: libpve-rs-perl
Section: perl Section: perl
Priority: optional Priority: optional
Build-Depends: Build-Depends:
debhelper (>= 12), debhelper-compat (= 13),
dh-cargo (>= 24), dh-cargo (>= 24),
perlmod-bin, perlmod-bin,
cargo:native <!nocheck>, cargo:native <!nocheck>,