QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make liveusb build compatible with qubes-builder - use 'iso' target

Browse Source 
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
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-02 12:44:51 +02:00
parent 6783a317c7
commit 4bf5169ad9
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -38,6 +38,9 @@ LORAXQBS_VERSION := $(call spec_version,lorax-templates-qubes/lorax-templates-qu
PUNGI_VERSION := $(call spec_version,pungi/pungi.spec) PUNGI_VERSION := $(call spec_version,pungi/pungi.spec)
PYKICKSTART_VERSION := $(call spec_version,pykickstart/pykickstart.spec) PYKICKSTART_VERSION := $(call spec_version,pykickstart/pykickstart.spec)
ISO_INSTALLER ?= 1
ISO_LIVEUSB ?= 0
PUNGI_OPTS := --nosource --nodebuginfo --nogreedy --all-stages PUNGI_OPTS := --nosource --nodebuginfo --nogreedy --all-stages
ifdef QUBES_RELEASE ifdef QUBES_RELEASE
ISO_VERSION := $(QUBES_RELEASE) ISO_VERSION := $(QUBES_RELEASE)
@ -125,9 +128,18 @@ update-repo-current-testing:
update-repo-unstable: update-repo-unstable:
ln -f $(RPMS) ../yum/current-release/unstable/dom0/rpm/ ln -f $(RPMS) ../yum/current-release/unstable/dom0/rpm/
iso: ifeq ($(ISO_INSTALLER),1)
ln -sf `pwd` /tmp/qubes-installer 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 createrepo -q -g ../../conf/comps-qubes.xml --update yum/qubes-dom0
iso-installer: iso-prepare
mkdir -p work mkdir -p work
pushd work && pungi --name=Qubes $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg && popd pushd work && pungi --name=Qubes $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg && popd
./rpm_verify work/$(ISO_VERSION)/x86_64/os/Packages/*/*.rpm ./rpm_verify work/$(ISO_VERSION)/x86_64/os/Packages/*/*.rpm
@ -139,9 +151,7 @@ iso:
chown --reference=Makefile -R build yum chown --reference=Makefile -R build yum
rm -rf work rm -rf work
liveusb: conf/liveusb.ks iso-liveusb: conf/liveusb.ks iso-prepare
ln -sf `pwd` /tmp/qubes-installer
createrepo -q -g ../../conf/comps-qubes.xml --update yum/qubes-dom0
mkdir -p work mkdir -p work
pushd work && ../livecd-creator-qubes --verbose --debug --product='Qubes OS' --title="Qubes OS $(ISO_VERSION)" --config ../$< && popd pushd work && ../livecd-creator-qubes --verbose --debug --product='Qubes OS' --title="Qubes OS $(ISO_VERSION)" --config ../$< && popd
# Move result files to known-named directories # Move result files to known-named directories