buildsys: drop hack that moved testing after dh_install
the motivation for this was that we required to build some stuff with different feature flags before the big-split when openid (that still links to the dependency-greedy) got added, to avoid that binaries that do not use openid at all also got linked to its dependencies. This is now fixed since a bit and thus we should be able to drop the test-reorder hack. Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
323ad7ddc0
commit
beb1d6f362
3
Makefile
3
Makefile
|
@ -221,9 +221,6 @@ install: $(COMPILED_BINS)
|
||||||
install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
|
install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
|
||||||
$(MAKE) -C www install
|
$(MAKE) -C www install
|
||||||
$(MAKE) -C docs install
|
$(MAKE) -C docs install
|
||||||
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
|
|
||||||
$(MAKE) test # HACK, only test now to avoid clobbering build files with wrong config
|
|
||||||
endif
|
|
||||||
|
|
||||||
.PHONY: upload
|
.PHONY: upload
|
||||||
upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB} ${DEBUG_DEB}
|
upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB} ${DEBUG_DEB}
|
||||||
|
|
|
@ -32,9 +32,6 @@ override_dh_auto_build:
|
||||||
override_dh_missing:
|
override_dh_missing:
|
||||||
dh_missing --fail-missing
|
dh_missing --fail-missing
|
||||||
|
|
||||||
override_dh_auto_test:
|
|
||||||
# ignore here to avoid rebuilding the binaries with the wrong target
|
|
||||||
|
|
||||||
override_dh_auto_install:
|
override_dh_auto_install:
|
||||||
dh_auto_install -- \
|
dh_auto_install -- \
|
||||||
PROXY_USER=backup \
|
PROXY_USER=backup \
|
||||||
|
|
Loading…
Reference in New Issue