From 4bf5169ad9a902f6974e64af37b73df25ed8cfc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 2 Aug 2015 12:44:51 +0200 Subject: [PATCH] Make liveusb build compatible with qubes-builder - use 'iso' target This commit introduces two new settings (for builder.conf): ISO_INSTALLER - build installer ISO; enabled by default ISO_LIVEUSB - build Live ISO; disabled by default --- Makefile | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index bde4103..947c7e9 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,9 @@ LORAXQBS_VERSION := $(call spec_version,lorax-templates-qubes/lorax-templates-qu PUNGI_VERSION := $(call spec_version,pungi/pungi.spec) PYKICKSTART_VERSION := $(call spec_version,pykickstart/pykickstart.spec) +ISO_INSTALLER ?= 1 +ISO_LIVEUSB ?= 0 + PUNGI_OPTS := --nosource --nodebuginfo --nogreedy --all-stages ifdef QUBES_RELEASE ISO_VERSION := $(QUBES_RELEASE) @@ -125,9 +128,18 @@ update-repo-current-testing: update-repo-unstable: ln -f $(RPMS) ../yum/current-release/unstable/dom0/rpm/ -iso: - ln -sf `pwd` /tmp/qubes-installer +ifeq ($(ISO_INSTALLER),1) +iso: iso-installer +endif +ifeq ($(ISO_LIVEUSB),1) +iso: iso-liveusb +endif + +iso-prepare: + ln -nsf `pwd` /tmp/qubes-installer createrepo -q -g ../../conf/comps-qubes.xml --update yum/qubes-dom0 + +iso-installer: iso-prepare mkdir -p work pushd work && pungi --name=Qubes $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg && popd ./rpm_verify work/$(ISO_VERSION)/x86_64/os/Packages/*/*.rpm @@ -139,9 +151,7 @@ iso: chown --reference=Makefile -R build yum rm -rf work -liveusb: conf/liveusb.ks - ln -sf `pwd` /tmp/qubes-installer - createrepo -q -g ../../conf/comps-qubes.xml --update yum/qubes-dom0 +iso-liveusb: conf/liveusb.ks iso-prepare mkdir -p work pushd work && ../livecd-creator-qubes --verbose --debug --product='Qubes OS' --title="Qubes OS $(ISO_VERSION)" --config ../$< && popd # Move result files to known-named directories