separate packaging and source build system

like almost all of our repos do nowadays, modern git can detect such
things on rebase so in development stuff should be hopefully not too
much affected by this.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-05-25 18:10:14 +02:00
parent cead0f28af
commit 6029cbb071
239 changed files with 25 additions and 15 deletions

View File

@ -7,17 +7,16 @@ BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
all:
$(MAKE) -C PVE
.PHONY: dinstall .PHONY: dinstall
dinstall: deb dinstall: deb
dpkg -i $(DEB) dpkg -i $(DEB)
$(BUILDDIR): PVE debian $(BUILDDIR): src debian
rm -rf $(BUILDDIR) rm -rf $@ $@.tmp
rsync -a * $(BUILDDIR) cp -a src $@.tmp
echo "git clone git://git.proxmox.com/git/pve-network.git\\ngit checkout $(shell git rev-parse HEAD)" > $(BUILDDIR)/debian/SOURCE cp -a debian $@.tmp/
echo "git clone git://git.proxmox.com/git/pve-network.git\\ngit checkout $(shell git rev-parse HEAD)" > $@.tmp/debian/SOURCE
mv $@.tmp $@
.PHONY: deb .PHONY: deb
deb: $(DEB) deb: $(DEB)
@ -41,14 +40,6 @@ distclean: clean
clean: clean:
rm -rf *~ *.deb *.changes $(PACKAGE)-[0-9]*/ $(PACKAGE)*.tar* *.build *.buildinfo *.dsc rm -rf *~ *.deb *.changes $(PACKAGE)-[0-9]*/ $(PACKAGE)*.tar* *.build *.buildinfo *.dsc
.PHONY: test
test:
$(MAKE) -C test
.PHONY: install
install:
$(MAKE) -C PVE install
.PHONY: upload .PHONY: upload
upload: $(DEB) upload: $(DEB)
tar cf - $(DEB)|ssh -X repoman@repo.proxmox.com -- upload --product pve --dist bullseye tar cf - $(DEB)|ssh -X repoman@repo.proxmox.com -- upload --product pve --dist bullseye

15
src/Makefile Normal file
View File

@ -0,0 +1,15 @@
all:
$(MAKE) -C PVE
.PHONY: clean
clean:
$(MAKE) -C test $@
$(MAKE) -C PVE $@
.PHONY: test
test:
$(MAKE) -C $@
.PHONY: install
install:
$(MAKE) -C PVE $@

View File

@ -4,3 +4,5 @@ all:
install: install:
make -C Network install make -C Network install
make -C API2 install make -C API2 install
clean:

View File

@ -13,3 +13,5 @@ test_dns: run_test_dns.pl
test_subnets: run_test_subnets.pl test_subnets: run_test_subnets.pl
./run_test_subnets.pl ./run_test_subnets.pl
clean:

Some files were not shown because too many files have changed in this diff Show More