From 7b424ec65f1bf86c4c5130dbd542aabb67ff47c8 Mon Sep 17 00:00:00 2001 From: Wojtek Porczyk Date: Thu, 2 Mar 2017 16:53:20 +0100 Subject: [PATCH] Makefile: download live-only sources just for ISO_LIVEUSB When building not for ISO_LIVEUSB, the sources are not downloaded. Liveusb build is broken anyway, but the upstream mirror is gone. --- Makefile | 2 ++ Makefile.builder | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b98f01e..1ec613f 100644 --- a/Makefile +++ b/Makefile @@ -81,8 +81,10 @@ clean-repos: clean: sudo rm -fr build/* +ifeq ($(ISO_LIVEUSB),1) get-sources: $(MAKE) -C livecd-tools get-sources verify-sources: $(MAKE) -C livecd-tools verify-sources +endif diff --git a/Makefile.builder b/Makefile.builder index 104dba7..a77c2e5 100644 --- a/Makefile.builder +++ b/Makefile.builder @@ -7,8 +7,15 @@ RPM_SPEC_FILES.dom0 := \ initial-setup-launcher/initial-setup-launcher.spec \ qubes-anaconda-addon/qubes-anaconda-addon.spec \ qubes-release/qubes-release.spec \ - qubes-release/qubes-dom0-dist-upgrade.spec \ + qubes-release/qubes-dom0-dist-upgrade.spec + +ifeq ($(ISO_LIVEUSB),1) +RPM_SPEC_FILES.dom0 += \ livecd-tools/livecd-tools.spec \ - live/qubes-live.spec + live/qubes-live.spec +endif RPM_SPEC_FILES := $(RPM_SPEC_FILES.$(PACKAGE_SET)) + + +# vim: ft=make