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

Make build configuration (kickstart) configurable

Browse Source 
QubesOS/qubes-issues#1926
This commit is contained in:
Marek Marczykowski-Górecki 2016-05-24 13:40:53 +02:00
parent 2556a42c04
commit 68ab062cde
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -31,6 +31,9 @@ else
endif endif
PUNGI_OPTS += --ver="$(ISO_VERSION)" PUNGI_OPTS += --ver="$(ISO_VERSION)"
INSTALLER_KICKSTART ?= $(PWD)/conf/qubes-kickstart.cfg
LIVE_KICKSTART ?= $(PWD)/conf/liveusb.ks
help: help:
@echo "make iso <== \o/";\ @echo "make iso <== \o/";\
echo; \ echo; \
@ -53,7 +56,7 @@ iso-prepare:
iso-installer: iso-prepare 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 $(INSTALLER_KICKSTART) && popd
# Move result files to known-named directories # Move result files to known-named directories
mkdir -p build/ISO/qubes-x86_64/iso build/work mkdir -p build/ISO/qubes-x86_64/iso build/work
mv work/$(ISO_VERSION)/x86_64/iso/*-DVD.iso build/ISO/qubes-x86_64/iso/ mv work/$(ISO_VERSION)/x86_64/iso/*-DVD.iso build/ISO/qubes-x86_64/iso/
@ -62,7 +65,7 @@ iso-installer: iso-prepare
chown --reference=Makefile -R build yum chown --reference=Makefile -R build yum
rm -rf work rm -rf work
iso-liveusb: conf/liveusb.ks iso-prepare iso-liveusb: $(LIVE_KICKSTART) iso-prepare
mkdir -p work mkdir -p work
pushd work && ../livecd-creator-qubes --debug --product='Qubes OS' --title="Qubes OS $(ISO_VERSION)" --fslabel="Qubes-$(ISO_VERSION)-x86_64-LIVE" --config ../$< && popd pushd work && ../livecd-creator-qubes --debug --product='Qubes OS' --title="Qubes OS $(ISO_VERSION)" --fslabel="Qubes-$(ISO_VERSION)-x86_64-LIVE" --config ../$< && popd
# Move result files to known-named directories # Move result files to known-named directories