yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not install replication code

Browse Source 
The code introduces a cyclic package dependency, so we need to
move it to pve-manager package.
This commit is contained in:
Dietmar Maurer
2017-05-10 07:06:35 +02:00
parent 17be2e9a0c
commit f88846ea3b
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -33,23 +33,15 @@ pvesm.bash-completion:
perl -I. -T -e "use PVE::CLI::pvesm; PVE::CLI::pvesm->generate_bash_completions();" >$@.tmp perl -I. -T -e "use PVE::CLI::pvesm; PVE::CLI::pvesm->generate_bash_completions();" >$@.tmp
mv $@.tmp $@ mv $@.tmp $@
pvesr.bash-completion:
perl -I. -T -e "use PVE::CLI::pvesr; PVE::CLI::pvesr->generate_bash_completions();" >$@.tmp
mv $@.tmp $@
.PHONY: install .PHONY: install
install: pvesm.1 pvesm.bash-completion pvesr.bash-completion install: pvesm.1 pvesm.bash-completion
install -d ${DESTDIR}${SBINDIR} install -d ${DESTDIR}${SBINDIR}
install -m 0755 pvesm ${DESTDIR}${SBINDIR} install -m 0755 pvesm ${DESTDIR}${SBINDIR}
install -m 0755 pvesr ${DESTDIR}${SBINDIR}
make -C PVE install make -C PVE install
install -d ${DESTDIR}/var/lib/pve-replica
install -d ${DESTDIR}/usr/share/man/man1 install -d ${DESTDIR}/usr/share/man/man1
install -m 0644 pvesm.1 ${DESTDIR}/usr/share/man/man1/ install -m 0644 pvesm.1 ${DESTDIR}/usr/share/man/man1/
gzip -9 -n ${DESTDIR}/usr/share/man/man1/pvesm.1 gzip -9 -n ${DESTDIR}/usr/share/man/man1/pvesm.1
install -m 0644 -D pvesm.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pvesm install -m 0644 -D pvesm.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pvesm
install -m 0644 -D pvesr.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pverepm
.PHONY: deb .PHONY: deb
deb: ${DEB} deb: ${DEB}
@ -73,7 +65,7 @@ ${DEB}:
.PHONY: clean .PHONY: clean
clean: clean:
make cleanup-docgen make cleanup-docgen
rm -rf debian *.deb ${PACKAGE}-*.tar.gz dist *.1 *.tmp pvesm.bash-completion pvesr.bash-completion rm -rf debian *.deb ${PACKAGE}-*.tar.gz dist *.1 *.tmp pvesm.bash-completion
find . -name '*~' -exec rm {} ';' find . -name '*~' -exec rm {} ';'
.PHONY: distclean .PHONY: distclean

2
PVE/API2/Storage/Makefile
View File

@ -1,5 +1,5 @@
SOURCES= Content.pm Status.pm Config.pm Scan.pm Replication.pm SOURCES= Content.pm Status.pm Config.pm Scan.pm
.PHONY: install .PHONY: install
install: install:

2
PVE/CLI/Makefile
View File

@ -1,4 +1,4 @@
SOURCES=pvesm.pm pvesr.pm SOURCES=pvesm.pm
.PHONY: install .PHONY: install
install: ${SOURCES} install: ${SOURCES}

1
PVE/Makefile
View File

@ -3,7 +3,6 @@
.PHONY: install .PHONY: install
install: install:
install -D -m 0644 Storage.pm ${DESTDIR}${PERLDIR}/PVE/Storage.pm install -D -m 0644 Storage.pm ${DESTDIR}${PERLDIR}/PVE/Storage.pm
install -D -m 0644 ReplicationTools.pm ${DESTDIR}${PERLDIR}/PVE/ReplicationTools.pm
install -D -m 0644 Diskmanage.pm ${DESTDIR}${PERLDIR}/PVE/Diskmanage.pm install -D -m 0644 Diskmanage.pm ${DESTDIR}${PERLDIR}/PVE/Diskmanage.pm
make -C Storage install make -C Storage install
make -C API2 install make -C API2 install